diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-01 14:52:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-01 14:52:55 +0000 |
| commit | 1d18880f9a7558d2bba28076e89f51029c0fb9b2 (patch) | |
| tree | 332686cdc1a6290c28caf40bf785e4d2c022c729 /app-arch | |
| parent | New addition (diff) | |
| download | gentoo-2-1d18880f9a7558d2bba28076e89f51029c0fb9b2.tar.gz gentoo-2-1d18880f9a7558d2bba28076e89f51029c0fb9b2.tar.bz2 gentoo-2-1d18880f9a7558d2bba28076e89f51029c0fb9b2.zip | |
Fix extraction of device nodes wrt #343245 by Albert W. Hopkins.
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/tar/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/tar/files/tar-1.24-device-node.patch | 23 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.24-r2.ebuild (renamed from app-arch/tar/tar-1.24-r1.ebuild) | 3 |
3 files changed, 32 insertions, 2 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/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 \ |