[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
92/94: gnu: SELinux: Update to 3.0.
From: |
guix-commits |
Subject: |
92/94: gnu: SELinux: Update to 3.0. |
Date: |
Thu, 5 Dec 2019 12:15:42 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9e837ea0f35bb232eebfc8603264459ba4ffa52f
Author: Marius Bakke <address@hidden>
Date: Thu Dec 5 01:21:27 2019 +0100
gnu: SELinux: Update to 3.0.
* gnu/packages/selinux.scm (libsepol): Update to 3.0.
[arguments]: Don't set DESTDIR. Change PYSITEDIR to PYTHONLIBDIR. Drop
phase
'remove-Werror'.
(libselinux)[arguments]: Add substitution to use the correct Python
directory.
(libsemanage)[arguments]: Change PYSITEDIR to PYTHONLIBDIR. Add phase
'adjust-semanage-conf-location'.
[inputs]: Remove USTR.
(policycoreutils)[arguments]: Remove obsolete substitution.
---
gnu/packages/selinux.scm | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 1c45cb8..49362d1 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,7 +40,6 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages swig)
- #:use-module (gnu packages textutils)
#:use-module (gnu packages xml))
;; Update the SELinux packages together!
@@ -47,8 +47,8 @@
(define-public libsepol
(package
(name "libsepol")
- (version "2.7")
- (source (let ((release "20170804"))
+ (version "3.0")
+ (source (let ((release "20191204"))
(origin
(method git-fetch)
(uri (git-reference
@@ -57,7 +57,7 @@
(file-name (string-append "selinux-" release "-checkout"))
(sha256
(base32
- "1l1nn8bx08v4cxkw5kb0wgr61rfqj5ra9dh1dy5jslillj93vivq")))))
+ "05rpzm72cgprd0ccr6lvx9hm8j8b5nkqi4avshlsyg7s3sdlcxjs")))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; tests require checkpolicy, which requires libsepol
@@ -65,7 +65,7 @@
#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" out)
- (string-append "DESTDIR=" out)
+ (string-append "SHLIBDIR=" out "/lib")
(string-append "MAN3DIR=" out "/share/man/man3")
(string-append "MAN5DIR=" out "/share/man/man5")
(string-append "MAN8DIR=" out "/share/man/man8")
@@ -139,7 +139,7 @@ module into a binary representation.")
(string-append "LIBSEPOLA="
(assoc-ref %build-inputs "libsepol")
"/lib/libsepol.a")
- (string-append "PYSITEDIR="
+ (string-append "PYTHONLIBDIR="
(assoc-ref %outputs "python")
"/lib/python"
,(version-major+minor (package-version python))
@@ -150,19 +150,17 @@ module into a binary representation.")
(delete 'portability)
(replace 'enter-dir
(lambda _ (chdir ,name) #t))
- (add-after 'enter-dir 'remove-Werror
- (lambda _
- ;; GCC complains about the fact that the output does not (yet)
- ;; have an "include" directory, even though it is referenced.
- (substitute* '("src/Makefile"
- "utils/Makefile")
- (("-Werror ") ""))
- #t))
(add-after 'build 'pywrap
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "pywrap" make-flags)))
(add-after 'install 'install-pywrap
- (lambda* (#:key make-flags #:allow-other-keys)
+ (lambda* (#:key make-flags outputs #:allow-other-keys)
+ ;; The build system uses "python setup.py install" to install
+ ;; Python bindings. Instruct it to use the correct output.
+ (substitute* "src/Makefile"
+ (("--prefix=\\$\\(PREFIX\\)")
+ (string-append "--prefix=" (assoc-ref outputs "python"))))
+
(apply invoke "make" "install-pywrap" make-flags)))))))
;; These libraries are in "Requires.private" in libselinux.pc.
(propagated-inputs
@@ -191,7 +189,7 @@ the core SELinux management utilities.")
(substitute-keyword-arguments (package-arguments libsepol)
((#:make-flags flags)
`(cons* "PYTHON=python3"
- (string-append "PYSITEDIR="
+ (string-append "PYTHONLIBDIR="
(assoc-ref %outputs "out")
"/lib/python"
,(version-major+minor (package-version python))
@@ -202,6 +200,12 @@ the core SELinux management utilities.")
(delete 'portability)
(replace 'enter-dir
(lambda _ (chdir ,name) #t))
+ (add-before 'install 'adjust-semanage-conf-location
+ (lambda _
+ (substitute* "src/Makefile"
+ (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc")
+ "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc"))
+ #t))
(add-after 'build 'pywrap
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "pywrap" make-flags)))
@@ -212,7 +216,6 @@ the core SELinux management utilities.")
`(("libsepol" ,libsepol)
("libselinux" ,libselinux)
("audit" ,audit)
- ("ustr" ,ustr)
;; For pywrap phase
("python" ,python-wrapper)))
(native-inputs
@@ -393,11 +396,6 @@ tools, and libraries designed to facilitate SELinux policy
analysis.")
(lambda _ (chdir ,name) #t))
(add-after 'enter-dir 'ignore-/usr-tests
(lambda* (#:key inputs #:allow-other-keys)
- ;; The Makefile decides to build restorecond only if it finds the
- ;; inotify header somewhere under /usr.
- (substitute* "Makefile"
- (("ifeq.*") "")
- (("endif.*") ""))
;; Rewrite lookup paths for header files.
(substitute* '("newrole/Makefile"
"setfiles/Makefile"
- 83/94: gnu: dbus: Do not build static libraries., (continued)
- 83/94: gnu: dbus: Do not build static libraries., guix-commits, 2019/12/05
- 33/94: gnu: swig: Update to 4.0.1., guix-commits, 2019/12/05
- 01/94: Merge branch 'master' into core-updates, guix-commits, 2019/12/05
- 17/94: gnu: jemalloc: Update to 5.2.1., guix-commits, 2019/12/05
- 23/94: gnu: readline: Update to 8.0.1., guix-commits, 2019/12/05
- 27/94: gnu: findutils: Update to 4.7.0., guix-commits, 2019/12/05
- 40/94: gnu: python2-fonttools: Update to 3.44.0., guix-commits, 2019/12/05
- 65/94: gnu: libxfont: Do not build static libraries., guix-commits, 2019/12/05
- 59/94: gnu: libxrender: Do not build static libraries., guix-commits, 2019/12/05
- 60/94: gnu: libxtst: Do not build static libraries., guix-commits, 2019/12/05
- 92/94: gnu: SELinux: Update to 3.0.,
guix-commits <=
- 94/94: gnu: graphviz: Update to 2.42.3., guix-commits, 2019/12/05
- 91/94: gnu: sqlite: Move static library to separate output., guix-commits, 2019/12/05