From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYnmU-0007nT-T5 for guix-patches@gnu.org; Tue, 09 Jan 2018 01:53:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYnmQ-0003N9-SE for guix-patches@gnu.org; Tue, 09 Jan 2018 01:53:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYnmQ-0003M9-Mb for guix-patches@gnu.org; Tue, 09 Jan 2018 01:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eYnmQ-0005Ql-7W for guix-patches@gnu.org; Tue, 09 Jan 2018 01:53:02 -0500 Subject: [bug#30037] [PATCH] gnu: whois: Remove bundled mkpasswd. Resent-Message-ID: Date: Tue, 9 Jan 2018 06:51:57 +0000 From: ng0 Message-ID: <20180109065157.j4ffqj7rye5wwike@abyayala> References: <20180109010138.29740-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="auftsf2hbl6ui4fx" Content-Disposition: inline In-Reply-To: <20180109010138.29740-1-me@tobias.gr> 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: Tobias Geerinckx-Rice Cc: 30037@debbugs.gnu.org --auftsf2hbl6ui4fx Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Tobias Geerinckx-Rice transcribed 3.4K bytes: > * gnu/packages/networking.scm (whois)[source]: Remove mkpasswd sources in= a > snippet. > [native-inputs]: Add gettext. > [arguments]: Add =E2=80=98update-po=E2=80=99 phase. > [description]: Remove historical not about bundled mkpasswd. > --- >=20 > Guix, >=20 > A quick TODO item glanced in a recent commit notification, done. >=20 > 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... or you could move the mkpasswd to its own output. I think you want to look into the old discussions around this. I don't remember why this wasn't chosen, all I know is that upstream made it very clear to me that they won't separate mkpasswd. >=20 > Then again, it's not a licence issue so I don't really care that much. >=20 > Kind regards, >=20 > T G-R >=20 > gnu/packages/networking.scm | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) >=20 > 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 =C2=A9 2015 Mark H Weaver > ;;; Copyright =C2=A9 2015, 2016, 2017 Stefan Reich=C3=B6r > ;;; Copyright =C2=A9 2016 Raimon Grau > -;;; Copyright =C2=A9 2016, 2017 Tobias Geerinckx-Rice > +;;; Copyright =C2=A9 2016, 2017, 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2016 John Darrington > ;;; Copyright =C2=A9 2016, 2017 Nicolas Goaziou > ;;; Copyright =C2=A9 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 =E2=80=98mkpasswd=E2=80=99 bundled for histo= rical 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=3Dgcc" > (string-append "prefix=3D" (assoc-ref %outputs= "out"))) > #:phases > (modify-phases %standard-phases > + (add-after 'unpack 'update-po > + ;; Remove harmless but useless =E2=80=98mkpasswd=E2=80=99 rem= nants 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+))) > =20 > --=20 > 2.15.0 >=20 >=20 >=20 >=20 >=20 --=20 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys WWW: https://n0.is/a/ :: https://ea.n0.is --auftsf2hbl6ui4fx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlpUZo0ACgkQ4i+bv+40 hYjM1RAAq5GEIQtGNhz3PjQevmrO/sCOKbE6oFNxdstSExouCMYslEj6fKLnnKqC RDDcgkNSE5uuJpPfHtkL7w7rFmHGcudRuaNFeUgqaUdqg+lQ0TOpVNhwxV+L0x0W Ryeu25AJvFCgM03MFDrpBebzx2ZxNo9zZGTh7sU68Jx/vPU5m+Yi1hXrihomMRh3 TGeHlt1Uj444Q30eLYZhaORVGpDuE2HKthS1aW7gtBUz+VjAJDXmFh0iSfENJhtj bJE/Rf5t0oRJhg1Xh65l1ljSGaNIQdP90nmgD7JCp1CKxvv8jcVylXyG71dCoFIu qkHzqPkpPYBsU11kMQC5Z3r3Gk6qj47lW2VLxP60SraXfBDFmOhGbfyyPNVjo4BD BlpyspLjK8zXNtqyhaSR1WyvuvKoHRY+lbQyDzrJRXO9evfSwB4BgP4hUbR2XkVf 2hwUv7IuvLj6394mXjTx+TKQ38zvw748lhoHF1dMc6bvrt8ytBXplhrIQ9UehTVO M15GYF7FNEMD1SmTRQNzMIZei/IQTBH4/izXGE2pq0o1adTYI+EDpfX5KFQ4WUYK ExZ4xJiFdoiJ15Ebq/7hIrLKKFrXeWxuZdGAOGM+wGZrE1eRecFVSX3SkbUdUphD kLcFBZzJdns6exOjmHuGPaUYQ2y2HYxU682Ivnv8xJezvrZhu6g= =a6nP -----END PGP SIGNATURE----- --auftsf2hbl6ui4fx--