1 |
commit: 6d0b89f14127625f091fe9edbec9ca41ac1accd2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 24 08:55:05 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 24 08:58:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0b89f1 |
7 |
|
8 |
sys-apps/file: Revbump to fix berkdb file magic |
9 |
|
10 |
Bumped straight to stable |
11 |
|
12 |
Closes: https://bugs.gentoo.org/661922 |
13 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
14 |
|
15 |
.../{file-5.33-r3.ebuild => file-5.33-r4.ebuild} | 5 ++-- |
16 |
.../file/files/file-5.33-berkdb_bogus_magic.patch | 33 ++++++++++++++++++++++ |
17 |
2 files changed, 36 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/file/file-5.33-r3.ebuild b/sys-apps/file/file-5.33-r4.ebuild |
20 |
similarity index 95% |
21 |
rename from sys-apps/file/file-5.33-r3.ebuild |
22 |
rename to sys-apps/file/file-5.33-r4.ebuild |
23 |
index e9203f385ff..1221edeea29 100644 |
24 |
--- a/sys-apps/file/file-5.33-r3.ebuild |
25 |
+++ b/sys-apps/file/file-5.33-r4.ebuild |
26 |
@@ -6,7 +6,7 @@ EAPI=6 |
27 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) |
28 |
DISTUTILS_OPTIONAL=1 |
29 |
|
30 |
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal |
31 |
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal |
32 |
|
33 |
if [[ ${PV} == "9999" ]] ; then |
34 |
EGIT_REPO_URI="https://github.com/glensc/file.git" |
35 |
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND} |
36 |
PATCHES=( |
37 |
"${FILESDIR}"/${P}-CVE-2018-10360.patch |
38 |
"${FILESDIR}"/${P}-gl_VISIBILITY-macro.patch |
39 |
+ "${FILESDIR}"/${P}-berkdb_bogus_magic.patch #661922 |
40 |
) |
41 |
|
42 |
src_prepare() { |
43 |
@@ -129,5 +130,5 @@ multilib_src_install_all() { |
44 |
cd python || die |
45 |
distutils-r1_src_install |
46 |
fi |
47 |
- prune_libtool_files |
48 |
+ find "${ED}" -name "*.la" -delete || die |
49 |
} |
50 |
|
51 |
diff --git a/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch |
52 |
new file mode 100644 |
53 |
index 00000000000..7627bafc6ef |
54 |
--- /dev/null |
55 |
+++ b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch |
56 |
@@ -0,0 +1,33 @@ |
57 |
+From 4fb6a59df80d4974f8230bfce36e38e6de7d574f Mon Sep 17 00:00:00 2001 |
58 |
+From: Christos Zoulas <christos@××××××.com> |
59 |
+Date: Thu, 24 May 2018 18:54:40 +0000 |
60 |
+Subject: [PATCH] fix bogus magic |
61 |
+ |
62 |
+--- |
63 |
+ magic/Magdir/dbpf | 8 +++----- |
64 |
+ 1 file changed, 3 insertions(+), 5 deletions(-) |
65 |
+ |
66 |
+diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf |
67 |
+index 65cab61e..8545720d 100644 |
68 |
+--- a/magic/Magdir/dbpf |
69 |
++++ b/magic/Magdir/dbpf |
70 |
+@@ -1,6 +1,6 @@ |
71 |
+ |
72 |
+ #------------------------------------------------------------------------------ |
73 |
+-# $File: dbpf,v 1.1 2017/10/13 20:47:14 christos Exp $ |
74 |
++# $File: dbpf,v 1.2 2018/05/24 18:54:40 christos Exp $ |
75 |
+ # dppf: Maxis Database Packed Files, the stored data file format used by all |
76 |
+ # Maxis games after the Sims: http://wiki.niotso.org/DBPF |
77 |
+ # http://www.wiki.sc4devotion.com/index.php?title=DBPF |
78 |
+@@ -9,9 +9,7 @@ |
79 |
+ >4 ulelong x \b, version: %u. |
80 |
+ >>8 ulelong x \b%u |
81 |
+ >>>36 ulelong x \b, files: %u |
82 |
++>>24 ledate !0 \b, created: %s |
83 |
++>>28 ledate !0 \b, modified: %s |
84 |
+ !:ext dbpf/package/dat/sc4 |
85 |
+ !:mime application/x-maxis-dbpf |
86 |
+-4 ulelong 1 |
87 |
+->8 ulelong !1 |
88 |
+->>24 ledate !0 \b, created: %s |
89 |
+->>>28 ledate !0 \b, modified: %s |