From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eu2QR-0004oB-SN for guix-patches@gnu.org; Thu, 08 Mar 2018 15:46:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eu2QM-0000sh-SA for guix-patches@gnu.org; Thu, 08 Mar 2018 15:46:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:43615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eu2QM-0000sa-NI for guix-patches@gnu.org; Thu, 08 Mar 2018 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eu2QM-00047k-75 for guix-patches@gnu.org; Thu, 08 Mar 2018 15:46:02 -0500 Subject: [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'. Resent-Message-ID: From: Marius Bakke In-Reply-To: <87zi3jporb.fsf@gnu.org> References: <20180306165642.4486-1-mbakke@fastmail.com> <20180306165642.4486-3-mbakke@fastmail.com> <87zi3jporb.fsf@gnu.org> Date: Thu, 08 Mar 2018 21:45:45 +0100 Message-ID: <87woym70ue.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 30734@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Marius Bakke skribis: > >> * gnu/packages/linux.scm (net-tools)[arguments]: In >> REMOVE-REDUNDANT-COMMANDS-PHASE, add regexp for ifconfig. >> --- >> gnu/packages/linux.scm | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm >> index dffe2c49c..8c07d1fdd 100644 >> --- a/gnu/packages/linux.scm >> +++ b/gnu/packages/linux.scm >> @@ -1290,7 +1290,7 @@ inadequately in modern network environments, and b= oth should be deprecated.") >> ;; Remove commands and man pages redundant with Inetutil= s. >> (let* ((out (assoc-ref outputs "out")) >> (dup (append-map (cut find-files out <>) >> - '("^hostname" >> + '("^hostname" "^ifconfig" > > GNU ifconfig is somewhat incompatible and may have a different feature > set compared to the one of net-tools, so I=E2=80=99d be in favor of keepi= ng it. > > WDYT? The motivation for this commit was to remove a conflict in %base-packages. Currently it's entirely random which ifconfig ends up in the system profile, which is not great. What about the below hack? Alternatively, it could be moved to a separate output. Thoughts? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-net-tools-Move-ifconfig-to-sbin.patch Content-Transfer-Encoding: quoted-printable From=200887b6af81781ae74f0a34c59f32ed098fa199dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Mar 2018 21:41:13 +0100 Subject: [PATCH] gnu: net-tools: Move 'ifconfig' to "/sbin". * gnu/packages/linux.scm (net-tools)[arguments]: In REMOVE-REDUNDANT-COMMANDS-PHASE, use rename-file on ifconfig. =2D-- gnu/packages/linux.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 875f11062..916309b79 100644 =2D-- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1286,6 +1286,11 @@ inadequately in modern network environments, and bot= h should be deprecated.") '("^hostname" "^(yp|nis|dns)?domainname")))) (for-each delete-file dup) + ;; ifconfig from net-tools is somewhat incompatible with + ;; GNU ifconfig, so we keep it around. Move it to "/sbin" + ;; to prevent conflict in %base-packages. + (rename-file (string-append out "/bin/ifconfig") + (string-append out "/sbin/ifconfig")) #t)))) ;; Binaries that depend on libnet-tools.a don't declare that ;; dependency, making it parallel-unsafe. =2D-=20 2.16.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqhoPkACgkQoqBt8qM6 VPo6MQf8CdVl3ium+344HMGTo5CzXbTK5JdDgL3sq2luXAFk8nE7ZVM6ha1nUQKD NlhgtyLfq9AzrGU5nShmgknHzzD2aYdU5MIt+YrCpzmOg8HLvo1s35DLw44Ec2Qh ybkX3gPJZY6Zi2ZdL60OjEpxPwAkVgRHdI0cTSw7OmsqqQtZC0N1RbGb3O9/jETB 0PzxIo8uOopCD9FLEJ2cjUwNH/KX88i6xnZL9NqUOD5ZunA7BKvnIN/njAY+okcV uR8h2GiBPbk8z9YXr1+jdWMH2HGxMDRaZywmN8n9K/FizZbkBz5Rf1IeU9IOafkS u3tdFf3iKXbhlfpC4itUkt4eNl3TkA== =1Osj -----END PGP SIGNATURE----- --==-=-=--