me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fakeroot: Update to 1.25.1.

Browse source 
* gnu/packages/linux.scm (fakeroot): Update to 1.25.1.
[arguments]: Override the 'bootstrap' phase.  Remove obsolete statx
workaround.
[native-inputs]: Add AUTOCONF, AUTOMAKE, LIBTOOL, GETTEXT-MINIMAL, and PO4A.
While at it, move ACL ...
[inputs]: ... here, where it belongs according to libfakeroot.la.
This commit is contained in:
Marius Bakke 2020-09-28 18:08:56 +02:00
parent 4cd612f55b
commit 0dc3649e2c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/linux.scm
View file

@ -7003,19 +7003,25 @@ the superuser to make device nodes.")
(define-public fakeroot (define-public fakeroot
(package (package
(name "fakeroot") (name "fakeroot")
(version "1.24") (version "1.25.1")
(source (origin (source (origin
;; There are no tags in the repository, so take this snapshot.
(method url-fetch) (method url-fetch)
(uri (string-append "https://deb.debian.org/debian/pool/main/f/" (uri (string-append "https://deb.debian.org/debian/pool/main/f/"
"fakeroot/fakeroot_" version ".orig.tar.gz")) "fakeroot/fakeroot_" version ".orig.tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vb6f93hjyqnwx8dc8mm3dgma7axgqk8s7sdsjs8l2rpc0qmn11f")))) "1ianaacwpjcw02shfiyybkqh5r6il4lvxin10n4y66kw0p7i3kcm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'bootstrap
(lambda _
;; The "preroll" script takes care of Autoconf and also
;; prepares the translated manuals.
(invoke "sh" "./preroll")))
(add-after 'configure 'patch-Makefile (add-after 'configure 'patch-Makefile
(lambda _ (lambda _
;; Note: The root of the problem is already in "Makefile.am". ;; Note: The root of the problem is already in "Makefile.am".
@ -7055,21 +7061,21 @@ the superuser to make device nodes.")
;; We don't have an /etc/passwd entry for "root" - use numeric IDs. ;; We don't have an /etc/passwd entry for "root" - use numeric IDs.
(substitute* "test/compare-tar" (substitute* "test/compare-tar"
(("tar -tvf") "tar --numeric-owner -tvf")) (("tar -tvf") "tar --numeric-owner -tvf"))
;; coreutils 8.32 changed 'ls' to use the statx() syscall instead
;; of lstat(). fakeroot 1.24 does not support the former, so
;; adjust these tests to use 'test -b' instead of 'ls' to test for
;; block device. See <https://bugs.gnu.org/41090>.
(substitute* '("test/t.mknod" "test/t.chmod_dev")
(("ls -ld? \\$tmp/hda3")
"test -b $tmp/hda3 && echo block || echo fail"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("acl" ,acl) `(;; For bootstrapping the package.
("sharutils" ,sharutils) ; for the tests ("autoconf" ,autoconf)
("xz" ,xz))) ; for the tests ("automake" ,automake)
("libtool" ,libtool)
("gettext" ,gettext-minimal)
("po4a" ,po4a)
;; For tests.
("sharutils" ,sharutils)
("xz" ,xz)))
(inputs (inputs
`(("libcap" ,libcap/next) `(("acl" ,acl)
("libcap" ,libcap/next)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("sed" ,sed) ("sed" ,sed)
("coreutils" ,coreutils))) ("coreutils" ,coreutils)))