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
zcmbW0K}!Nb6vt<c4D4cI&?T5_hjM22%{<#%;88o&2MD(vX$un4A|yjB>Z-f9PT?Vs
zLHm8WcJ(7P>&ewkskuA`hTnVt|NBpOob8UYeO+RVDF9*$M>(mCgN*O-L7^n!rXnZ_
zj1$If8wH^(<dzp&oulx=&4t1meP(oiF$@$Ma1sVwrNM$ixpb^={iffzawy*yT;wXX
zW^1q7@cg>3J%^TSE$vXjm?*M?BC{!%jx0GKqF&*lI-uFWJzp`(!b^8&E7_C_1VSsZ
zg0-7wt9DK4VB;`&S`B@7eWJxX%Q&a8{y$k`+Y-{$3^V!QZkf|@w^?(fSqSC*gwH`+
zOY;;Ff7@9KNeRU8wf!-rF}SbeLVYP1BM=F-W8)&Lqb&nKImt>|cG3U<HlcDhJ3;p!
zvj8$e)f}p~#Ar1?mH@@g-cF`jgUwxIR`l}t<t|J$hj|_c1T$OWi$vmklpj9R_igL#
E2e($w%>V!Z

delta 862
zcmb7@F;Buk6vtbl42Gd5m^e7xK;op_d)K?e4o(aXu;?c!w!|*hKsAP-A!>Amc5^Ze
zt|l-z`wdLoU0wMIUK2}fArRj3+UD}V-~0bxdy{-`lJC0}pj4QqMpa26Qa%2Jf@@TA
zCV_L1>KPCOXoN<#?nJtN6nz@+qnv9j7BYp>$O=hLGeTjpdRRJkue`SBpIZd>5s;KN
zYIZx=tNV`E^jyaxrK%mc7C}m}Ob^PG5#ScDSf)BV?iO$BVdE^S>xC$26u08R{z}0E
z7fd6y7`|}X4(t{oTFdu?!RF3d+@lZUYvi2fEOmB8V;F+O%sj)K5neCzIHt>3!<eZs
zp+9vv?6@3|N-0wbC5cT3OeMvsq|tNdEsiMcHYF}fdLD&IrAAn6)>yxBb*bLDS^-tb
z#YvwJfXKK;`2ST2drb)|av*ZWAyP7TOI#JR^B^;++T4>wXFv|ZhxPH({dZ&G@`5?5
Z1&pI&n*Igji=VzRAiKjy^17|R`~qu;$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
 -------