From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#19481: package.el: support .tar archives featuring a pax_global_header entry Date: Thu, 01 Jan 2015 17:55:46 +0000 Message-ID: <871tne5qsd.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1420135171 6138 80.91.229.3 (1 Jan 2015 17:59:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Jan 2015 17:59:31 +0000 (UTC) To: 19481@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 01 18:59:23 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y6k1r-0004gn-BN for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Jan 2015 18:59:23 +0100 Original-Received: from localhost ([::1]:49230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6k1q-0003yL-NP for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Jan 2015 12:59:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6k1j-0003yF-4L for bug-gnu-emacs@gnu.org; Thu, 01 Jan 2015 12:59:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6k1Y-0000fH-Ud for bug-gnu-emacs@gnu.org; Thu, 01 Jan 2015 12:59:15 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6k1W-0000em-Re for bug-gnu-emacs@gnu.org; Thu, 01 Jan 2015 12:59:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y6k1W-0007bE-GP for bug-gnu-emacs@gnu.org; Thu, 01 Jan 2015 12:59:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Jan 2015 17:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19481 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.142013509729151 (code B ref -1); Thu, 01 Jan 2015 17:59:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 1 Jan 2015 17:58:17 +0000 Original-Received: from localhost ([127.0.0.1]:34604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6k0m-0007a7-Es for submit@debbugs.gnu.org; Thu, 01 Jan 2015 12:58:16 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:47269) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6k0h-0007Zw-Rk for submit@debbugs.gnu.org; Thu, 01 Jan 2015 12:58:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Date:Sender:Subject:To:From; bh=D3eoZQi4Cdj1iJvZcWBpI4awQhZJUhlr2DfFAZRoLKM=; b=rPozwpWqFKHe9jTyWgTKePal5pOMF6Me2KBTgsw5mT42j3lgjI8cuLh6aD2o2fUkU9LjN4LUtuP9wrb6NK6QrGRMRNfz5wXHt3cyW4WZ7RJuHiQjMqXgQqwsjwTDJ4QGTGxDLsVqAqvwI5cNsR1zj83GYed00sq0ibf1JBD1QSM=; Original-Received: from oneingray-1-pt.tunnel.tserv10.par1.ipv6.he.net ([2001:470:1f12:1eb::2] helo=waterlily.siamics.net) by fely.am-1.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1Y6k0f-0001z3-PG for submit@debbugs.gnu.org; Thu, 01 Jan 2015 17:58:09 +0000 Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by waterlily.siamics.net with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Y6k0Q-00046K-Cv for submit@debbugs.gnu.org; Fri, 02 Jan 2015 00:57:54 +0700 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Y6jyN-0003jY-6z for submit@debbugs.gnu.org; Fri, 02 Jan 2015 00:55:47 +0700 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:97921 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs Severity: minor As currently implemented, package.el signals an error trying to process a .tar archive which has a pax_global_header entry, =E2=80=93 such as the archives produced with $ git archive --format=3Dtar. Please thus consider the patch MIMEd. * lisp/emacs-lisp/package.el (package-untar-buffer): Ignore archive entries with link type being 55. (package-tar-file-info): Consider the second file name in the archive if the first one has no directory component. * lisp/tar-mode.el (tar-untar-buffer): Ignore archive entries with link type being 55 (pax global extended header.) --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -739,6 +739,8 @@ defun package-untar-buffer (dir) (dolist (tar-data tar-parse-info) (let ((name (expand-file-name (tar-header-name tar-data)))) (or (string-match regexp name) + ;; Ignore the pax_global_header entry. + (eq 55 (tar-header-link-type tar-data)) ;; Tarballs created by some utilities don't list ;; directories with a trailing slash (Bug#13136). (and (string-equal dir name) @@ -1245,8 +1247,10 @@ defun package-tar-file-info () "Find package information for a tar file. The return result is a `package-desc'." (cl-assert (derived-mode-p 'tar-mode)) - (let* ((dir-name (file-name-directory - (tar-header-name (car tar-parse-info)))) + (let* ((dir-name + ;; Take care of pax_global_header, if any. + (or (file-name-directory (tar-header-name (car tar-parse-info))) + (file-name-directory (tar-header-name (cadr tar-parse-info))))) (desc-file (package--description-file dir-name)) (tar-desc (tar-get-file-descriptor (concat dir-name desc-file)))) (unless tar-desc --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -479,10 +550,12 @@ defun tar-untar-buffer () (message "Extracting %s" name) (if (and dir (not (file-exists-p dir))) (make-directory dir t)) - (unless (file-directory-p name) - (let ((coding-system-for-write 'no-conversion)) - (write-region start end name))) - (set-file-modes name (tar-header-mode descriptor)))))))) + ;; Ignore the pax_global_header entry. + (unless (eq 55 (tar-header-link-type descriptor)) + (unless (or (file-directory-p name)) + (let ((coding-system-for-write 'no-conversion)) + (write-region start end name))) + (set-file-modes name (tar-header-mode descriptor))))))))) (defun tar-summarize-buffer () "Parse the contents of the tar file in the current buffer." --=-=-=--