ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libcap: Update to 2.49.

Browse source 
* gnu/packages/linux.scm (libcap-2.31): Rename to ...
(libcap): ... this: Update to 2.49.
[arguments]: Adjust substitution.
(libcap/next): Remove variable.
* gnu/packages/avahi.scm (avahi)[inputs]: Change from LIBCAP/NEXT to LIBCAP.
* gnu/packages/base.scm (coreutils)[inputs]: Likewise.
This commit is contained in:
Marius Bakke 2021-05-09 11:41:08 +02:00
parent 7604d960ea
commit cd42bad5d5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/avahi.scm
View file

@ -74,7 +74,7 @@ (define-public avahi
("expat" ,expat)
("gdbm" ,gdbm)
("glib" ,glib)
("libcap" ,libcap-2.31) ;to enable chroot support in avahi-daemon
("libcap" ,libcap) ;to enable chroot support in avahi-daemon
("libdaemon" ,libdaemon)
("libevent" ,libevent)))
(native-inputs

4
gnu/packages/base.scm
View file

@ -339,8 +339,8 @@ (define-public coreutils
,@(if (and (not (%current-target-system))
(member (%current-system)
(package-supported-systems libcap)))
`(("libcap" ,libcap-2.31)) ;capability support in 'ls', etc.
'())))
`(("libcap" ,libcap)) ;capability support in 'ls', etc.
'())))
(native-inputs
;; Perl is needed to run tests in native builds, and to run the bundled
;; copy of help2man. However, don't pass it when cross-compiling since

44
gnu/packages/linux.scm
View file

@ -2610,10 +2610,10 @@ (define-public net-tools
configuration (iptunnel, ipmaddr).")
(license license:gpl2+))))
(define-public libcap-2.31
(define-public libcap
(package
(name "libcap")
(version "2.31")
(version "2.49")
(source (origin
(method url-fetch)
(uri (string-append
@ -2621,7 +2621,7 @@ (define-public libcap-2.31
"libcap2/libcap-" version ".tar.xz"))
(sha256
(base32
"0ikwm0kngrqa4ci80lqnrkk17kg09q7dxrz28y0gm5qw3vj8s266"))))
"10g13s1kihqpvrvmfl2w8s18icqjlz8hy2vkhz3jw2256vcw92z9"))))
(build-system gnu-build-system)
(arguments '(#:phases
(modify-phases %standard-phases
@ -2629,10 +2629,9 @@ (define-public libcap-2.31
;; Add $libdir to the RUNPATH of executables.
(lambda _
(substitute* "Make.Rules"
(("LDFLAGS := #-g")
(string-append "LDFLAGS := -Wl,-rpath="
%output "/lib")))
#t)))
(("LDFLAGS \\?= #-g")
(string-append "LDFLAGS ?= -Wl,-rpath="
%output "/lib"))))))
#:test-target "test"
#:make-flags (list "lib=lib"
(string-append "prefix="
@ -2649,37 +2648,6 @@ (define-public libcap-2.31
;; License is BSD-3 or GPLv2, at the user's choice.
(license license:gpl2)))
;; libcap 2.31 has problems with newer kernels, so provide this newer variant.
;; Keep the old libcap around to avoid rebuilding 'coreutils' and 'avahi'.
;; To be merged with libcap on the next rebuild cycle.
(define-public libcap
(package
(inherit libcap-2.31)
(version "2.45")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/libs/security/linux-privs/"
"libcap2/libcap-" version ".tar.xz"))
(sha256
(base32
"11ijmi7jik9iw6pdszc6bylhggghr8cza03bcrbhbqf0cpvkjrnn"))))
(arguments
(substitute-keyword-arguments (package-arguments libcap-2.31)
((#:phases phases)
`(modify-phases ,phases
(replace 'configure
(lambda _
;; Add $libdir to the RUNPATH of executables.
(substitute* "Make.Rules"
(("LDFLAGS \\?= #-g")
(string-append "LDFLAGS ?= -Wl,-rpath="
%output "/lib")))
#t))))))))
(define-deprecated libcap/next libcap)
(export libcap/next)
(define-public bridge-utils
(package
(name "bridge-utils")