From aa1c7ff7e8dd9dbda8ed935b7db7c9a81a164621 Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 22 Jul 2004 00:54:37 +0000
Subject: [PATCH] SF patch 995225:  tarfile.py fix for bug #990325

Removes CVS keywords from this binary file, so that test_tarfile passes
regardless of whether Python is checked out with -kk.
---
 Lib/test/testtar.tar | Bin 112640 -> 112640 bytes
 Misc/NEWS            |   8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Lib/test/testtar.tar b/Lib/test/testtar.tar
index 40125b31246d371d4e4b85c9f768e23114e72d2e..8fd0c50c92a54790f66e231202f97a196e17f2f0 100644
GIT binary patch
delta 892
zc-ozky-EW?6oqFaMu<(62sXmB7MhvaJ9Fc9LdwKKA3(D11Xsa;i6X&Bh@x$Fx3iKI
zrWD-wv9--3IGZYeB&@eN&G6lO&YA8g+Z|>5y2Kb$0K^DKIabC&j@1kbB?&i*pd>I(
z7`JT{gtCZRUSxGnqANES32XSB(fQ>tPzbXy;A#;pER;*9`rdE)jT?vZL%~I^Qfsyj
zstwPt``UA8xz^GS6^w}@J1R1pa_PvD10wDfo~i-OhVJE>IVQSx_jab2a)Cf-C0V+0
z*KE~pDGj!c!<Y5QcQ?mgyo-!;&eBF>+Y%PJ8D#R|!>Xi{nGHvpXO#D+qiJiIY)4E%
zQUWo0Z+}gA3?J*5_8?;r3AGb{vDML*0icv=001_ja<1;~KW+hJgsM4IZ$;2*o+UtW
m)7#l3E7;yQVa0FHKkiZ<hegF9u$g}li{D{>@Jc^-t&cyqR?p1<

delta 862
zc-obcF-yZx5XY0E9i&5q3Jwl$C^%`~yO(>f&EV9*p<VP7q$b5IM%pM+suY#Fw#nus
z9bAQGaP}Jr?yj!=2)-y%Q>7)h+&wsc_rL$W{xsj8=7(;DQ7TMRqbj5jshpG`P@@vL
zWQa_vngJ6`BQ&ygC(`x(=+$_h<XmGh$P|h(50XgdKw+`AS2}Rdy^iOfScL5Y15#S6
z+nr#i;X7W-a~+G6YIfjS1So|vt(GY#3@xl!rs|D*#j8fxJdPTAAqtws4LS=olcC@m
zsV6fFXPv-q6QZ?!KNziVtt2^mG2SN5QO;7m8I9q<B+TtI&KcpwGLOHdrL5uHR5ICc
zW=z*b22@I!fr3=h=)U{(1?aUTWL05OsS%zm6zi9+F4Y?`0|0=dMlf~ZeoL~9Isj1V
z5Gl;{5?94v4yb+9&prI%j7T-SU5)Q<-kS?q%>2(A1o`XO@#)9V7?JJqfIM#M51(s@
B$W8zN

diff --git a/Misc/NEWS b/Misc/NEWS
index af7b384b59d5..6e8c710563a3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,7 +47,7 @@ Library
   from a tarfile.
 
 - Patch #846659.  Fix an error in tarfile.py when using
-  GNU longname/longlink creation. 
+  GNU longname/longlink creation.
 
 - The obsolete FCNTL.py has been deleted.  The builtin fcntl module
   has been available (on platforms that support fcntl) since Python
@@ -144,9 +144,13 @@ New platforms
 Tests
 -----
 
-- The test data files for the decimal test suite are now installed on 
+- The test data files for the decimal test suite are now installed on
   platforms that use the Makefile.
 
+- SF patch 995225:  The test file testtar.tar accidentally contained
+  CVS keywords (like $Id$), which could cause spurious failures in
+  test_tarfile.py depending on how the test file was checked out.
+
 Windows
 -------
 
-- 
2.47.3