Fix extraction of device nodes wrt #343245 by Albert W. Hopkins.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 79f1874285ec..9b010187ab97 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.157 2010/10/27 18:19:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.158 2010/11/01 14:52:55 ssuominen Exp $
+
+*tar-1.24-r2 (01 Nov 2010)
+
+  01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> +tar-1.24-r2.ebuild,
+  +files/tar-1.24-device-node.patch:
+  Fix extraction of device nodes wrt #343245 by Albert W. Hopkins.
 
 *tar-1.24-r1 (27 Oct 2010)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index a45e5a292e77..ace41ad36507 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -3,6 +3,7 @@ AUX tar-1.23-revert-pipe.patch 3743 RMD160 0d1945ffd7ea720c563d46199d1d0b43aeaf8
 AUX tar-1.23-strncpy.patch 1249 RMD160 1e0f8fcc6152ec3cc4208a5efebdb4d97b928113 SHA1 9a4c94827703fae8572246c6380d55821db15196 SHA256 d88ba0b9d3b5dc9a8d6b70e4e71c376ff8dcd3412cb8ffceca3a722a17dbaa85
 AUX tar-1.23-symlink-k-hang.patch 4936 RMD160 c58d2911e50d6ff5e88001b4755a9e4c9ba511f3 SHA1 9f4bdbf733d25982029741b8cc5b8b49a5168380 SHA256 14a5d98abc174ec5a630719e8ba55f395e91591072cba3da448e77ce9d37bbbf
 AUX tar-1.23-tests.patch 662 RMD160 ef87a9f5c25240abddde45be4fb0a932c1fd2ec7 SHA1 9ab7f0d1f35ee7acd0ae74ec50c79a7dcafc03e5 SHA256 6898df207d16007233b3ed79b330e036172db7204ed35273123e87bcac7116d9
+AUX tar-1.24-device-node.patch 822 RMD160 e72136eaaeace94c1a990d308e7797d18ade74e3 SHA1 b798b9d16c94eb86810724f79a4cd232764b9a80 SHA256 0be2ce950b79fafadfea292cb61489cd4f51d89466b9d89134434a51f4a5652b
 AUX tar-1.24-mkdirat.patch 1026 RMD160 6080ad88ed3661f6291bd7e810d868be08466b8d SHA1 bbc5127c3b7dd63dd2beaf601f312acaa9ce5791 SHA256 fa0e3e62b3ec281ddced033d7219a2992f396d278a13360b10d42b03d980cfbf
 AUX tar-1.24-transform-2.patch 1834 RMD160 0aace8938804e8632f82c044025f8c4989c95034 SHA1 787e26224463fe35f7224879a0f36c0abd13a6a8 SHA256 b1d2e5e62cbf75507f635e59010c2562ff49b94b7f26d06389f4091b09d6cf62
 AUX tar-1.24-transform.patch 4935 RMD160 3f7c6a80be8f0ac11514f971e75fdaf22d9d6a7e SHA1 56cb27762ef59e2e01e287960c3b2e21713bfd24 SHA256 ad7c974398537ab7ae67c90306ce03cf2f2b313489282d50a2a1d489d94eca07
@@ -11,6 +12,6 @@ DIST tar-1.23.tar.bz2 2189324 RMD160 e79062b7f69d80b734445306f69fb8b96801e909 SH
 DIST tar-1.24.tar.bz2 2322847 RMD160 52d6959462c840453f5358eb4e05b052fd33305c SHA1 d9ce3b4a4d18b010294ed8609473b0e6ae276a5d SHA256 17c6e065758f68f034cea977187ab8ec484da62c0fae1410428bb0d8eee3aded
 EBUILD tar-1.23-r2.ebuild 1757 RMD160 fe262e531e6edca865a1c49eb47bfca9f10b1edf SHA1 c2c58c2488f731adc4964fd19c6da415c93e31c5 SHA256 870839e7cfbbea1e978cb042a80b8283bffeacfe9e4f294e29591898a22ed103
 EBUILD tar-1.23-r4.ebuild 1824 RMD160 6721228dfd20f85bd93278148f0f7fa7d57db84f SHA1 8fa3f45e1c85c3a06ab6062940a37f3c67ce50c0 SHA256 25bde52ba653a03f48aa26dd0d86e5879e381260b7fae24f6095de5ef55b1de0
-EBUILD tar-1.24-r1.ebuild 1829 RMD160 25e17b9b832d41b29d3a2fac5011c89ff6647380 SHA1 c1700f1b8a2e1a330069c9b1b2e23620d8465d99 SHA256 08338ffe228f9880c9d7cf6740083b605e37e3ae4a143457d849226238dc59cc
-MISC ChangeLog 23608 RMD160 828ec63ffff221269e800709725e01ddd7c523f2 SHA1 20c9adabfd1b4fff26af5d44b084d35b050655aa SHA256 cac213951374c718f5cbbe20751d1a449c4b070ea158cfdbebef87295c68989c
+EBUILD tar-1.24-r2.ebuild 1882 RMD160 d4553898e294aab3e75d693a98ebe846fc95b2c4 SHA1 4ab4874fdf96e68e86b6125026762bb9cb9e2319 SHA256 f833509cc29df2440ad1e6655917fbe4de99131023af11c585eb22fcad55ce1d
+MISC ChangeLog 23816 RMD160 724221ae5574fd69b98d7dc8fe585e8ad5613cf5 SHA1 bbeed2cc6aa859ec45ab1963649d6b0069f53633 SHA256 4426be872550b9ac27948bd64951472127f610c96313569ee2fb3958d10c1562
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/app-arch/tar/files/tar-1.24-device-node.patch b/app-arch/tar/files/tar-1.24-device-node.patch
new file mode 100644
index 000000000000..bdee8cd6459c
--- /dev/null
+++ b/app-arch/tar/files/tar-1.24-device-node.patch
@@ -0,0 +1,23 @@
+From 3913675640f65bb4774429d369681957b528996e Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Mon, 01 Nov 2010 13:04:41 +0000
+Subject: Fix extraction of device nodes.
+
+* src/extract.c (extract_node): Do not mask out node type.
+The bug was introduced in commit ea964cce.
+---
+diff --git a/src/extract.c b/src/extract.c
+index 44233b9..6711f87 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -1205,7 +1205,7 @@ static int
+ extract_node (char *file_name, int typeflag)
+ {
+   bool interdir_made = false;
+-  mode_t mode = (current_stat_info.stat.st_mode & MODE_RWX
++  mode_t mode = (current_stat_info.stat.st_mode & (MODE_RWX | S_IFBLK | S_IFCHR)
+ 		 & ~ (0 < same_owner_option ? S_IRWXG | S_IRWXO : 0));
+ 
+   while (mknodat (chdir_fd, file_name, mode, current_stat_info.stat.st_rdev)
+--
+cgit v0.8.3.2
diff --git a/app-arch/tar/tar-1.24-r1.ebuild b/app-arch/tar/tar-1.24-r2.ebuild
index 9c08d7905e9d..0adff37eb346 100644
--- a/app-arch/tar/tar-1.24-r1.ebuild
+++ b/app-arch/tar/tar-1.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.24-r1.ebuild,v 1.1 2010/10/27 18:19:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.24-r2.ebuild,v 1.1 2010/11/01 14:52:55 ssuominen Exp $
 
 EAPI="2"
 
@@ -27,6 +27,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.23-strncpy.patch #317139
 	epatch "${FILESDIR}"/${P}-mkdirat.patch #342735
 	epatch "${FILESDIR}"/${P}-transform{,-2}.patch #342785
+	epatch "${FILESDIR}"/${P}-device-node.patch #343245
 
 	if ! use userland_GNU ; then
 		sed -i \