From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: bug#27811: net-tools patch has no effect? Date: Tue, 25 Jul 2017 00:59:47 -0400 Message-ID: <20170725045947.GA531@jasmine.lan> References: <20170725041225.GA31642@jasmine.lan> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="/9DWx/yDrRhgMJTb" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZrxy-0000E2-W8 for bug-guix@gnu.org; Tue, 25 Jul 2017 01:01:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZrxv-0005Ey-3p for bug-guix@gnu.org; Tue, 25 Jul 2017 01:01:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZrxu-0005En-S6 for bug-guix@gnu.org; Tue, 25 Jul 2017 01:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dZrxu-000634-D8 for bug-guix@gnu.org; Tue, 25 Jul 2017 01:01:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <20170725041225.GA31642@jasmine.lan> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 27811@debbugs.gnu.org --/9DWx/yDrRhgMJTb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 25, 2017 at 12:12:25AM -0400, Leo Famulari wrote: > This problem with the wrong number of arguments being passed to > parse_media() is introduced in the Debian patch, so we should check if > there is a better version of the patch or if fixes are being applied > upstream. Actually, the first issue is that the patch doesn't apply to the source fully. I tried a later patch from Debian, but it also doesn't apply. I haven't been able to try fetching a later revision of the net-tools Git repo, because I first have to make Git not depend on net-tools. This patch will try to apply the patch and handle the exit codes of gunzip and patch correctly: diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 456909a94..cab6abb32 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1220,14 +1217,15 @@ messages and are accompanied by a set of manpages.") (zero? (system* "patch" "-p1" "--force" "--input" file))) =20 - (let ((patch.gz (assoc-ref inputs "patch"))) + (let ((patch.gz (assoc-ref inputs "debian-patch"))) (format #t "applying Debian patch set '~a'...~%" patch.gz) - (system (string-append "gunzip < " patch.gz " > the-p= atch")) - (and (apply-patch "the-patch") - (for-each apply-patch - (find-files "debian/patches" - "\\.patch"))))) + (and + (zero? (system (string-append "gunzip < " patch.gz = " > debian-patch"))) + (and (apply-patch "debian-patch") + (every apply-patch + (find-files "debian/patches" + "\\.patch")))))) (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -1270,7 +1268,7 @@ messages and are accompanied by a set of manpages.") =20 ;; Use the big Debian patch set (the thing does not even compile out of ;; the box.) - (inputs `(("patch" ,(origin + (inputs `(("debian-patch" ,(origin (method url-fetch) (uri "http://ftp.de.debian.org/debian/pool/main/n/net= -tools/net-tools_1.60-24.2.diff.gz") --/9DWx/yDrRhgMJTb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAll20EAACgkQJkb6MLrK fwjW/A//ZE22iCDRyuvgiSv5VXaE800ltQFLCX3etduGpDNl1CRqsmZq6lNSnWuD bScsuX1FZlgm2A9bPD+9bTK98w4zE0f0mVnVpQhBn1heBwSgRrDQ6dPM0PXMSV51 aXhqaGP050ENFhSYmn7goEPl9LEKU8N7wifbZM90j6KGayU1a5kcCkB7nCD0qWgY 2kif/kGBDiCoqAhDOD9FfYo2KDfBAh/mQUft46X2rs+nD1ZbP4uuj+MkZ9aGQFfj 3ODiSzl++yE6bQaxteJwNI5LIi6eqSZZOpWwQnDbZE0mIBbk4FmUAW9aQPGQj+ii YPH5nYdNkcys7fLX0FtmXSOaGO0Q3iH+TzNubK2rbCQ3H8Z8xNtV0bWXcF2k4FKH ag+2ywK0vS1QgKoFrRteXdqc9v4MHBBxYyFpVEZgFqvy0+DNGj9L3ftdbzY+dIAu mUeS5kBreXqlaMZk/65iPhxVpGnMg8mJ+sk34S4FGAOqkn+F2Gfj8w8aZiO5yr/v +AiVEURmvCaoauOHeHQQLditxqADCmv5cPn8EPwfjgguD0ELWpWL8qPNJxpBJwLW ywmhHUQOdl+SQbd4nFhfsWrfglOLmK06LMZ0h6HCLaf5Xchyd5fdpMtLCB2KapIV xYKlOeZnplbdsqCuLwoazH1kgSt+FyzkL1oF0A3CzHlFyGPRiDo= =6dFD -----END PGP SIGNATURE----- --/9DWx/yDrRhgMJTb--