Leftover patch round-up

  • Done
  • quality assurance status badge
Details
2 participants
  • Leo Famulari
  • Ludovic Courtès
Owner
unassigned
Submitted by
Leo Famulari
Severity
normal
L
L
Leo Famulari wrote on 20 Apr 2017 20:25
(address . bug-guix@gnu.org)
20170420182538.GA11903@jasmine
Let's find the patch files whose filenames are not referenced anywhere,
except possibly in 'gnu/local.mk':

$ for patch in gnu/packages/patches/*; do result=$(grep -rI ${patch##*/}) \
&& test ${result%%:*} != "gnu/local.mk" || echo $patch; done
gnu/packages/patches/gcc-libiberty-printf-decl.patch
gnu/packages/patches/grub-CVE-2015-8370.patch
gnu/packages/patches/grub-freetype.patch
gnu/packages/patches/grub-gets-undeclared.patch
gnu/packages/patches/guile-arm-fixes.patch
gnu/packages/patches/hypre-doc-tables.patch
gnu/packages/patches/hypre-ldflags.patch
gnu/packages/patches/mplayer2-theora-fix.patch
gnu/packages/patches/readline-7.0-mingw.patch
gnu/packages/patches/soprano-find-clucene.patch
gnu/packages/patches/util-linux-CVE-2017-2616.patch
gnu/packages/patches/xf86-video-intel-compat-api.patch
gnu/packages/patches/xf86-video-intel-glibc-2.20.patch

Specific notes for each file:

gcc-libiberty-printf-decl.patch: Added in
b810a85019ab3c4ee1f889d0751b8eb06157dadc and mentioned in the
commit message but never used, AFAICT. Ludo?

gnu/packages/patches/grub-CVE-2015-8370.patch,
gnu/packages/patches/grub-freetype.patch,
gnu/packages/patches/grub-gets-undeclared.patch: Unused since grub was
updated to 2.02~beta3 in 4c7260011e219eb3ebf5da976ab107dbd5997829.

gnu/packages/patches/guile-arm-fixes.patch: Unused since guile was
updated to 2.0.12 in 923d9caa1800fb48b1745cf9ef0fd294a423d4cd,
4f07bb6b433a7fa2fdcb5f465f7b9dfdf0140dae.

gnu/packages/patches/hypre-doc-tables.patch,
gnu/packages/patches/hypre-ldflags.patch: Added but not used in
528bb46436be39a4f4d3e7b3e908c34e92cca5f8. I pinged Eric on #guix.

gnu/packages/patches/mplayer2-theora-fix.patch: Unused since
a6d605e648643cd98582bf1e339bf60706d7c6c6

gnu/packages/patches/readline-7.0-mingw.patch: Introduced in
ae12d586275cdd96db23fb01bf840b2055b5b979, but never used. Jan, can you
take a look?

gnu/packages/patches/soprano-find-clucene.patch: Unused since
dbbb45dd7318528ea92a56992be789d0b5cf2120.

gnu/packages/patches/util-linux-CVE-2017-2616.patch: Unused since
util-linux was updated to 2.29.2 in
83090f6ae7eb5353049b253f74670d72d9387463. The history of this update is
very confusing.

gnu/packages/patches/xf86-video-intel-compat-api.patch,
gnu/packages/patches/xf86-video-intel-glibc-2.20.patch: Unused since
6cc328b43b1ae2cc1d201844cff7c619187cca5e.
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlj4/SIACgkQJkb6MLrK
fwj7KhAAttkKTVzSl9GUQrrUIRk2V8T6HBILuLvlEHu9iDPBUT239J6PlqzUHwro
OIhzCHnad0VpDq5nNqi5f4f+4YhC7zabZXhm2Tkxt8cmzrmsjIyzfJ9CK9YAZaU2
S/PLZc2svmQmvm7HRFmVwVIYN9zG3KJ0+HS6qnYb6UCln8wsExIlmAjOHWRfk8w6
o4II/0F0mTxYq17yNsmbodBq77o8tgS2VVVGc6NrO6SE4XVwGEVhZnnR8QzXGFLf
SrKTOVgwKqI0S2mkN9OwHtf8KuWh1v54BE3240UxxIEhJ6Raz1MaSjjz8nqiZbsq
VtbzCbYCTmzWx/jE0PILPFWnfMZX59i0Gbu5uzooeoZMbI0binmUAKg6VnEq4DSR
r20YRCUjReQQiRbLcTUzFDwKR1TybYtWwdQicG6YpGIrhxtnyWjNMdroZBd7fZxr
spttzFlRfULiCo3hIvSWWDJRiSX1RVhckKFnvpfG6be3eidZlDYAEfSu3qFbmhmn
MQPZX7cL/cfkDiE/zdy7BPlqWTsCXTenA0O+0G+k732CLbDleR9nCHdamurwXpwJ
KDWSzRolIN65myvAHuENOrM1yKtkAzJoKQYgYHfUUOC+f1vHRWtSB65+s4Iz1Ljl
vhYOu0RhDRDBnpkD8LuS4tDp4fDxwIHrFkRl/0Z84RdCy/VjVMg=
=Oybd
-----END PGP SIGNATURE-----


L
L
Leo Famulari wrote on 20 Apr 2017 20:33
(address . bug-guix@gnu.org)
20170420183308.GA5958@jasmine
On Thu, Apr 20, 2017 at 02:25:38PM -0400, Leo Famulari wrote:
Toggle quote (6 lines)
> Let's find the patch files whose filenames are not referenced anywhere,
> except possibly in 'gnu/local.mk':
>
> $ for patch in gnu/packages/patches/*; do result=$(grep -rI ${patch##*/}) \
> && test ${result%%:*} != "gnu/local.mk" || echo $patch; done

This shell snippet needs improvement, to say the least! But it worked
okay this time :)
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlj4/uQACgkQJkb6MLrK
fwihQxAA2mepnSe/ZFjwjTsP06zxgLbAiaLMPBEsc02EDKIyL1bosM9Pay8LdI4H
lPchWWZMKv7t20LmwKdvnfarog8KTiFciPEKt58+bVHYJIihjIkV9jGLpe/G5dkW
TmDUUfN/t3ELW1J62oFx3DKkUWsyPJ4YygU6+jaSac/fD1BZjy1MDCq7L4Lszzv6
TEYR5TO7g8EW0lEyT9iCv84ktMRQ+dw4uIfBIWJxoJ3JozLc/jyZgYdB60bkXdVF
pJ+8IQPh/eh79ArVdjDxj0csv8Iho0J0iam/f0yr+PRrCFb170zCd/ER7gJVcxy8
zIAcIfx0jfL0TMHDaSHAOuzpN6fT/EdJITJqBqfVKJOeSd3fwX3NzKnczZYC8DCK
O9fViP/nmxlYAZ+Gv0pq8bZNl5qtLRplfjUj0yJNJPiOYY/kkB0OAm0FnrUCH3sg
wdxea0oA1qyyjtICligURoPISHzv6jnzkPb8dK7uSo4crPHCWLaMd3rEASnsCEvO
ry+rbheBP66Z07Zu7gh6jCfcXR7+OYnfPCNTtZxtz2AuO9AkLUzEoYzk76+UWUL6
v+lNNUIBK8WVxl7p6LBrJ+js+jNpeRy90ZYxstjyQ05x6fbMMJRXJ+oZU0Nh08GK
PZXVGVFCPDZl8mloumqR25njpls9RXxvyrlEQlLZPXVX5iYTHgE=
=eKli
-----END PGP SIGNATURE-----


L
L
Ludovic Courtès wrote on 21 Apr 2017 23:19
Re: bug#26581: Leftover patch round-up
(name . Leo Famulari)(address . leo@famulari.name)(address . 26581@debbugs.gnu.org)
87d1c5a26q.fsf@gnu.org
Leo Famulari <leo@famulari.name> skribis:

Toggle quote (3 lines)
> Let's find the patch files whose filenames are not referenced anywhere,
> except possibly in 'gnu/local.mk':

Woohoo, spring cleanup! :-)

Toggle quote (6 lines)
> Specific notes for each file:
>
> gcc-libiberty-printf-decl.patch: Added in
> b810a85019ab3c4ee1f889d0751b8eb06157dadc and mentioned in the
> commit message but never used, AFAICT. Ludo?

It was used for 5.3 (commit e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b,
which the commit above reinstated; see
5.4. So yes, can be removed!

Except for this one:

Toggle quote (4 lines)
> gnu/packages/patches/readline-7.0-mingw.patch: Introduced in
> ae12d586275cdd96db23fb01bf840b2055b5b979, but never used. Jan, can you
> take a look?

… it looks like you can go ahead and remove’em all!

Maybe we should add a makefile target to check for stale patches?

Thanks,
Ludo’.
L
L
Leo Famulari wrote on 22 Apr 2017 00:06
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 26581@debbugs.gnu.org)
20170421220654.GA32126@jasmine
On Fri, Apr 21, 2017 at 11:19:41PM +0200, Ludovic Courtès wrote:
Toggle quote (10 lines)
> Leo Famulari <leo@famulari.name> skribis:
> > gcc-libiberty-printf-decl.patch: Added in
> > b810a85019ab3c4ee1f889d0751b8eb06157dadc and mentioned in the
> > commit message but never used, AFAICT. Ludo?
>
> It was used for 5.3 (commit e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b,
> which the commit above reinstated; see
> <https://gcc.gnu.org/ml/gcc-help/2016-04/msg00039.html>) but useless in
> 5.4. So yes, can be removed!

Ah, thanks for sharing the context.

Toggle quote (8 lines)
> Except for this one:
>
> > gnu/packages/patches/readline-7.0-mingw.patch: Introduced in
> > ae12d586275cdd96db23fb01bf840b2055b5b979, but never used. Jan, can you
> > take a look?
>
> … it looks like you can go ahead and remove’em all!

Done as 04b906799168008c41f62402eee74bd47c1c2681.

Toggle quote (2 lines)
> Maybe we should add a makefile target to check for stale patches?

We're discussing it here:


I'll leave this bug open while we decide what to do about
readline-7.0-mingw.patch.
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlj6gn4ACgkQJkb6MLrK
fwj//BAA3NWDzkzSQpIDmFgtyukwwYZpf8K+hhgLUPOKFYCd2gFdzsjjpmTlqM07
e4IyAzyOZmNf6PsTEzedpGm7LNfzdZMQLqA2/7GU8C24lF12tw7ZBr0wRz4smc2L
9cu95llfehnHoeWGpmqC2JlAqIbABo8WsjP6T3TG/5mRVHwcz2FwUaYI01vzovjk
lmLXJO3R4iJa/BrdlTpxqhb3unVKyuhcU8Rr81SetF+NIu+wU9I6ZSlP3umUR7Og
bFPXjSKXVG5pc4/73O4pKduE8IV40L5P4vj2AAfR955oOflaDD9oGz+mu4PvAnRW
V5+dVwxR2NIxwu7MfKYNui1LSbyxutRzKkxKY2O669T97wQI8jLXYL9Swdgcelgo
zuPkBCKZye3mFt3FbxzZHAP2TtIiGCLvczCaIQ0S7r+eeglU+n6AKJf7YTkyrOMM
Nr4krhiIhug8XNCR88pP0J1Jmp2d9RUYN3fwmhjdJS46TrjHYUpCKWBIm0hHFLeC
MljTosmR8+QLby7z2FQCD4BirVohca9T7DXPICnLzunAJ/gXWBNrUhRfuTtBsuOR
7yYFWrj4teQF0K3jaThF7Ar9SJGY8O6fu3LCX5kGBNM4/zrX9g/Y5U3BWdx//EBV
vSEdu2G6LM9XFiKjG7bhP/4Fo0IzAaVKagQSUWa4PVMvpi+H8Mk=
=IwgI
-----END PGP SIGNATURE-----


L
L
Ludovic Courtès wrote on 13 May 2017 21:35
control message for bug #26581
(address . control@debbugs.gnu.org)
87h90ozh0n.fsf@gnu.org
tags 26581 easy
L
L
Leo Famulari wrote on 4 Feb 2019 23:51
Re: bug#26581: Leftover patch round-up
(address . 26581-done@debbugs.gnu.org)
20190204225123.GA13032@jasmine.lan
On Fri, Apr 21, 2017 at 06:06:54PM -0400, Leo Famulari wrote:
Toggle quote (3 lines)
> I'll leave this bug open while we decide what to do about
> readline-7.0-mingw.patch.

I've removed this patch in commit
bfa3e64d7f97c759e5b4f5977827100ecd0df03c
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlxYwesACgkQJkb6MLrK
fwh+nw//QGtDaHedLm/Me8GAqVJ5uEoU0JRK/bgQxZgrjJcz3HZEPVFJsv50yRhO
NTdvbNN1WbgkIYKxf/43vuZBuixuWy6I0UOKApgzDabZNABm5qvQN6Ik1BagxK4/
WNH7l1hS9FzaK81nks9oBwjAD2t/5ch5d3/gXKRwIzRxxrxjCj0LNbEHv7kYqtWE
a1+phdIdZsBmdbW2ELMn1TwvnekPgWIDHItUAm0+0qjxlYghfJlotIBGy9spcfCb
Kby8RDSM32O8dLGq1S3VfB59b7S4moVhn5T2WJnq2J1YWvo9P0D1yCMRTeP4SQvj
ZjImt2BMbXG7DdvsFJkmmEsVbAREQahVwbwHgeBbUvnm9156xohJjYY2uZGRhmQ7
ohuQFmto+G8etIcADzyw+KWSijxnuznrrMVjSv/qRLi5esSsNWssPnOpRak92Uh2
8//LwyCQ4ZiTEDVV2FAovu+JLFcOK5Q01Y2IoHmxosCWtcksOja3q5eMsKq6mFTm
M0CkIeLCa+8OMgi2wFlfSrFq1e8RcWEh8yNz2dbOw78tTHQFGNXEhm6hyVfS4WIb
e8djZ0CsFcvvl8zSrTCaO9OL7KmZ7VWG4KLAxFrytn6MkK5Jm7WGk9RkvAlMP6vM
PY+w1mqLcCWTWozByQcenMhptAqxS2xxNWoUEf5ZhQNMmr5KPT0=
=JRnU
-----END PGP SIGNATURE-----


Closed
?