From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: bind-utils: Build and install =?utf-8?B?4oCcbnN1cGRh?= =?utf-8?B?dGXigJ0u?= Date: Wed, 13 Jan 2016 16:11:15 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJN5A-0005a8-Jn for guix-devel@gnu.org; Wed, 13 Jan 2016 10:11:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJN57-0000HQ-Cw for guix-devel@gnu.org; Wed, 13 Jan 2016 10:11:32 -0500 Received: from sinope.bbbm.mdc-berlin.de ([141.80.25.23]:38005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJN57-0000HK-3k for guix-devel@gnu.org; Wed, 13 Jan 2016 10:11:29 -0500 Received: from localhost (localhost [127.0.0.1]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP id 3E882280A5D for ; Wed, 13 Jan 2016 16:11:28 +0100 (CET) Received: from sinope.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (sinope.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LmYVjFT5QZEh for ; Wed, 13 Jan 2016 16:11:21 +0100 (CET) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by sinope.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Wed, 13 Jan 2016 16:11:21 +0100 (CET) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Guix, this patch is not as bad as it looks, even though most of the lines are changed. I noticed that =E2=80=9Cnsupdate=E2=80=9D is not build as part = of bind-utils and replaced the manual and repetitive =E2=80=9Cbuild=E2=80=9D and =E2=80= =9Cinstall=E2=80=9D phases with something that can be controlled with the let-bound values =E2=80=9Cbins=E2= =80=9D and =E2=80=9Clibs=E2=80=9D holding the names of executables and libraries, re= spectively. What do you think? (=E2=80=9Cnsupdate=E2=80=9D is checked for by the build system of some SE= Linux libraries, which are needed for SSSD.) ~~ Ricardo --=-=-= Content-Type: text/x-patch; charset="utf-8" Content-Disposition: inline; filename="0001-gnu-bind-utils-Build-and-install-nsupdate.patch" Content-Transfer-Encoding: quoted-printable >From ba328617777728c3534be6796b6b32a9a90954b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 13 Jan 2016 16:06:36 +0100 Subject: [PATCH] gnu: bind-utils: Build and install "nsupdate". * gnu/packages/dns.scm (bind-utils)[arguments]: Generalize "build" and "install" phases. --- gnu/packages/dns.scm | 105 ++++++++++++++++++++++++++++-----------------= ------ 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 8357dad..0a42722 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer +;;; Copyright =C2=A9 2016 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,51 +62,61 @@ and BOOTP/TFTP for network booting of diskless machin= es.") (license (list license:gpl2 license:gpl3)))) =20 (define-public bind-utils - (package - (name "bind-utils") - (version "9.10.3-P2") - (source (origin - (method url-fetch) - (uri (string-append "http://ftp.isc.org/isc/bind9/" versio= n - "/bind-" version ".tar.gz")) - (sha256 - (base32 - "1kbfzml37sx4r2xi4gq48ji8w5kckd1f6gdn6pk6njqdmh8ijv2a"))= )) - (build-system gnu-build-system) - (inputs - ;; it would be nice to add GeoIP and gssapi once there is package - `(("libcap" ,libcap) - ("libxml2" ,libxml2) - ("mysql" ,mysql) - ("openssl" ,openssl) - ("perl" ,perl) - ("p11-kit" ,p11-kit))) - (arguments - `(#:tests? #f ; no test phase implemented - #:configure-flags - (list (string-append "--with-openssl=3D" - (assoc-ref %build-inputs "openssl")) - (string-append "--with-dlz-mysql=3D" - (assoc-ref %build-inputs "mysql")) - (string-append "--with-pkcs11=3D" - (assoc-ref %build-inputs "p11-kit"))) - #:phases - (alist-replace - 'build - (lambda _ - (and (zero? (system* "make" "-C" "lib/dns")) - (zero? (system* "make" "-C" "lib/isc")) - (zero? (system* "make" "-C" "lib/bind9")) - (zero? (system* "make" "-C" "lib/isccfg")) - (zero? (system* "make" "-C" "lib/lwres")) - (zero? (system* "make" "-C" "bin/dig")))) - (alist-replace - 'install - (lambda _ (zero? (system* "make" "-C" "bin/dig" "install"))) - %standard-phases)))) - (home-page "https://www.isc.org/downloads/bind/") - (synopsis "Tools for querying nameservers") - (description - "These tools, included with ISC BIND, are useful for analysis of DN= S + (let ((libs '("dns" "isc" "bind9" "isccfg" "lwres")) + (bins '("dig" "nsupdate"))) + (package + (name "bind-utils") + (version "9.10.3-P2") + (source (origin + (method url-fetch) + (uri (string-append "http://ftp.isc.org/isc/bind9/" vers= ion + "/bind-" version ".tar.gz")) + (sha256 + (base32 + "1kbfzml37sx4r2xi4gq48ji8w5kckd1f6gdn6pk6njqdmh8ijv2a"= )))) + (build-system gnu-build-system) + (inputs + ;; it would be nice to add GeoIP and gssapi once there is package + `(("libcap" ,libcap) + ("libxml2" ,libxml2) + ("mysql" ,mysql) + ("openssl" ,openssl) + ("perl" ,perl) + ("p11-kit" ,p11-kit))) + (arguments + `(#:tests? #f ; no test phase implemented + #:configure-flags + (list (string-append "--with-openssl=3D" + (assoc-ref %build-inputs "openssl")) + (string-append "--with-dlz-mysql=3D" + (assoc-ref %build-inputs "mysql")) + (string-append "--with-pkcs11=3D" + (assoc-ref %build-inputs "p11-kit"))) + #:modules ((srfi srfi-1) + (srfi srfi-26) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (fold (lambda (dir pass) + (and pass (zero? (system* "make" "-C" dir)))) + #t + (append + (map (cut string-append "lib/" <>) + (list ,@libs)) + (map (cut string-append "bin/" <>) + (list ,@bins)))))) + (replace 'install + (lambda _ + (fold (lambda (dir pass) + (and pass (zero? (system* "make" "-C" dir "instal= l")))) + #t + (map (cut string-append "bin/" <>) + (list ,@bins)))))))) + (home-page "https://www.isc.org/downloads/bind/") + (synopsis "Tools for querying nameservers") + (description + "These tools, included with ISC BIND, are useful for analysis of = DNS issues or verification of configuration.") - (license (list license:isc)))) + (license (list license:isc))))) --=20 2.1.0 --=-=-=--