Re: [PATCH] gnu: Add bind
On Sun, Sep 18, 2016 at 05:03:14PM +0200, Hartmut Goebel wrote: Am 18.09.2016 um 15:57 schrieb John Darrington: > Does anyone have any opinions/objections before I make this commit? > + (string-append "--with-dlz-mysql=" > +(assoc-ref %build-inputs "mysql")) I don't think, this should be build with DLZ mysql per default. While DLZ is an important feature, this would urgh GuixSD users to use mysql. They mayprefer postgresql, though. Thus DLZ MySQL should not part of the default setup IMHO. Ok. I buy that argument. > +(outputs `("out" "utils")) Please muve this above the phases defintions. I missed this and thought the utils are going into the same package as the server. I will do that. -- Avoid eavesdropping. Send strong encrypted email. PGP Public key ID: 1024D/2DE827B3 fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. signature.asc Description: Digital signature
Re: [PATCH] gnu: Add bind
Am 18.09.2016 um 15:57 schrieb John Darrington: > Does anyone have any opinions/objections before I make this commit? > + (string-append "--with-dlz-mysql=" > +(assoc-ref %build-inputs "mysql")) I don't think, this should be build with DLZ mysql per default. While DLZ is an important feature, this would urgh GuixSD users to use mysql. They mayprefer postgresql, though. Thus DLZ MySQL should not part of the default setup IMHO. > +(outputs `("out" "utils")) Please muve this above the phases defintions. I missed this and thought the utils are going into the same package as the server. -- Regards Hartmut Goebel | Hartmut Goebel | h.goe...@crazy-compilers.com | | www.crazy-compilers.com | compilers which you thought are impossible |
Re: [PATCH] gnu: Add bind
Does anyone have any opinions/objections before I make this commit? J' On Sun, Sep 11, 2016 at 12:08:17AM +0200, John Darrington wrote: I suggest that we use this version and remove the existing bind-utils. J' On Sun, Sep 11, 2016 at 12:06:26AM +0200, John Darrington wrote: * gnu/packags/dns.scm (bind): New variable --- gnu/packages/dns.scm | 69 1 file changed, 69 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 819343a..dad8079 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -3,6 +3,7 @@ ;;; Copyright ?? 2016 Mark H Weaver;;; Copyright ?? 2016 Ricardo Wurmus ;;; Copyright ?? 2016 Efraim Flashner +;;; Copyright ?? 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,74 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; Source files only say GPL2 and GPL3 are allowed. (license (list license:gpl2 license:gpl3 +(define-public bind + (package +(name "bind") +(version "9.10.4-P2") +(source (origin + (method url-fetch) + (uri (string-append +"ftp://ftp.isc.org/isc/bind9/; version "/" name "-" +version ".tar.gz")) + (sha256 + (base32 + "08s48h5p916ixjiwgar4w6skc20crmg7yj1y7g89c083zvw8lnxk" +(build-system gnu-build-system) +(arguments + `(#:configure-flags + (list (string-append "--with-openssl=" +(assoc-ref %build-inputs "openssl")) + (string-append "--with-dlz-mysql=" +(assoc-ref %build-inputs "mysql")) + (string-append "--with-pkcs11=" +(assoc-ref %build-inputs "p11-kit"))) + #:phases + ;; When and if guix provides user namespaces for the build process, + ;; then the following can be uncommented and the subsequent "force-test" + ;; will not be necessary. + ;; + ;; (modify-phases %standard-phases + ;; (add-before 'check 'set-up-loopback + ;; (lambda _ + ;; (system "bin/tests/system/ifconfig.sh up" + (modify-phases %standard-phases + (add-after 'strip 'move-to-utils + (lambda _ + (for-each + (lambda (file) +(let ((target (string-append (assoc-ref %outputs "utils") file)) + (src (string-append (assoc-ref %outputs "out") file))) + (mkdir-p (dirname target)) + (link src target) + (delete-file src))) + '("/bin/dig" "/bin/delv" "/bin/nslookup" "/bin/host" "/bin/nsupdate" +"/share/man/man1/dig.1" +"/share/man/man1/host.1" +"/share/man/man1/nslookup.1" +"/share/man/man1/nsupdate.1" + (replace 'check + (lambda _ + (zero? (system* "make" "force-test"))) +(outputs `("out" "utils")) +(inputs + ;; it would be nice to add GeoIP and gssapi once there is package + `(("libcap" ,libcap) + ("libxml2" ,libxml2) + ("mysql" ,mysql) + ("openssl" ,openssl) + ("p11-kit" ,p11-kit))) +(native-inputs `(("perl" ,perl) + ("net-tools" ,net-tools))) +(synopsis "An implementation of the Domain Name System") +(description "BIND is an implementation of the Domain Name System (DNS) +protocols for the Internet. It is a reference implementation of those +protocols, but it is also production-grade software, suitable for use in +high-volume and high-reliability applications. The name BIND stands for +\"Berkeley Internet Name Domain\", because the software originated in the early +1980s at the University of California at Berkeley.") +(home-page "https://www.isc.org/downloads/bind;) +(license (list license:isc + (define-public bind-utils
Re: [PATCH] gnu: Add bind
I suggest that we use this version and remove the existing bind-utils. J' On Sun, Sep 11, 2016 at 12:06:26AM +0200, John Darrington wrote: * gnu/packags/dns.scm (bind): New variable --- gnu/packages/dns.scm | 69 1 file changed, 69 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 819343a..dad8079 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -3,6 +3,7 @@ ;;; Copyright ?? 2016 Mark H Weaver;;; Copyright ?? 2016 Ricardo Wurmus ;;; Copyright ?? 2016 Efraim Flashner +;;; Copyright ?? 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,74 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; Source files only say GPL2 and GPL3 are allowed. (license (list license:gpl2 license:gpl3 +(define-public bind + (package +(name "bind") +(version "9.10.4-P2") +(source (origin + (method url-fetch) + (uri (string-append +"ftp://ftp.isc.org/isc/bind9/; version "/" name "-" +version ".tar.gz")) + (sha256 + (base32 +"08s48h5p916ixjiwgar4w6skc20crmg7yj1y7g89c083zvw8lnxk" +(build-system gnu-build-system) +(arguments + `(#:configure-flags + (list (string-append "--with-openssl=" +(assoc-ref %build-inputs "openssl")) + (string-append "--with-dlz-mysql=" +(assoc-ref %build-inputs "mysql")) + (string-append "--with-pkcs11=" +(assoc-ref %build-inputs "p11-kit"))) + #:phases + ;; When and if guix provides user namespaces for the build process, + ;; then the following can be uncommented and the subsequent "force-test" + ;; will not be necessary. + ;; + ;; (modify-phases %standard-phases + ;; (add-before 'check 'set-up-loopback + ;; (lambda _ + ;; (system "bin/tests/system/ifconfig.sh up" + (modify-phases %standard-phases + (add-after 'strip 'move-to-utils + (lambda _ + (for-each + (lambda (file) +(let ((target (string-append (assoc-ref %outputs "utils") file)) + (src (string-append (assoc-ref %outputs "out") file))) + (mkdir-p (dirname target)) + (link src target) + (delete-file src))) + '("/bin/dig" "/bin/delv" "/bin/nslookup" "/bin/host" "/bin/nsupdate" +"/share/man/man1/dig.1" +"/share/man/man1/host.1" +"/share/man/man1/nslookup.1" +"/share/man/man1/nsupdate.1" + (replace 'check + (lambda _ + (zero? (system* "make" "force-test"))) +(outputs `("out" "utils")) +(inputs + ;; it would be nice to add GeoIP and gssapi once there is package + `(("libcap" ,libcap) + ("libxml2" ,libxml2) + ("mysql" ,mysql) + ("openssl" ,openssl) + ("p11-kit" ,p11-kit))) +(native-inputs `(("perl" ,perl) + ("net-tools" ,net-tools))) +(synopsis "An implementation of the Domain Name System") +(description "BIND is an implementation of the Domain Name System (DNS) +protocols for the Internet. It is a reference implementation of those +protocols, but it is also production-grade software, suitable for use in +high-volume and high-reliability applications. The name BIND stands for +\"Berkeley Internet Name Domain\", because the software originated in the early +1980s at the University of California at Berkeley.") +(home-page "https://www.isc.org/downloads/bind;) +(license (list license:isc + (define-public bind-utils (package (name "bind-utils") -- 2.1.4 -- Avoid eavesdropping. Send strong encrypted email. PGP Public key ID: 1024D/2DE827B3 fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. signature.asc Description: Digital signature
[PATCH] gnu: Add bind
* gnu/packags/dns.scm (bind): New variable --- gnu/packages/dns.scm | 69 1 file changed, 69 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 819343a..dad8079 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Mark H Weaver;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,74 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; Source files only say GPL2 and GPL3 are allowed. (license (list license:gpl2 license:gpl3 +(define-public bind + (package +(name "bind") +(version "9.10.4-P2") +(source (origin + (method url-fetch) + (uri (string-append +"ftp://ftp.isc.org/isc/bind9/; version "/" name "-" +version ".tar.gz")) + (sha256 + (base32 +"08s48h5p916ixjiwgar4w6skc20crmg7yj1y7g89c083zvw8lnxk" +(build-system gnu-build-system) +(arguments + `(#:configure-flags + (list (string-append "--with-openssl=" +(assoc-ref %build-inputs "openssl")) + (string-append "--with-dlz-mysql=" +(assoc-ref %build-inputs "mysql")) + (string-append "--with-pkcs11=" +(assoc-ref %build-inputs "p11-kit"))) + #:phases + ;; When and if guix provides user namespaces for the build process, + ;; then the following can be uncommented and the subsequent "force-test" + ;; will not be necessary. + ;; + ;; (modify-phases %standard-phases + ;; (add-before 'check 'set-up-loopback + ;; (lambda _ + ;; (system "bin/tests/system/ifconfig.sh up" + (modify-phases %standard-phases + (add-after 'strip 'move-to-utils + (lambda _ + (for-each + (lambda (file) +(let ((target (string-append (assoc-ref %outputs "utils") file)) + (src (string-append (assoc-ref %outputs "out") file))) + (mkdir-p (dirname target)) + (link src target) + (delete-file src))) + '("/bin/dig" "/bin/delv" "/bin/nslookup" "/bin/host" "/bin/nsupdate" +"/share/man/man1/dig.1" +"/share/man/man1/host.1" +"/share/man/man1/nslookup.1" +"/share/man/man1/nsupdate.1" + (replace 'check + (lambda _ + (zero? (system* "make" "force-test"))) +(outputs `("out" "utils")) +(inputs + ;; it would be nice to add GeoIP and gssapi once there is package + `(("libcap" ,libcap) + ("libxml2" ,libxml2) + ("mysql" ,mysql) + ("openssl" ,openssl) + ("p11-kit" ,p11-kit))) +(native-inputs `(("perl" ,perl) + ("net-tools" ,net-tools))) +(synopsis "An implementation of the Domain Name System") +(description "BIND is an implementation of the Domain Name System (DNS) +protocols for the Internet. It is a reference implementation of those +protocols, but it is also production-grade software, suitable for use in +high-volume and high-reliability applications. The name BIND stands for +\"Berkeley Internet Name Domain\", because the software originated in the early +1980s at the University of California at Berkeley.") +(home-page "https://www.isc.org/downloads/bind;) +(license (list license:isc + (define-public bind-utils (package (name "bind-utils") -- 2.1.4
Re: [PATCH] gnu: Add bind
On Wed, Aug 31, 2016 at 08:38:53PM +0200, John Darrington wrote: > Thanks for the comments, > > On Wed, Aug 31, 2016 at 01:52:11PM -0400, Leo Famulari wrote: > On Tue, Aug 30, 2016 at 06:36:04PM +0200, John Darrington wrote: > > * gnu/packages/networking.scm (bind): New variable. > > Hi, thanks for this patch! I think it can go in the DNS module. > > I wonder, how does it relate to the BIND that replaces the bundled BIND > in isc-dhcp, which I've noticed often requires security updates? > > I don't think it relates at all, except that it is produced by the same group. > > However, I noticed in that module, there is bind-utils, which provides about > half of what my patch does, and IMO is unecessarily complicated. I suppose > this > was done because somebody wanted to provide the DNS query tools without the > DNS server. > > I think this would be better achieved by having separate outputs bind:utils > and bind:daemon Okay, so what is the status of this package? Do you want to add it as-is, or do you want to overhaul bind-utils? signature.asc Description: PGP signature
Re: [PATCH] gnu: Add bind
Thanks for the comments, On Wed, Aug 31, 2016 at 01:52:11PM -0400, Leo Famulari wrote: On Tue, Aug 30, 2016 at 06:36:04PM +0200, John Darrington wrote: > * gnu/packages/networking.scm (bind): New variable. Hi, thanks for this patch! I think it can go in the DNS module. I wonder, how does it relate to the BIND that replaces the bundled BIND in isc-dhcp, which I've noticed often requires security updates? I don't think it relates at all, except that it is produced by the same group. However, I noticed in that module, there is bind-utils, which provides about half of what my patch does, and IMO is unecessarily complicated. I suppose this was done because somebody wanted to provide the DNS query tools without the DNS server. I think this would be better achieved by having separate outputs bind:utils and bind:daemon > + (modify-phases %standard-phases > + (replace 'check > + (lambda _ > + (zero? (system* "make" "force-test"))) Does "force-test" mean that the test suite will return success even if there are some failures? If so, this should explicitly stated in a comment. Apparently, some tests cannot be run unless one makes some local hacks as root. force-test skips those tests which require that. J' -- Avoid eavesdropping. Send strong encryted email. PGP Public key ID: 1024D/2DE827B3 fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. signature.asc Description: Digital signature
Re: [PATCH] gnu: Add bind
On Tue, Aug 30, 2016 at 06:36:04PM +0200, John Darrington wrote: > * gnu/packages/networking.scm (bind): New variable. Hi, thanks for this patch! I think it can go in the DNS module. I wonder, how does it relate to the BIND that replaces the bundled BIND in isc-dhcp, which I've noticed often requires security updates? > +(description "BIND is an implementation of the Domain Name System (DNS) > +protocols for the Internet. It is a reference implementation of those > +protocols, but it is also production-grade software, suitable for use in > +high-volume and high-reliability applications. The name BIND stands for > +"Berkeley Internet Name Domain", because the software originated in the early > +1980s at the University of California at Berkeley.") The descriptions needs the quotation marks around the acronym description to be escaped. Otherwise, it doesn't work for me. > + (uri (string-append > +"ftp://ftp.isc.org/isc/bind9/; version "/" name "-" > +version ".tar.gz")) This server is unavailable over IPv6 connections: Starting download of /gnu/store/lhwlfx4qp94pn5d0xpflqib1cy2c4bhp-bind-9.10.4-P2.tar.gz >From ftp://ftp.isc.org/isc/bind9/9.10.4-P2/bind-9.10.4-P2.tar.gz... ERROR: Throw to key `ftp-error' with args `(# "PASV" 425 "You cannot use PASV on IPv6 connections. Use EPSV instead.\r")'. I wonder if there is a better URL? > + (modify-phases %standard-phases > + (replace 'check > + (lambda _ > + (zero? (system* "make" "force-test"))) Does "force-test" mean that the test suite will return success even if there are some failures? If so, this should explicitly stated in a comment.
[PATCH] gnu: Add bind
* gnu/packages/networking.scm (bind): New variable. --- gnu/packages/networking.scm | 46 + 1 file changed, 46 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bde..7bb4a69 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 Eric Bavier;;; Copyright © 2016 ng0 ;;; Coypright © 2016 Arun Isaac +;;; Coypright © 2016 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,51 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls)) +(define-public bind + (package +(name "bind") +(version "9.10.4-P2") +(source (origin + (method url-fetch) + (uri (string-append +"ftp://ftp.isc.org/isc/bind9/; version "/" name "-" +version ".tar.gz")) + (sha256 + (base32 +"08s48h5p916ixjiwgar4w6skc20crmg7yj1y7g89c083zvw8lnxk" +(build-system gnu-build-system) +(arguments + `(#:configure-flags + (list +(string-append "--with-openssl=" (assoc-ref %build-inputs "openssl"))) + + #:phases + ;; When and if guix provides user namespaces for the build process, + ;; then the following can be uncommented and the subsequent "force-test" + ;; will not be necessary. + + ;; (modify-phases %standard-phases + ;; (add-before 'check 'set-up-loopback + ;; (lambda _ + ;; (system "bin/tests/system/ifconfig.sh up" + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "make" "force-test"))) +(inputs + `(("openssl" ,openssl))) +(native-inputs `(("perl" ,perl) + ("net-tools" ,net-tools))) +(synopsis "An implementation of the Domain Name System") +(description "BIND is an implementation of the Domain Name System (DNS) +protocols for the Internet. It is a reference implementation of those +protocols, but it is also production-grade software, suitable for use in +high-volume and high-reliability applications. The name BIND stands for +"Berkeley Internet Name Domain", because the software originated in the early +1980s at the University of California at Berkeley.") +(home-page "https://www.isc.org/downloads/bind;) +(license license:bsd-2))) + (define-public macchanger (package (name "macchanger") -- 2.1.4
Re: [PATCH] gnu: Add bind
Sorry. Somehow this patch ended up with a whole lot of other stuff I didn't intend. Forget it for now. I'll send another patch for review when I've figured out what happened. J' On Mon, Aug 29, 2016 at 09:56:53PM +0200, John Darrington wrote: From: John Darrington* gnu/packages/networking.scm (bind): New variable. --- gnu/build/install.scm | 6 +++- gnu/local.mk | 1 - gnu/packages/crypto.scm| 40 ++ gnu/packages/gnunet.scm| 4 +-- gnu/packages/linux.scm | 40 +- .../patches/xf86-video-openchrome-glibc-2.20.patch | 15 gnu/packages/video.scm | 4 +-- gnu/packages/xorg.scm | 19 +- gnu/tests/base.scm | 36 +++ guix/scripts/lint.scm | 13 +++ tests/guix-environment-container.sh| 2 +- tests/lint.scm | 16 - 12 files changed, 162 insertions(+), 34 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch diff --git a/gnu/build/install.scm b/gnu/build/install.scm index aebf38c..7431a09 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright ?? 2013, 2014, 2015 Ludovic Court??s +;;; Copyright ?? 2013, 2014, 2015, 2016 Ludovic Court??s ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +118,10 @@ STORE." ("/var/guix/gcroots/booted-system" -> "/run/booted-system") ("/var/guix/gcroots/current-system" -> "/run/current-system") +;; XXX: 'guix-register' creates this symlink with a wrong target, so +;; create it upfront to be sure. +("/var/guix/gcroots/profiles" -> "/var/guix/profiles") + (directory "/bin") (directory "/tmp" 0 0 #o1777) ; sticky bit (directory "/var/tmp" 0 0 #o1777) diff --git a/gnu/local.mk b/gnu/local.mk index 98c8848..7ce8ad0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -857,7 +857,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ %D%/packages/patches/xf86-video-nv-remove-mibstore.patch\ - %D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-session-fix-xflock4.patch\ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b982b61..73681b2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -223,3 +223,43 @@ to provide security against off-line attacks, such as a drive falling into the wrong hands.") (license (list license:lgpl3+ ;encfs library license:gpl3+ ;command-line tools + +(define-public keyutils + (package +(name "keyutils") +(version "1.5.9") +(source + (origin + (method url-fetch) + (uri +(string-append "https://people.redhat.com/dhowells/keyutils/keyutils-; + version ".tar.bz2")) + (sha256 +(base32 + "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd")) + (modules '((guix build utils))) + ;; Create relative symbolic links instead of absolute ones to /lib/* + (snippet '(substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/") + "$(LNS) ") +(build-system gnu-build-system) +(arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags (list "CC=gcc" + "RPATH=-Wl,-rpath,$(DESTDIR)$(LIBDIR)" + (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + "INCLUDEDIR=/include" + "LIBDIR=/lib" + "MANDIR=/share/man" + "SHAREDIR=/share/keyutils") + #:test-target "test")) +(home-page "https://people.redhat.com/dhowells/keyutils/;)
[PATCH] gnu: Add bind
From: John Darrington* gnu/packages/networking.scm (bind): New variable. --- gnu/build/install.scm | 6 +++- gnu/local.mk | 1 - gnu/packages/crypto.scm| 40 ++ gnu/packages/gnunet.scm| 4 +-- gnu/packages/linux.scm | 40 +- .../patches/xf86-video-openchrome-glibc-2.20.patch | 15 gnu/packages/video.scm | 4 +-- gnu/packages/xorg.scm | 19 +- gnu/tests/base.scm | 36 +++ guix/scripts/lint.scm | 13 +++ tests/guix-environment-container.sh| 2 +- tests/lint.scm | 16 - 12 files changed, 162 insertions(+), 34 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch diff --git a/gnu/build/install.scm b/gnu/build/install.scm index aebf38c..7431a09 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +118,10 @@ STORE." ("/var/guix/gcroots/booted-system" -> "/run/booted-system") ("/var/guix/gcroots/current-system" -> "/run/current-system") +;; XXX: 'guix-register' creates this symlink with a wrong target, so +;; create it upfront to be sure. +("/var/guix/gcroots/profiles" -> "/var/guix/profiles") + (directory "/bin") (directory "/tmp" 0 0 #o1777) ; sticky bit (directory "/var/tmp" 0 0 #o1777) diff --git a/gnu/local.mk b/gnu/local.mk index 98c8848..7ce8ad0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -857,7 +857,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ %D%/packages/patches/xf86-video-nv-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch\ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-session-fix-xflock4.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b982b61..73681b2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -223,3 +223,43 @@ to provide security against off-line attacks, such as a drive falling into the wrong hands.") (license (list license:lgpl3+ ;encfs library license:gpl3+ ;command-line tools + +(define-public keyutils + (package +(name "keyutils") +(version "1.5.9") +(source + (origin + (method url-fetch) + (uri +(string-append "https://people.redhat.com/dhowells/keyutils/keyutils-; + version ".tar.bz2")) + (sha256 +(base32 + "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd")) + (modules '((guix build utils))) + ;; Create relative symbolic links instead of absolute ones to /lib/* + (snippet '(substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/") + "$(LNS) ") +(build-system gnu-build-system) +(arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags (list "CC=gcc" + "RPATH=-Wl,-rpath,$(DESTDIR)$(LIBDIR)" + (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + "INCLUDEDIR=/include" + "LIBDIR=/lib" + "MANDIR=/share/man" + "SHAREDIR=/share/keyutils") + #:test-target "test")) +(home-page "https://people.redhat.com/dhowells/keyutils/;) +(synopsis "Linux key managament utilities") +(description + "Keyutils is a set of utilities for managing the key retention facility in +the Linux kernel, which can be used by file systems, block devices, and more to +gain and retain the authorization and encryption keys required to perform +secure operations. ") +(license (list license:lgpl2.1+ ; the files keyutils.* + license:gpl2+; the rest diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index b08ba74..525cddc 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -126,14 +126,14 @@ tool to extract metadata from a file and print the results.") (define-public