[bug#32287] [PATCH] Reproducible svn checkouts

[bug#32287] [PATCH] Reproducible svn checkouts

[Julien Lepiller]

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

Some svn checkouts have sub-repositories that have their own .svn
folder. These folders contain timestamps, so this patch removes
every .svn folder in the result of the checkout, instead of only the
top-level one.

[-- Attachment #2: 0001-guix-svn-Remove-all-.svn-folders.patch --]
[-- Type: text/x-patch, Size: 852 bytes --]

From 93aa06821d62ba902d6b3fbf5ece0cbb9d9ec797 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Fri, 6 Jul 2018 18:32:50 +0200
Subject: [PATCH] guix: svn: Remove all .svn folders.

* guix/build/svn.scm (svn-fetch): Remove all .svn folders as they contain
timestamps.
---
 guix/build/svn.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index 252d1d4ee..41bbfdc87 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -51,7 +51,7 @@ valid Subversion revision.  Return #t on success, #f otherwise."
   ;; of the repo.  Since we want a fixed output, this directory needs
   ;; to be taken out.
   (with-directory-excursion directory
-    (delete-file-recursively ".svn"))
+    (for-each delete-file-recursively (find-files "." "\\.svn")))
 
   #t)
 
-- 
2.18.0

[bug#32287] [PATCH] Reproducible svn checkouts

[Ludovic Courtès]

Hi Julien,

Julien Lepiller <julien@lepiller.eu> skribis:

> Some svn checkouts have sub-repositories that have their own .svn
> folder. These folders contain timestamps, so this patch removes
> every .svn folder in the result of the checkout, instead of only the
> top-level one.

Ouch, good catch.

Did you find packages that would trigger this issue?  We should somehow
check all the packages that use ‘svn-fetch’ when we merge this patch,
and update hashes as needed.

> From 93aa06821d62ba902d6b3fbf5ece0cbb9d9ec797 Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien@lepiller.eu>
> Date: Fri, 6 Jul 2018 18:32:50 +0200
> Subject: [PATCH] guix: svn: Remove all .svn folders.
>
> * guix/build/svn.scm (svn-fetch): Remove all .svn folders as they contain
> timestamps.
> ---
>  guix/build/svn.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/guix/build/svn.scm b/guix/build/svn.scm
> index 252d1d4ee..41bbfdc87 100644
> --- a/guix/build/svn.scm
> +++ b/guix/build/svn.scm
> @@ -51,7 +51,7 @@ valid Subversion revision.  Return #t on success, #f otherwise."
>    ;; of the repo.  Since we want a fixed output, this directory needs
>    ;; to be taken out.
>    (with-directory-excursion directory
> -    (delete-file-recursively ".svn"))
> +    (for-each delete-file-recursively (find-files "." "\\.svn")))

‘find-files’ doesn’t include directories by default; we also need a
stricter regexp, leading to:

  (for-each delete-file-recursively
            (find-files "." "^\\.svn$" #:directories? #t))

WDYT?

(I’ll be AFK so feel free to apply if it looks good to you.)

Ludo’.

bug#32287: [PATCH] Reproducible svn checkouts

[Julien Lepiller]

Le Sun, 29 Jul 2018 15:59:03 +0200,
ludo@gnu.org (Ludovic Courtès) a écrit :

> Hi Julien,
> 
> Julien Lepiller <julien@lepiller.eu> skribis:
> 
> > Some svn checkouts have sub-repositories that have their own .svn
> > folder. These folders contain timestamps, so this patch removes
> > every .svn folder in the result of the checkout, instead of only the
> > top-level one.  
> 
> Ouch, good catch.
> 
> Did you find packages that would trigger this issue?  We should
> somehow check all the packages that use ‘svn-fetch’ when we merge
> this patch, and update hashes as needed.
> 

No package in Guix trigger this issue, but I have a package definition
for JOSM that does. The patch doesn't change the content of sources
using svn-fetch we have, so there's nothing to worry about.

Pushed as dd1e45335e135fe724acece440782344ef8ca9fd in staging with
your suggestions. And now I wonder why I pushed to staging since it
doesn't change any existing package... too late I guess :)

Thank you!

[bug#32287] [PATCH] Reproducible svn checkouts

[Leo Famulari]

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

On Sun, Aug 19, 2018 at 05:52:06PM +0200, Julien Lepiller wrote:
> Pushed as dd1e45335e135fe724acece440782344ef8ca9fd in staging with
> your suggestions. And now I wonder why I pushed to staging since it
> doesn't change any existing package... too late I guess :)

If you use `git cherry-pick` to apply the commit to the master branch,
Git should do the right thing when staging is eventually merged to
master.

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