diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2018-11-27 15:38:16 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-11-27 15:38:16 +0100 |
commit | 84feef34d820a60fdfdb1636b3233c1331399d97 (patch) | |
tree | 3070a51e3fc484e5d481601f432f3b0574a6e1a6 /sys-apps/file/files | |
parent | dev-python/pocketlint: Removed old. (diff) | |
download | gentoo-84feef34d820a60fdfdb1636b3233c1331399d97.tar.gz gentoo-84feef34d820a60fdfdb1636b3233c1331399d97.tar.bz2 gentoo-84feef34d820a60fdfdb1636b3233c1331399d97.zip |
sys-apps/file: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-apps/file/files')
-rw-r--r-- | sys-apps/file/files/file-5.33-CVE-2018-10360.patch | 18 | ||||
-rw-r--r-- | sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch | 33 | ||||
-rw-r--r-- | sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch | 116 |
3 files changed, 0 insertions, 167 deletions
diff --git a/sys-apps/file/files/file-5.33-CVE-2018-10360.patch b/sys-apps/file/files/file-5.33-CVE-2018-10360.patch deleted file mode 100644 index a489846b10f8..000000000000 --- a/sys-apps/file/files/file-5.33-CVE-2018-10360.patch +++ /dev/null @@ -1,18 +0,0 @@ -Avoid reading past the end of buffer - -CVE-2018-10360 - -https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22 - ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, - - cname = (unsigned char *) - &nbuf[doff + prpsoffsets(i)]; -- for (cp = cname; *cp && isprint(*cp); cp++) -+ for (cp = cname; cp < nbuf + size && *cp -+ && isprint(*cp); cp++) - continue; - /* - * Linux apparently appends a space at the end 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 deleted file mode 100644 index 7627bafc6ef9..000000000000 --- a/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4fb6a59df80d4974f8230bfce36e38e6de7d574f Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Thu, 24 May 2018 18:54:40 +0000 -Subject: [PATCH] fix bogus magic - ---- - magic/Magdir/dbpf | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf -index 65cab61e..8545720d 100644 ---- a/magic/Magdir/dbpf -+++ b/magic/Magdir/dbpf -@@ -1,6 +1,6 @@ - - #------------------------------------------------------------------------------ --# $File: dbpf,v 1.1 2017/10/13 20:47:14 christos Exp $ -+# $File: dbpf,v 1.2 2018/05/24 18:54:40 christos Exp $ - # dppf: Maxis Database Packed Files, the stored data file format used by all - # Maxis games after the Sims: http://wiki.niotso.org/DBPF - # http://www.wiki.sc4devotion.com/index.php?title=DBPF -@@ -9,9 +9,7 @@ - >4 ulelong x \b, version: %u. - >>8 ulelong x \b%u - >>>36 ulelong x \b, files: %u -+>>24 ledate !0 \b, created: %s -+>>28 ledate !0 \b, modified: %s - !:ext dbpf/package/dat/sc4 - !:mime application/x-maxis-dbpf --4 ulelong 1 -->8 ulelong !1 -->>24 ledate !0 \b, created: %s -->>>28 ledate !0 \b, modified: %s diff --git a/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch b/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch deleted file mode 100644 index cef3cb5518bb..000000000000 --- a/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch +++ /dev/null @@ -1,116 +0,0 @@ -https://bugs.gentoo.org/661508 - ---- a/configure -+++ b/configure -@@ -638,6 +638,8 @@ - IS_CROSS_COMPILE_FALSE - IS_CROSS_COMPILE_TRUE - LIBOBJS -+HAVE_VISIBILITY -+CFLAG_VISIBILITY - OTOOL64 - OTOOL - LIPO -@@ -12512,7 +12519,92 @@ - # Only expand once: - - --gl_VISIBILITY -+ -+ -+ CFLAG_VISIBILITY= -+ HAVE_VISIBILITY=0 -+ if test -n "$GCC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 -+$as_echo_n "checking whether the -Werror option is usable... " >&6; } -+ if ${gl_cv_cc_vis_werror+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ gl_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_cc_vis_werror=yes -+else -+ gl_cv_cc_vis_werror=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$gl_save_CFLAGS" -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 -+$as_echo "$gl_cv_cc_vis_werror" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 -+$as_echo_n "checking for simple visibility declarations... " >&6; } -+ if ${gl_cv_cc_visibility+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ gl_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -fvisibility=hidden" -+ if test $gl_cv_cc_vis_werror = yes; then -+ CFLAGS="$CFLAGS -Werror" -+ fi -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+extern __attribute__((__visibility__("hidden"))) int hiddenvar; -+ extern __attribute__((__visibility__("default"))) int exportedvar; -+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); -+ extern __attribute__((__visibility__("default"))) int exportedfunc (void); -+ void dummyfunc (void) {} -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_cc_visibility=yes -+else -+ gl_cv_cc_visibility=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$gl_save_CFLAGS" -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 -+$as_echo "$gl_cv_cc_visibility" >&6; } -+ if test $gl_cv_cc_visibility = yes; then -+ CFLAG_VISIBILITY="-fvisibility=hidden" -+ HAVE_VISIBILITY=1 -+ fi -+ fi -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_VISIBILITY $HAVE_VISIBILITY -+_ACEOF -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } - if ${ac_cv_header_stdc+:} false; then : -@@ -16194,7 +16286,7 @@ - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -+ test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the |