From 38c6a22f38a249d107691a79f2b16a62ba8c73be Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 10 May 2006 16:26:03 +0000 Subject: [PATCH] Patch #1484695: Update the tarfile module to version 0.8. This fixes a couple of issues, notably handling of long file names using the GNU LONGNAME extension. --- Doc/lib/libtarfile.tex | 6 +- Lib/tarfile.py | 376 +++++++++++++++++++++------------------ Lib/test/test_tarfile.py | 49 ++++- Lib/test/testtar.tar | Bin 112640 -> 133120 bytes Misc/NEWS | 4 + 5 files changed, 254 insertions(+), 181 deletions(-) diff --git a/Doc/lib/libtarfile.tex b/Doc/lib/libtarfile.tex index a49942bc536..ca6e65a8ad5 100644 --- a/Doc/lib/libtarfile.tex +++ b/Doc/lib/libtarfile.tex @@ -334,8 +334,12 @@ the file's data itself. Create and return a \class{TarInfo} object from a string buffer. \end{methoddesc} -\begin{methoddesc}{tobuf}{} +\begin{methoddesc}{tobuf}{posix} Create a string buffer from a \class{TarInfo} object. + See \class{TarFile}'s \member{posix} attribute for information + on the \var{posix} argument. It defaults to \constant{False}. + + \versionadded[The \var{posix} parameter]{2.5} \end{methoddesc} A \code{TarInfo} object has the following public data attributes: diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 0b3d4771719..8987ca709e7 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -33,7 +33,7 @@ __version__ = "$Revision$" # $Source$ -version = "0.6.4" +version = "0.8.0" __author__ = "Lars Gustäbel (lars@gustaebel.de)" __date__ = "$Date$" __cvsid__ = "$Id$" @@ -137,16 +137,64 @@ def nts(s): """ return s.rstrip(NUL) -def calc_chksum(buf): - """Calculate the checksum for a member's header. It's a simple addition - of all bytes, treating the chksum field as if filled with spaces. - buf is a 512 byte long string buffer which holds the header. +def stn(s, length): + """Convert a python string to a null-terminated string buffer. """ - chk = 256 # chksum field is treated as blanks, - # so the initial value is 8 * ord(" ") - for c in buf[:148]: chk += ord(c) # sum up all bytes before chksum - for c in buf[156:]: chk += ord(c) # sum up all bytes after chksum - return chk + return struct.pack("%ds" % (length - 1), s) + NUL + +def nti(s): + """Convert a number field to a python number. + """ + # There are two possible encodings for a number field, see + # itn() below. + if s[0] != chr(0200): + n = int(s.rstrip(NUL) or "0", 8) + else: + n = 0L + for i in xrange(len(s) - 1): + n <<= 8 + n += ord(s[i + 1]) + return n + +def itn(n, digits=8, posix=False): + """Convert a python number to a number field. + """ + # POSIX 1003.1-1988 requires numbers to be encoded as a string of + # octal digits followed by a null-byte, this allows values up to + # (8**(digits-1))-1. GNU tar allows storing numbers greater than + # that if necessary. A leading 0200 byte indicates this particular + # encoding, the following digits-1 bytes are a big-endian + # representation. This allows values up to (256**(digits-1))-1. + if 0 <= n < 8 ** (digits - 1): + s = "%0*o" % (digits - 1, n) + NUL + else: + if posix: + raise ValueError, "overflow in number field" + + if n < 0: + # XXX We mimic GNU tar's behaviour with negative numbers, + # this could raise OverflowError. + n = struct.unpack("L", struct.pack("l", n))[0] + + s = "" + for i in xrange(digits - 1): + s = chr(n & 0377) + s + n >>= 8 + s = chr(0200) + s + return s + +def calc_chksums(buf): + """Calculate the checksum for a member's header by summing up all + characters except for the chksum field which is treated as if + it was filled with spaces. According to the GNU tar sources, + some tars (Sun and NeXT) calculate chksum with signed char, + which will be different if there are chars in the buffer with + the high bit set. So we calculate two checksums, unsigned and + signed. + """ + unsigned_chksum = 256 + sum(struct.unpack("148B", buf[:148]) + struct.unpack("356B", buf[156:512])) + signed_chksum = 256 + sum(struct.unpack("148b", buf[:148]) + struct.unpack("356b", buf[156:512])) + return unsigned_chksum, signed_chksum def copyfileobj(src, dst, length=None): """Copy length bytes from fileobj src to fileobj dst. @@ -655,7 +703,7 @@ class ExFileObject(object): """Get an iterator over the file object. """ if self.closed: - raise ValueError("I/O operation on closed file") + raise ValueError, "I/O operation on closed file" return self def next(self): @@ -684,24 +732,24 @@ class TarInfo(object): of the member. """ - self.name = name # member name (dirnames must end with '/') - self.mode = 0666 # file permissions - self.uid = 0 # user id - self.gid = 0 # group id - self.size = 0 # file size - self.mtime = 0 # modification time - self.chksum = 0 # header checksum - self.type = REGTYPE # member type - self.linkname = "" # link name - self.uname = "user" # user name - self.gname = "group" # group name - self.devmajor = 0 #- - self.devminor = 0 #-for use with CHRTYPE and BLKTYPE - self.prefix = "" # prefix to filename or holding information - # about sparse files + self.name = name # member name (dirnames must end with '/') + self.mode = 0666 # file permissions + self.uid = 0 # user id + self.gid = 0 # group id + self.size = 0 # file size + self.mtime = 0 # modification time + self.chksum = 0 # header checksum + self.type = REGTYPE # member type + self.linkname = "" # link name + self.uname = "user" # user name + self.gname = "group" # group name + self.devmajor = 0 # device major number + self.devminor = 0 # device minor number + self.prefix = "" # prefix to filename or information + # about sparse files - self.offset = 0 # the tar header starts here - self.offset_data = 0 # the file's data starts here + self.offset = 0 # the tar header starts here + self.offset_data = 0 # the file's data starts here def __repr__(self): return "<%s %r at %#x>" % (self.__class__.__name__,self.name,id(self)) @@ -710,95 +758,57 @@ class TarInfo(object): def frombuf(cls, buf): """Construct a TarInfo object from a 512 byte string buffer. """ + if len(buf) != BLOCKSIZE: + raise ValueError, "truncated header" + if buf.count(NUL) == BLOCKSIZE: + raise ValueError, "empty header" + tarinfo = cls() - tarinfo.name = nts(buf[0:100]) - tarinfo.mode = int(buf[100:108], 8) - tarinfo.uid = int(buf[108:116],8) - tarinfo.gid = int(buf[116:124],8) - - # There are two possible codings for the size field we - # have to discriminate, see comment in tobuf() below. - if buf[124] != chr(0200): - tarinfo.size = long(buf[124:136], 8) - else: - tarinfo.size = 0L - for i in range(11): - tarinfo.size <<= 8 - tarinfo.size += ord(buf[125 + i]) - - tarinfo.mtime = long(buf[136:148], 8) - tarinfo.chksum = int(buf[148:156], 8) - tarinfo.type = buf[156:157] + tarinfo.buf = buf + tarinfo.name = nts(buf[0:100]) + tarinfo.mode = nti(buf[100:108]) + tarinfo.uid = nti(buf[108:116]) + tarinfo.gid = nti(buf[116:124]) + tarinfo.size = nti(buf[124:136]) + tarinfo.mtime = nti(buf[136:148]) + tarinfo.chksum = nti(buf[148:156]) + tarinfo.type = buf[156:157] tarinfo.linkname = nts(buf[157:257]) - tarinfo.uname = nts(buf[265:297]) - tarinfo.gname = nts(buf[297:329]) - try: - tarinfo.devmajor = int(buf[329:337], 8) - tarinfo.devminor = int(buf[337:345], 8) - except ValueError: - tarinfo.devmajor = tarinfo.devmajor = 0 + tarinfo.uname = nts(buf[265:297]) + tarinfo.gname = nts(buf[297:329]) + tarinfo.devmajor = nti(buf[329:337]) + tarinfo.devminor = nti(buf[337:345]) tarinfo.prefix = buf[345:500] - # Some old tar programs represent a directory as a regular - # file with a trailing slash. - if tarinfo.isreg() and tarinfo.name.endswith("/"): - tarinfo.type = DIRTYPE - - # The prefix field is used for filenames > 100 in - # the POSIX standard. - # name = prefix + '/' + name - if tarinfo.type != GNUTYPE_SPARSE: - tarinfo.name = normpath(os.path.join(nts(tarinfo.prefix), tarinfo.name)) - - # Directory names should have a '/' at the end. - if tarinfo.isdir(): - tarinfo.name += "/" + if tarinfo.chksum not in calc_chksums(buf): + raise ValueError, "invalid header" return tarinfo - def tobuf(self): + def tobuf(self, posix=False): """Return a tar header block as a 512 byte string. """ - # Prefer the size to be encoded as 11 octal ascii digits - # which is the most portable. If the size exceeds this - # limit (>= 8 GB), encode it as an 88-bit value which is - # a GNU tar feature. - if self.size <= MAXSIZE_MEMBER: - size = "%011o" % self.size - else: - s = self.size - size = "" - for i in range(11): - size = chr(s & 0377) + size - s >>= 8 - size = chr(0200) + size + parts = [ + stn(self.name, 100), + itn(self.mode & 07777, 8, posix), + itn(self.uid, 8, posix), + itn(self.gid, 8, posix), + itn(self.size, 12, posix), + itn(self.mtime, 12, posix), + " ", # checksum field + self.type, + stn(self.linkname, 100), + stn(MAGIC, 6), + stn(VERSION, 2), + stn(self.uname, 32), + stn(self.gname, 32), + itn(self.devmajor, 8, posix), + itn(self.devminor, 8, posix), + stn(self.prefix, 155) + ] - # The following code was contributed by Detlef Lannert. - parts = [] - for value, fieldsize in ( - (self.name, 100), - ("%07o" % (self.mode & 07777), 8), - ("%07o" % self.uid, 8), - ("%07o" % self.gid, 8), - (size, 12), - ("%011o" % self.mtime, 12), - (" ", 8), - (self.type, 1), - (self.linkname, 100), - (MAGIC, 6), - (VERSION, 2), - (self.uname, 32), - (self.gname, 32), - ("%07o" % self.devmajor, 8), - ("%07o" % self.devminor, 8), - (self.prefix, 155) - ): - l = len(value) - parts.append(value[:fieldsize] + (fieldsize - l) * NUL) - - buf = "".join(parts) - chksum = calc_chksum(buf) + buf = struct.pack("%ds" % BLOCKSIZE, "".join(parts)) + chksum = calc_chksums(buf)[0] buf = buf[:148] + "%06o\0" % chksum + buf[155:] - buf += (BLOCKSIZE - len(buf)) * NUL self.buf = buf return buf @@ -873,12 +883,12 @@ class TarFile(object): self.fileobj = fileobj # Init datastructures - self.closed = False - self.members = [] # list of members as TarInfo objects - self._loaded = False # flag if all members have been read - self.offset = 0L # current position in the archive file - self.inodes = {} # dictionary caching the inodes of - # archive members already added + self.closed = False + self.members = [] # list of members as TarInfo objects + self._loaded = False # flag if all members have been read + self.offset = 0L # current position in the archive file + self.inodes = {} # dictionary caching the inodes of + # archive members already added if self._mode == "r": self.firstmember = None @@ -1347,7 +1357,7 @@ class TarFile(object): tarinfo.name = tarinfo.name[:LENGTH_NAME - 1] self._dbg(2, "tarfile: Created GNU tar extension LONGNAME") - self.fileobj.write(tarinfo.tobuf()) + self.fileobj.write(tarinfo.tobuf(self.posix)) self.offset += BLOCKSIZE # If there's data to follow, append it. @@ -1660,7 +1670,6 @@ class TarFile(object): raise ExtractError, "could not change modification time" #-------------------------------------------------------------------------- - def next(self): """Return the next member of the archive as a TarInfo object, when TarFile is opened for reading. Return None if there is no more @@ -1678,70 +1687,81 @@ class TarFile(object): buf = self.fileobj.read(BLOCKSIZE) if not buf: return None + try: tarinfo = TarInfo.frombuf(buf) - except ValueError: + + # Set the TarInfo object's offset to the current position of the + # TarFile and set self.offset to the position where the data blocks + # should begin. + tarinfo.offset = self.offset + self.offset += BLOCKSIZE + + tarinfo = self.proc_member(tarinfo) + + except ValueError, e: if self.ignore_zeros: - if buf.count(NUL) == BLOCKSIZE: - adj = "empty" - else: - adj = "invalid" - self._dbg(2, "0x%X: %s block" % (self.offset, adj)) + self._dbg(2, "0x%X: %s" % (self.offset, e)) self.offset += BLOCKSIZE continue else: - # Block is empty or unreadable. if self.offset == 0: - # If the first block is invalid. That does not - # look like a tar archive we can handle. - raise ReadError,"empty, unreadable or compressed file" + raise ReadError, str(e) return None break - # We shouldn't rely on this checksum, because some tar programs - # calculate it differently and it is merely validating the - # header block. We could just as well skip this part, which would - # have a slight effect on performance... - if tarinfo.chksum != calc_chksum(buf): - self._dbg(1, "tarfile: Bad Checksum %r" % tarinfo.name) + # Some old tar programs represent a directory as a regular + # file with a trailing slash. + if tarinfo.isreg() and tarinfo.name.endswith("/"): + tarinfo.type = DIRTYPE - # Set the TarInfo object's offset to the current position of the - # TarFile and set self.offset to the position where the data blocks - # should begin. - tarinfo.offset = self.offset - self.offset += BLOCKSIZE + # The prefix field is used for filenames > 100 in + # the POSIX standard. + # name = prefix + '/' + name + tarinfo.name = normpath(os.path.join(nts(tarinfo.prefix), tarinfo.name)) - # Check if the TarInfo object has a typeflag for which a callback - # method is registered in the TYPE_METH. If so, then call it. - if tarinfo.type in self.TYPE_METH: - return self.TYPE_METH[tarinfo.type](self, tarinfo) - - tarinfo.offset_data = self.offset - if tarinfo.isreg() or tarinfo.type not in SUPPORTED_TYPES: - # Skip the following data blocks. - self.offset += self._block(tarinfo.size) + # Directory names should have a '/' at the end. + if tarinfo.isdir(): + tarinfo.name += "/" self.members.append(tarinfo) return tarinfo #-------------------------------------------------------------------------- - # Below are some methods which are called for special typeflags in the - # next() method, e.g. for unwrapping GNU longname/longlink blocks. They - # are registered in TYPE_METH below. You can register your own methods - # with this mapping. - # A registered method is called with a TarInfo object as only argument. - # - # During its execution the method MUST perform the following tasks: - # 1. set tarinfo.offset_data to the position where the data blocks begin, - # if there is data to follow. - # 2. set self.offset to the position where the next member's header will + # The following are methods that are called depending on the type of a + # member. The entry point is proc_member() which is called with a TarInfo + # object created from the header block from the current offset. The + # proc_member() method can be overridden in a subclass to add custom + # proc_*() methods. A proc_*() method MUST implement the following + # operations: + # 1. Set tarinfo.offset_data to the position where the data blocks begin, + # if there is data that follows. + # 2. Set self.offset to the position where the next member's header will # begin. - # 3. append the tarinfo object to self.members, if it is supposed to appear - # as a member of the TarFile object. - # 4. return tarinfo or another valid TarInfo object. + # 3. Return tarinfo or another valid TarInfo object. + def proc_member(self, tarinfo): + """Choose the right processing method for tarinfo depending + on its type and call it. + """ + if tarinfo.type in (GNUTYPE_LONGNAME, GNUTYPE_LONGLINK): + return self.proc_gnulong(tarinfo) + elif tarinfo.type == GNUTYPE_SPARSE: + return self.proc_sparse(tarinfo) + else: + return self.proc_builtin(tarinfo) + + def proc_builtin(self, tarinfo): + """Process a builtin type member or an unknown member + which will be treated as a regular file. + """ + tarinfo.offset_data = self.offset + if tarinfo.isreg() or tarinfo.type not in SUPPORTED_TYPES: + # Skip the following data blocks. + self.offset += self._block(tarinfo.size) + return tarinfo def proc_gnulong(self, tarinfo): - """Evaluate the blocks that hold a GNU longname + """Process the blocks that hold a GNU longname or longlink member. """ buf = "" @@ -1752,9 +1772,15 @@ class TarFile(object): self.offset += BLOCKSIZE count -= BLOCKSIZE - # Fetch the next header - next = self.next() + # Fetch the next header and process it. + b = self.fileobj.read(BLOCKSIZE) + t = TarInfo.frombuf(b) + t.offset = self.offset + self.offset += BLOCKSIZE + next = self.proc_member(t) + # Patch the TarInfo object from the next header with + # the longname information. next.offset = tarinfo.offset if tarinfo.type == GNUTYPE_LONGNAME: next.name = nts(buf) @@ -1764,9 +1790,9 @@ class TarFile(object): return next def proc_sparse(self, tarinfo): - """Analyze a GNU sparse header plus extra headers. + """Process a GNU sparse header plus extra headers. """ - buf = tarinfo.tobuf() + buf = tarinfo.buf sp = _ringbuffer() pos = 386 lastpos = 0L @@ -1775,8 +1801,8 @@ class TarFile(object): # first header. for i in xrange(4): try: - offset = int(buf[pos:pos + 12], 8) - numbytes = int(buf[pos + 12:pos + 24], 8) + offset = nti(buf[pos:pos + 12]) + numbytes = nti(buf[pos + 12:pos + 24]) except ValueError: break if offset > lastpos: @@ -1787,7 +1813,7 @@ class TarFile(object): pos += 24 isextended = ord(buf[482]) - origsize = int(buf[483:495], 8) + origsize = nti(buf[483:495]) # If the isextended flag is given, # there are extra headers to process. @@ -1797,8 +1823,8 @@ class TarFile(object): pos = 0 for i in xrange(21): try: - offset = int(buf[pos:pos + 12], 8) - numbytes = int(buf[pos + 12:pos + 24], 8) + offset = nti(buf[pos:pos + 12]) + numbytes = nti(buf[pos + 12:pos + 24]) except ValueError: break if offset > lastpos: @@ -1818,17 +1844,11 @@ class TarFile(object): self.offset += self._block(tarinfo.size) tarinfo.size = origsize - self.members.append(tarinfo) - return tarinfo + # Clear the prefix field so that it is not used + # as a pathname in next(). + tarinfo.prefix = "" - # The type mapping for the next() method. The keys are single character - # strings, the typeflag. The values are methods which are called when - # next() encounters such a typeflag. - TYPE_METH = { - GNUTYPE_LONGNAME: proc_gnulong, - GNUTYPE_LONGLINK: proc_gnulong, - GNUTYPE_SPARSE: proc_sparse - } + return tarinfo #-------------------------------------------------------------------------- # Little helper methods: diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 98349c4ebfd..03fb55f9353 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -2,6 +2,7 @@ import sys import os import shutil import tempfile +import StringIO import unittest import tarfile @@ -25,7 +26,7 @@ def path(path): testtar = path("testtar.tar") tempdir = os.path.join(tempfile.gettempdir(), "testtar" + os.extsep + "dir") tempname = test_support.TESTFN -membercount = 10 +membercount = 12 def tarname(comp=""): if not comp: @@ -254,7 +255,7 @@ class WriteTest(BaseTest): if not tarinfo.isreg(): continue f = self.src.extractfile(tarinfo) - if self.dst.posix and len(tarinfo.name) > tarfile.LENGTH_NAME: + if self.dst.posix and len(tarinfo.name) > tarfile.LENGTH_NAME and "/" not in tarinfo.name: self.assertRaises(ValueError, self.dst.addfile, tarinfo, f) else: @@ -385,6 +386,49 @@ class WriteGNULongTest(unittest.TestCase): self._test(("longnam/" * 127) + "longname_", ("longlnk/" * 127) + "longlink_") +class ReadGNULongTest(unittest.TestCase): + + def setUp(self): + self.tar = tarfile.open(tarname()) + + def tearDown(self): + self.tar.close() + + def test_1471427(self): + """Test reading of longname (bug #1471427). + """ + name = "test/" * 20 + "0-REGTYPE" + try: + tarinfo = self.tar.getmember(name) + except KeyError: + tarinfo = None + self.assert_(tarinfo is not None, "longname not found") + self.assert_(tarinfo.type != tarfile.DIRTYPE, "read longname as dirtype") + + def test_read_name(self): + name = ("0-LONGNAME-" * 10)[:101] + try: + tarinfo = self.tar.getmember(name) + except KeyError: + tarinfo = None + self.assert_(tarinfo is not None, "longname not found") + + def test_read_link(self): + link = ("1-LONGLINK-" * 10)[:101] + name = ("0-LONGNAME-" * 10)[:101] + try: + tarinfo = self.tar.getmember(link) + except KeyError: + tarinfo = None + self.assert_(tarinfo is not None, "longlink not found") + self.assert_(tarinfo.linkname == name, "linkname wrong") + + def test_truncated_longname(self): + fobj = StringIO.StringIO(file(tarname()).read(1024)) + tar = tarfile.open(name="foo.tar", fileobj=fobj) + self.assert_(len(tar.getmembers()) == 0, "") + + class ExtractHardlinkTest(BaseTest): def test_hardlink(self): @@ -512,6 +556,7 @@ def test_main(): WriteSize0Test, WriteStreamTest, WriteGNULongTest, + ReadGNULongTest, ] if hasattr(os, "link"): diff --git a/Lib/test/testtar.tar b/Lib/test/testtar.tar index 8fd0c50c92a54790f66e231202f97a196e17f2f0..1f4493f3516ca1003553c591f94027068d8a6761 100644 GIT binary patch delta 12470 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 delta 2918 zcmcgueN0nV6z@aDTG7d3=3Izeb@L-a``+t&eNch6VC7>4ov6r%!n1vaS4s9V=RFHDRxX8UK^Ul{#o@t?WH#KpxdyRXRhC><5X?&cRE;^kTnD zbc=$^jMnf$!Hj5gx1^F!`-|^K;|XEAzqtU(CQ8PeFM|h z5JVwNw>Rl_@IJJ`FG1Fi{WsAS*3?_Ars6loTpMndalAqp+%(u zRMZX29A*MRO(iq;FDE)wilC#HQQLmtcw=rfV1`Dhw1M|}p{ig7+}ol}Rn#i}ygTXElN3rhOcN_kZ)`VCmU!!Lq$R z8-9%b`m$cpmTgt!;jP)Qw2zGqp}J4mJldCw<^8@1my~i~EqrvK3kHfT%CQz7%*J+C zyoyXYbQ#O`1~XjTxNJIp{FSgOlqav;bdpft>+-fTSXCB=eI2W1{T9Qxy_)iNwdqLt zW%aV7I}h$vw5e5(dW#{oYQiBZtFFQiTW#>(Hd1X}c`!5aNg%{~UGfswQUZE~8}e@V zbprBt=R%@~Qroiic47^rzGF?^fZsVI6QO*;Cj|JQKL9^%dL6XelHi#)7k>RX3%(5u z|I0c45)nW5W zXLU#kYPaEVi+Xvj)&^+vbg*>EYV}BY7=pX9)T)Y#$&(&hx(l%1Yu&?GjwSqRIiV+$ zh|SdaB^+xNQz(ymZ>z(ZQ<4k6?_t%dl&XwajLIsdCUQI$c)YhmU1MQbvEPQbCa<&3 z7pk*ym2l)h&!pM-eo->i6}63)q@){7^601IigzataI7{hO1>uQbZ-i+I{5BbDtvV; zMV@i|Edurr7~z)z3d%oaVB=sq@dS1c+Th7xI`p1+mYgs0__HnqgJK$58+hn?2zO5U zq4L6OP;^Q!KRA^`z`LiJ6+Tx$2r1wA=-}&{opoN(XKfG~q;#RhS;zZo1-(B|3-?dE zA#}zAub$OI_$&h>XFKNzycb&rdCAL5bs(P0g742QN^*&{qSNp9Ds2U34K2}*DZnsP z3&TSOSaLpZ!E=wb&7#Y1ZEVF&$`|!>=KP1y`B@t1E-=t?Aw~OVgG!QVBGb7;(o1f= zPY4>EwPN~q(P!8p3L!;}*M?D?vB~H6xkM>wXcQVHsQLUpthZ$_JycOnwnKbt_v(S z;>VJ79z9@O`HzV68<-!y*5sqRw21lmm S!e7t^;>5h;chO)C@yQ>-+_xhD diff --git a/Misc/NEWS b/Misc/NEWS index ab84dbfb053..401f5d96f59 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -96,6 +96,10 @@ Extension Modules Library ------- +- Patch #1484695: Update the tarfile module to version 0.8. This fixes + a couple of issues, notably handling of long file names using the + GNU LONGNAME extension. + - Patch #1478292. ``doctest.register_optionflag(name)`` shouldn't create a new flag when ``name`` is already the name of an option flag.