From 3dbf331942f11ee888ccbf849cacdd3a0ab971cd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Tue, 3 Jul 2018 00:26:59 +0200
Subject: deduplication: Place link files under /gnu/store/.links.

Previously they'd always be placed next to TO-REPLACE, which would lead
to EPERM in some cases.

* guix/store/deduplication.scm (replace-with-link): Add #:swap-directory
parameter and honor it.  Add call to 'make-file-writable'.  Catch
'system-error' around 'rename-file'.
(deduplicate): Pass #:swap-directory and remove uses of
'false-if-system-error'.
* tests/store-deduplication.scm ("deduplicate"): Add 'chmod' call.
---
 tests/store-deduplication.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests')

diff --git a/tests/store-deduplication.scm b/tests/store-deduplication.scm
index 236172319..4ca2ec0f6 100644
--- a/tests/store-deduplication.scm
+++ b/tests/store-deduplication.scm
@@ -47,6 +47,10 @@
                      (lambda (port)
                        (put-bytevector port data))))
                  identical)
+       ;; Make the parent of IDENTICAL read-only.  This should not prevent
+       ;; deduplication for inserting its hard link.
+       (chmod (dirname (second identical)) #o544)
+
        (call-with-output-file unique
          (lambda (port)
            (put-bytevector port (string->utf8 "This is unique."))))
-- 
cgit v1.3


From 25c7ff6a3ecbaa1e93b38d35c8cbff40b7f4edb8 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Tue, 3 Jul 2018 10:52:55 +0200
Subject: syscalls: Define AT_SYMLINK_NOFOLLOW et al.

* guix/build/syscalls.scm (AT_FDCWD, AT_SYMLINK_NOFOLLOW, AT_REMOVEDIR)
(AT_SYMLINK_FOLLOW, AT_NO_AUTOMOUNT, AT_EMPTY_PATH): New variables.
* tests/syscalls.scm ("utime with AT_SYMLINK_NOFOLLOW"): New test.
---
 guix/build/syscalls.scm | 17 +++++++++++++++++
 tests/syscalls.scm      | 13 +++++++++++++
 2 files changed, 30 insertions(+)

(limited to 'tests')

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 25726b885..74cb675fc 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -46,6 +46,14 @@
             MNT_DETACH
             MNT_EXPIRE
             UMOUNT_NOFOLLOW
+
+            AT_FDCWD
+            AT_SYMLINK_NOFOLLOW
+            AT_REMOVEDIR
+            AT_SYMLINK_FOLLOW
+            AT_NO_AUTOMOUNT
+            AT_EMPTY_PATH
+
             restart-on-EINTR
             mount-points
             swapon
@@ -667,6 +675,15 @@ mounted at FILE."
     (* (file-system-block-size fs)
        (file-system-blocks-available fs))))
 
+;; Flags for the *at command, notably the 'utime' procedure of libguile.
+;; From <fcntl.h>.
+(define AT_FDCWD             -100)
+(define AT_SYMLINK_NOFOLLOW #x100)
+(define AT_REMOVEDIR        #x200)
+(define AT_SYMLINK_FOLLOW   #x400)
+(define AT_NO_AUTOMOUNT     #x800)
+(define AT_EMPTY_PATH       #x1000)
+
 
 ;;;
 ;;; Containers.
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index 0d07280b9..3e267c9f0 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -60,6 +60,19 @@
   (any (cute member <> (mount-points))
        '("/" "/proc" "/sys" "/dev")))
 
+(false-if-exception (delete-file temp-file))
+(test-equal "utime with AT_SYMLINK_NOFOLLOW"
+  '(0 0)
+  (begin
+    ;; Test libguile's utime with AT_SYMLINK_NOFOLLOW, which libguile does not
+    ;; define as of Guile 2.2.4.
+    (symlink "/nowhere" temp-file)
+    (utime temp-file 0 0 0 0 AT_SYMLINK_NOFOLLOW)
+    (let ((st (lstat temp-file)))
+      (delete-file temp-file)
+      ;; Note: 'utimensat' does not change 'ctime'.
+      (list (stat:mtime st) (stat:atime st)))))
+
 (test-assert "swapon, ENOENT/EPERM"
   (catch 'system-error
     (lambda ()
-- 
cgit v1.3


From ee75e80c05127020188b93d402d1d70b102eaacf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Thu, 5 Jul 2018 21:35:55 +0200
Subject: tests: Skip 'guix-pack.sh'.

This works around a regression introduced in commit
66e9944e078cbb9e0d618377dd6df6e639640efa while waiting for a proper fix.

* tests/guix-pack.sh: Add "exit 77".
---
 tests/guix-pack.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests')

diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
index 917d52451..bf367fa42 100644
--- a/tests/guix-pack.sh
+++ b/tests/guix-pack.sh
@@ -28,6 +28,11 @@ fi
 
 guix pack --version
 
+# FIXME: Starting from commit 66e9944e078cbb9e0d618377dd6df6e639640efa,
+# '--bootstrap' is mostly ineffective since 'guix pack' produces derivations
+# that refer to guile-sqlite3 and libgcrypt.  For now we just skip the test.
+exit 77
+
 # Use --no-substitutes because we need to verify we can do this ourselves.
 GUIX_BUILD_OPTIONS="--no-substitutes"
 export GUIX_BUILD_OPTIONS
-- 
cgit v1.3