From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYiGq-0002k3-Np for guix-patches@gnu.org; Mon, 08 Jan 2018 20:00:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYiGp-0003fr-BW for guix-patches@gnu.org; Mon, 08 Jan 2018 20:00:04 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYiGp-0003fX-7g for guix-patches@gnu.org; Mon, 08 Jan 2018 20:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eYiGp-0004rp-0U for guix-patches@gnu.org; Mon, 08 Jan 2018 20:00:03 -0500 Subject: [bug#30037] [PATCH] gnu: whois: Remove bundled mkpasswd. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYiFo-0002SR-0p for guix-patches@gnu.org; Mon, 08 Jan 2018 19:59:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYiFm-0002Ud-E1 for guix-patches@gnu.org; Mon, 08 Jan 2018 19:59:00 -0500 Received: from tobias.gr ([2001:470:cc92::1]:34190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eYiFl-0002Sq-Sq for guix-patches@gnu.org; Mon, 08 Jan 2018 19:58:58 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 01e6f260 for ; Tue, 9 Jan 2018 00:58:54 +0000 (UTC) Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 85590694 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Tue, 9 Jan 2018 00:58:53 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Tue, 9 Jan 2018 02:01:38 +0100 Message-Id: <20180109010138.29740-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30037@debbugs.gnu.org * gnu/packages/networking.scm (whois)[source]: Remove mkpasswd sources in a snippet. [native-inputs]: Add gettext. [arguments]: Add ‘update-po’ phase. [description]: Remove historical not about bundled mkpasswd. --- Guix, A quick TODO item glanced in a recent commit notification, done. While everything could be done in a single phase, I prefer ripping such cruft out early. Manually building the modified sources works fine, at the cost of slightly bloated .po files with some unused strings. It's unlikely someone will want to unpack this to build mkpasswd... Then again, it's not a licence issue so I don't really care that much. Kind regards, T G-R gnu/packages/networking.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 94621052d..9a8993be2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Raimon Grau -;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017 Nicolas Goaziou ;;; Copyright © 2016 Eric Bavier @@ -458,15 +458,31 @@ and up to 1 Mbit/s downstream.") name "_" version ".tar.xz")) (sha256 (base32 - "02f00vpgrdb77w7lskl9jfm2akpy21ws9cjazs13gash2xksnj38")))) + "02f00vpgrdb77w7lskl9jfm2akpy21ws9cjazs13gash2xksnj38")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove unused ‘mkpasswd’ bundled for historical reasons. + (for-each delete-file + (find-files "." "^mkpasswd\\.")) + (substitute* "Makefile" + ((" (install-|)mkpasswd ") " ")) + (substitute* "po/Makefile" + (("\\.\\./mkpasswd\\.c") "")) + #t)))) (build-system gnu-build-system) - ;; TODO: unbundle mkpasswd binary + its po files. + (native-inputs + `(("gettext" ,gettext))) ; for update-po phase (arguments `(#:tests? #f ; Does not exist #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'update-po + ;; Remove harmless but useless ‘mkpasswd’ remnants from .po files. + (lambda _ + (invoke "make" "-C" "po" "update-po"))) (delete 'configure) ; No configure (add-before 'build 'setenv (lambda _ @@ -481,9 +497,7 @@ and up to 1 Mbit/s downstream.") ("pkg-config" ,pkg-config))) (synopsis "Improved whois client") (description "This whois client is intelligent and can -automatically select the appropriate whois server for most queries. -Because of historical reasons this also includes a tool called mkpasswd -which can be used to encrypt a password with @code{crypt(3)}.") +automatically select the appropriate whois server for most queries.") (home-page "https://github.com/rfc1036/whois") (license license:gpl2+))) -- 2.15.0