1 |
commit: 0f24827067ff6f59cd0290e37b36efed2f9c4c84 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 8 06:57:38 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 8 06:57:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f248270 |
7 |
|
8 |
app-arch/tar: Security cleanup |
9 |
|
10 |
Closes: https://bugs.gentoo.org/681728 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
13 |
|
14 |
app-arch/tar/Manifest | 1 - |
15 |
.../tar-1.31-remove-erroneous-abort-call.patch | 33 --------- |
16 |
app-arch/tar/tar-1.31-r1.ebuild | 81 ---------------------- |
17 |
3 files changed, 115 deletions(-) |
18 |
|
19 |
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest |
20 |
index eeff245a6f1..64c7c860dbf 100644 |
21 |
--- a/app-arch/tar/Manifest |
22 |
+++ b/app-arch/tar/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 |
25 |
DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6 |
26 |
|
27 |
diff --git a/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch b/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch |
28 |
deleted file mode 100644 |
29 |
index 9e255df5760..00000000000 |
30 |
--- a/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch |
31 |
+++ /dev/null |
32 |
@@ -1,33 +0,0 @@ |
33 |
-From 85c005ee1345c342f707f3c55317daf6cb050603 Mon Sep 17 00:00:00 2001 |
34 |
-From: Sergey Poznyakoff <gray@×××××××.ua> |
35 |
-Date: Thu, 10 Jan 2019 18:18:49 +0200 |
36 |
-Subject: Remove erroneous abort() call |
37 |
- |
38 |
-The call was introduced by commit ccef8581. It caused tar to abort |
39 |
-on perfectly normal operations, like untarring archives containing |
40 |
-./ with the -U option, |
41 |
- |
42 |
-See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html |
43 |
-for details. |
44 |
- |
45 |
-* src/extract.c (maybe_recoverable): Remove misplaced call to abort(). |
46 |
---- |
47 |
- src/extract.c | 2 +- |
48 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
49 |
- |
50 |
-diff --git a/src/extract.c b/src/extract.c |
51 |
-index 090b866..8276f8f 100644 |
52 |
---- a/src/extract.c |
53 |
-+++ b/src/extract.c |
54 |
-@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made) |
55 |
- case UNLINK_FIRST_OLD_FILES: |
56 |
- break; |
57 |
- } |
58 |
-- abort (); /* notreached */ |
59 |
-+ FALLTHROUGH; |
60 |
- |
61 |
- case ENOENT: |
62 |
- /* Attempt creating missing intermediate directories. */ |
63 |
--- |
64 |
-cgit v1.0-41-gc330 |
65 |
- |
66 |
|
67 |
diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild |
68 |
deleted file mode 100644 |
69 |
index 72de0a507c7..00000000000 |
70 |
--- a/app-arch/tar/tar-1.31-r1.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,81 +0,0 @@ |
73 |
-# Copyright 1999-2019 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI=6 |
77 |
- |
78 |
-inherit flag-o-matic |
79 |
- |
80 |
-DESCRIPTION="Use this to make tarballs :)" |
81 |
-HOMEPAGE="https://www.gnu.org/software/tar/" |
82 |
-SRC_URI="mirror://gnu/tar/${P}.tar.bz2 |
83 |
- mirror://gnu-alpha/tar/${P}.tar.bz2" |
84 |
- |
85 |
-LICENSE="GPL-3+" |
86 |
-SLOT="0" |
87 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
88 |
-IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr" |
89 |
- |
90 |
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" |
91 |
- |
92 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
93 |
- selinux? ( sys-libs/libselinux )" |
94 |
-DEPEND="${RDEPEND} |
95 |
- nls? ( >=sys-devel/gettext-0.10.35 ) |
96 |
- static? ( ${LIB_DEPEND} ) |
97 |
- xattr? ( elibc_glibc? ( sys-apps/attr ) )" |
98 |
- |
99 |
-PATCHES=( "${FILESDIR}"/${P}-remove-erroneous-abort-call.patch ) |
100 |
- |
101 |
-src_prepare() { |
102 |
- default |
103 |
- |
104 |
- if ! use userland_GNU ; then |
105 |
- sed -i \ |
106 |
- -e 's:/backup\.sh:/gbackup.sh:' \ |
107 |
- scripts/{backup,dump-remind,restore}.in \ |
108 |
- || die "sed non-GNU" |
109 |
- fi |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- use static && append-ldflags -static |
114 |
- local myeconfargs=( |
115 |
- --bindir="${EPREFIX%/}"/bin |
116 |
- --enable-backup-scripts |
117 |
- --libexecdir="${EPREFIX%/}"/usr/sbin |
118 |
- $(usex userland_GNU "" "--program-prefix=g") |
119 |
- $(use_with acl posix-acls) |
120 |
- $(use_enable nls) |
121 |
- $(use_with selinux) |
122 |
- $(use_with xattr xattrs) |
123 |
- ) |
124 |
- FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- default |
129 |
- |
130 |
- local p=$(usex userland_GNU "" "g") |
131 |
- if [[ -z ${p} ]] ; then |
132 |
- # a nasty yet required piece of baggage |
133 |
- exeinto /etc |
134 |
- doexe "${FILESDIR}"/rmt |
135 |
- fi |
136 |
- |
137 |
- # autoconf looks for gtar before tar (in configure scripts), hence |
138 |
- # in Prefix it is important that it is there, otherwise, a gtar from |
139 |
- # the host system (FreeBSD, Solaris, Darwin) will be found instead |
140 |
- # of the Prefix provided (GNU) tar |
141 |
- if use prefix ; then |
142 |
- dosym tar /bin/gtar |
143 |
- fi |
144 |
- |
145 |
- mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die |
146 |
- mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die |
147 |
- |
148 |
- if use minimal ; then |
149 |
- find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \ |
150 |
- -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ |
151 |
- -delete || die |
152 |
- fi |
153 |
-} |