Issues while updating fossil to 2.1

Issues while updating fossil to 2.1

[ng0]

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

Hi,

my editor wraps at 80 lines but I hope the errors are obvious for
someone who did fix fossil before (Efraim?).
Could it be that not all tests have been updated for the new format?

There's no test log. The output below can be reproduced with the the
attached patch.

phase `build' succeeded after 21.6 seconds
starting phase `test-setup'
phase `test-setup' succeeded after 0.0 seconds
starting phase `check'
tclsh ./src/../test/tester.tcl fossil -quiet
test amend-setup-failure FAILED!
RESULT: New_Version:
74afca56eee6c4ee6fc8428b9f1dacc24b35f08cebf0e3f8440635a034dea628
ERROR: current directory is not within an open checkout
test pre-commit-warnings-1 FAILED!
RESULT: current directory is not within an open checkout
Fossil was not compiled with JSON support.
ERROR: SQLITE_ERROR: table config has no column named mtime
/tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/fossil: table config has no
column named mtime: {REPLACE INTO config(name,value,mtime)
VALUES('hash-policy',1,now())}
ERROR: SQLITE_ERROR: table config has no column named mtime
/tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/fossil: table config has no
column named mtime: {REPLACE INTO config(name,value,mtime)
VALUES('hash-policy',1,now())}
ERROR: use --repository or -R to specify the repository database
ERROR: current directory is not within an open checkout
current directory is not within an open checkout
    while executing
"exec $::fossilexe ls -l"
    (procedure "checkout-test" line 3)
    invoked from within
"checkout-test 10 {
  da5c8346496f3421cb58f84b6e59e9531d9d424d  one.txt
  ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4  three.txt
  278a402316510f6ae4a7718..."
    (file "/tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/test/merge5.test"
line 50)
    invoked from within
"source $testdir/$testfile.test"
    ("foreach" body line 3)
    invoked from within
"foreach testfile $argv {
  protOut "***** $testfile ******"
  source $testdir/$testfile.test
  protOut "***** End of $testfile: [llength $bad_test] er..."
    (file "./src/../test/tester.tcl" line 944)
make: *** [src/main.mk:497: test] Error 1
phase `check' failed after 144.0 seconds
builder for `/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv'
failed with exit code 1
@ build-failed
/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv - 1 builder
for `/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv' failed
with exit code 1
guix build: error: build failed: build of
`/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv' failed


-- 
PGP and more: https://people.pragmatique.xyz/ng0/

[-- Attachment #2: 0001-gnu-fossil-Update-to-2.1.patch --]
[-- Type: text/plain, Size: 2032 bytes --]

From 361c92d948be8216efdb7cca86c583e355e7bd30 Mon Sep 17 00:00:00 2001
From: ng0 <contact.ng0@cryptolab.net>
Date: Fri, 3 Mar 2017 13:25:53 +0000
Subject: [PATCH] gnu: fossil: Update to 2.1.

* gnu/packages/version-control.scm (fossil): Update to 2.1.
---
 gnu/packages/version-control.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 45b9e9240..5c220d7f7 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1232,16 +1232,21 @@ repository\" with git-annex.")
 (define-public fossil
   (package
     (name "fossil")
-    (version "1.35")
+    (version "2.1")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://www.fossil-scm.org/index.html/uv/download/"
-             "fossil-src-" version ".tar.gz"))
+       ;; Older downloads are moved to another URL.
+       (uri (list
+             (string-append
+              "https://www.fossil-scm.org/index.html/uv/download/"
+              "fossil-src-" version ".tar.gz")
+             (string-append
+              "https://www.fossil-scm.org/index.html/uv/"
+              "fossil-src-" version ".tar.gz")))
        (sha256
         (base32
-         "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"))))
+         "01ggrwijy2gvghr8j2hlka54klkkmbxccf9qypp43gpis08dzp45"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("tcl" ,tcl)                     ;for configuration only
@@ -1272,7 +1277,7 @@ repository\" with git-annex.")
                       (setenv "TZ" "UTC")
                       ;; Fixing the th1 test would require many backports, so
                       ;; just disable for now.
-                      (delete-file "test/th1.test")
+                      ;; (delete-file "test/th1.test")
                       #t)))))
     (home-page "https://fossil-scm.org")
     (synopsis "Software configuration management system")
-- 
2.12.2

Re: Issues while updating fossil to 2.1

[ng0]

ng0 transcribed 4.7K bytes:
> Hi,
> 
> my editor wraps at 80 lines but I hope the errors are obvious for
> someone who did fix fossil before (Efraim?).
> Could it be that not all tests have been updated for the new format?

Looking at their timeline
(https://www.fossil-scm.org/index.html/timeline?y=ci), commits like
https://www.fossil-scm.org/index.html/info/6167f69a218804bd
suggest that there are issues. However I guess we can use nothing after
https://www.fossil-scm.org/index.html/timeline?c=303a2084a35beec1&unhide
where they updated sqlite to 3.18 beta and later they updated to 3.18
(released?).

I'll just see if including appropriate commits from their timeline fixes
the tests.

> There's no test log. The output below can be reproduced with the the
> attached patch.
> 
> phase `build' succeeded after 21.6 seconds
> starting phase `test-setup'
> phase `test-setup' succeeded after 0.0 seconds
> starting phase `check'
> tclsh ./src/../test/tester.tcl fossil -quiet
> test amend-setup-failure FAILED!
> RESULT: New_Version:
> 74afca56eee6c4ee6fc8428b9f1dacc24b35f08cebf0e3f8440635a034dea628
> ERROR: current directory is not within an open checkout
> test pre-commit-warnings-1 FAILED!
> RESULT: current directory is not within an open checkout
> Fossil was not compiled with JSON support.
> ERROR: SQLITE_ERROR: table config has no column named mtime
> /tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/fossil: table config has no
> column named mtime: {REPLACE INTO config(name,value,mtime)
> VALUES('hash-policy',1,now())}
> ERROR: SQLITE_ERROR: table config has no column named mtime
> /tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/fossil: table config has no
> column named mtime: {REPLACE INTO config(name,value,mtime)
> VALUES('hash-policy',1,now())}
> ERROR: use --repository or -R to specify the repository database
> ERROR: current directory is not within an open checkout
> current directory is not within an open checkout
>     while executing
> "exec $::fossilexe ls -l"
>     (procedure "checkout-test" line 3)
>     invoked from within
> "checkout-test 10 {
>   da5c8346496f3421cb58f84b6e59e9531d9d424d  one.txt
>   ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4  three.txt
>   278a402316510f6ae4a7718..."
>     (file "/tmp/guix-build-fossil-2.1.drv-0/fossil-2.1/test/merge5.test"
> line 50)
>     invoked from within
> "source $testdir/$testfile.test"
>     ("foreach" body line 3)
>     invoked from within
> "foreach testfile $argv {
>   protOut "***** $testfile ******"
>   source $testdir/$testfile.test
>   protOut "***** End of $testfile: [llength $bad_test] er..."
>     (file "./src/../test/tester.tcl" line 944)
> make: *** [src/main.mk:497: test] Error 1
> phase `check' failed after 144.0 seconds
> builder for `/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv'
> failed with exit code 1
> @ build-failed
> /gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv - 1 builder
> for `/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv' failed
> with exit code 1
> guix build: error: build failed: build of
> `/gnu/store/iyh8xcg4x8w3zd89mn8yz9c5wgy5iqar-fossil-2.1.drv' failed
> 
> 
> -- 
> PGP and more: https://people.pragmatique.xyz/ng0/

> From 361c92d948be8216efdb7cca86c583e355e7bd30 Mon Sep 17 00:00:00 2001
> From: ng0 <contact.ng0@cryptolab.net>
> Date: Fri, 3 Mar 2017 13:25:53 +0000
> Subject: [PATCH] gnu: fossil: Update to 2.1.
> 
> * gnu/packages/version-control.scm (fossil): Update to 2.1.
> ---
>  gnu/packages/version-control.scm | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index 45b9e9240..5c220d7f7 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -1232,16 +1232,21 @@ repository\" with git-annex.")
>  (define-public fossil
>    (package
>      (name "fossil")
> -    (version "1.35")
> +    (version "2.1")
>      (source
>       (origin
>         (method url-fetch)
> -       (uri (string-append
> -             "https://www.fossil-scm.org/index.html/uv/download/"
> -             "fossil-src-" version ".tar.gz"))
> +       ;; Older downloads are moved to another URL.
> +       (uri (list
> +             (string-append
> +              "https://www.fossil-scm.org/index.html/uv/download/"
> +              "fossil-src-" version ".tar.gz")
> +             (string-append
> +              "https://www.fossil-scm.org/index.html/uv/"
> +              "fossil-src-" version ".tar.gz")))
>         (sha256
>          (base32
> -         "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"))))
> +         "01ggrwijy2gvghr8j2hlka54klkkmbxccf9qypp43gpis08dzp45"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("tcl" ,tcl)                     ;for configuration only
> @@ -1272,7 +1277,7 @@ repository\" with git-annex.")
>                        (setenv "TZ" "UTC")
>                        ;; Fixing the th1 test would require many backports, so
>                        ;; just disable for now.
> -                      (delete-file "test/th1.test")
> +                      ;; (delete-file "test/th1.test")
>                        #t)))))
>      (home-page "https://fossil-scm.org")
>      (synopsis "Software configuration management system")
> -- 
> 2.12.2
> 


-- 
PGP and more: https://people.pragmatique.xyz/ng0/

Re: Issues while updating fossil to 2.1

[ng0]

ng0 transcribed 5.3K bytes:
> ng0 transcribed 4.7K bytes:
> > Hi,
> > 
> > my editor wraps at 80 lines but I hope the errors are obvious for
> > someone who did fix fossil before (Efraim?).
> > Could it be that not all tests have been updated for the new format?
> 
> Looking at their timeline
> (https://www.fossil-scm.org/index.html/timeline?y=ci), commits like
> https://www.fossil-scm.org/index.html/info/6167f69a218804bd
> suggest that there are issues. However I guess we can use nothing after
> https://www.fossil-scm.org/index.html/timeline?c=303a2084a35beec1&unhide
> where they updated sqlite to 3.18 beta and later they updated to 3.18
> (released?).
> 
> I'll just see if including appropriate commits from their timeline fixes
> the tests.
> 

There's also an OpenSSL-1.1.0 related bug which was fixed since the
release of fossil 2.1, reported by Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847556#10

I think we should update to at least
https://www.fossil-scm.org/index.html/info/8c22e1bbcd8ec048

I don't know when they plan to release version 2.2, but it will require
a version of sqlite we do not have. Would it be okay to fall back to the
bundled one then?
-- 
PGP and more: https://people.pragmatique.xyz/ng0/

Re: Issues while updating fossil to 2.1

[Leo Famulari]

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

On Tue, Apr 11, 2017 at 10:44:12AM +0000, ng0 wrote:
> There's also an OpenSSL-1.1.0 related bug which was fixed since the
> release of fossil 2.1, reported by Debian:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847556#10

We are still building packages with OpenSSL-1.0.2, so we can ignore this
issue for now, right?

> I think we should update to at least
> https://www.fossil-scm.org/index.html/info/8c22e1bbcd8ec048
> 
> I don't know when they plan to release version 2.2, but it will require
> a version of sqlite we do not have. Would it be okay to fall back to the
> bundled one then?

We *should* have sqlite 3.18 after the next core-updates cycle,
hopefully by June 15.

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

Re: Issues while updating fossil to 2.1

[Leo Famulari]

On Tue, Apr 11, 2017 at 10:32:31AM +0000, ng0 wrote:
> ng0 transcribed 4.7K bytes:
> > Hi,
> > 
> > my editor wraps at 80 lines but I hope the errors are obvious for
> > someone who did fix fossil before (Efraim?).
> > Could it be that not all tests have been updated for the new format?
> 
> Looking at their timeline
> (https://www.fossil-scm.org/index.html/timeline?y=ci), commits like
> https://www.fossil-scm.org/index.html/info/6167f69a218804bd
> suggest that there are issues. However I guess we can use nothing after
> https://www.fossil-scm.org/index.html/timeline?c=303a2084a35beec1&unhide
> where they updated sqlite to 3.18 beta and later they updated to 3.18
> (released?).

Has fossil made a release that depends on sqlite 3.18? I think we will
offer this version of sqlite before most distros, but not immediately;
it was released only 2 weeks ago.

Re: Issues while updating fossil to 2.1

[ng0]

Leo Famulari transcribed 0.8K bytes:
> On Tue, Apr 11, 2017 at 10:32:31AM +0000, ng0 wrote:
> > ng0 transcribed 4.7K bytes:
> > > Hi,
> > > 
> > > my editor wraps at 80 lines but I hope the errors are obvious for
> > > someone who did fix fossil before (Efraim?).
> > > Could it be that not all tests have been updated for the new format?
> > 
> > Looking at their timeline
> > (https://www.fossil-scm.org/index.html/timeline?y=ci), commits like
> > https://www.fossil-scm.org/index.html/info/6167f69a218804bd
> > suggest that there are issues. However I guess we can use nothing after
> > https://www.fossil-scm.org/index.html/timeline?c=303a2084a35beec1&unhide
> > where they updated sqlite to 3.18 beta and later they updated to 3.18
> > (released?).
> 
> Has fossil made a release that depends on sqlite 3.18? I think we will
> offer this version of sqlite before most distros, but not immediately;
> it was released only 2 weeks ago.
> 

https://fossil-scm.org is always running the HEAD of fossil, and because
they are very closely connected to sqlite I think that's the reason why
the implement use of new versions as soon as possible. No release has
been published, but commits are already made with 3.18.
-- 
PGP and more: https://people.pragmatique.xyz/ng0/