summaryrefslogtreecommitdiff
path: root/app-arch/cpio/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
commit8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-arch/cpio/files
parent30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-arch/cpio/files')
-rw-r--r--app-arch/cpio/files/cpio-2.12-name-overflow.patch15
-rw-r--r--app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch11
2 files changed, 26 insertions, 0 deletions
diff --git a/app-arch/cpio/files/cpio-2.12-name-overflow.patch b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
new file mode 100644
index 000000000000..f85246884c39
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-name-overflow.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/572428
+https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00002.html
+http://seclists.org/oss-sec/2016/q1/136
+
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1385,6 +1385,8 @@
+ break;
+ }
+
++ if (file_hdr.c_namesize <= 1)
++ file_hdr.c_name = xrealloc (file_hdr.c_name, 2);
+ cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
+ false);
+
diff --git a/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
new file mode 100644
index 000000000000..c7fc7f95b47e
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-non-gnu-compilers.patch
@@ -0,0 +1,11 @@
+--- cpio-2.12/src/cpiohdr.h
++++ cpio-2.12/src/cpiohdr.h
+@@ -25,6 +25,8 @@
+
+ # ifdef HAVE_ATTRIB_PACKED
+ # define ATTRIB_PACKED __attribute__((packed))
++# else
++# define ATTRIB_PACKED
+ # endif
+
+ # ifdef HAVE_PRAGMA_PACK