diff options
| author |   David Seifert <soap@gentoo.org> | 2016-01-25 11:57:17 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-01-25 11:57:31 +0100 |
| commit | f9a6f7546f212a395c157b35926e8a1dc4556c4a (patch) | |
| tree | 9bc608ffa47479a3eb6558f1bf63e24f39ae119d /media-gfx/xv/files | |
| parent | media-video/ffmpeg: amd64 stable wrt bug #571868 (diff) | |
| download | gentoo-f9a6f7546f212a395c157b35926e8a1dc4556c4a.tar.gz gentoo-f9a6f7546f212a395c157b35926e8a1dc4556c4a.tar.bz2 gentoo-f9a6f7546f212a395c157b35926e8a1dc4556c4a.zip | |
media-gfx/xv: Fix -Werror=format-security errors
Gentoo-Bug: 542134
* EAPI=6
* Amended all patches to be compatible with -p1
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-gfx/xv/files')
5 files changed, 29 insertions, 10 deletions
diff --git a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch index 41d30235e5be..7e42484abf48 100644 --- a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch +++ b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch @@ -1,5 +1,5 @@ ---- Makefile~ 2007-06-24 15:41:58 -0600 -+++ Makefile 2007-06-24 15:42:43 -0600 +--- xv-3.10a/Makefile~ 2007-06-24 15:41:58 -0600 ++++ xv-3.10a/Makefile 2007-06-24 15:42:43 -0600 @@ -176,16 +176,16 @@ ### if, for whatever reason, you're unable to get the JasPer JPEG-2000 library ### to compile on your machine, *COMMENT OUT* the following lines diff --git a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch index b3eaeef9847e..9905c4b8ae7e 100644 --- a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch +++ b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch @@ -1,5 +1,5 @@ ---- xvinfo.c -+++ xvinfo.c +--- xv-3.10a/xvinfo.c ++++ xv-3.10a/xvinfo.c @@ -26,7 +26,7 @@ #define INFOHIGH 270 @@ -9,8 +9,8 @@ /* baseline of top line of text */ #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT) ---- xvpng.c -+++ xvpng.c +--- xv-3.10a/xvpng.c ++++ xv-3.10a/xvpng.c @@ -31,6 +31,7 @@ #ifdef HAVE_PNG diff --git a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch index 59a768ebceb1..ecafd1ddf56e 100644 --- a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch +++ b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch @@ -1,5 +1,5 @@ ---- xv.h~ 2007-06-24 14:30:42 -0600 -+++ xv.h 2007-06-24 14:42:04 -0600 +--- xv-3.10a/xv.h~ 2007-06-24 14:30:42 -0600 ++++ xv-3.10a/xv.h 2007-06-24 14:42:04 -0600 @@ -158,7 +158,7 @@ #ifndef VMS diff --git a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch index 06e9f8a8d978..2c82b1ae43e6 100644 --- a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch +++ b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch @@ -1,5 +1,5 @@ ---- vdcomp.c~ 2007-06-24 14:30:42 -0600 -+++ vdcomp.c 2007-06-24 14:48:12 -0600 +--- xv-3.10a/vdcomp.c~ 2007-06-24 14:30:42 -0600 ++++ xv-3.10a/vdcomp.c 2007-06-24 14:48:12 -0600 @@ -123,6 +123,8 @@ # if defined(hp300) || defined(hp800) || defined(NeXT) diff --git a/media-gfx/xv/files/xv-3.10a-wformat-security.patch b/media-gfx/xv/files/xv-3.10a-wformat-security.patch new file mode 100644 index 000000000000..34d2c19ebae3 --- /dev/null +++ b/media-gfx/xv/files/xv-3.10a-wformat-security.patch @@ -0,0 +1,19 @@ +Fix errors caused by -Wformat -Werror=format-security +https://bugs.gentoo.org/show_bug.cgi?id=542134 + +* xvpbm.c:888:4: error: format not a string literal and no format arguments [-Werror=format-security] +* if (*pix) fprintf(fp,str1); + +--- xv-3.10a/xvpbm.c ++++ xv-3.10a/xvpbm.c +@@ -885,8 +885,8 @@ + } + } + else { +- if (*pix) fprintf(fp,str1); +- else fprintf(fp,str0); ++ if (*pix) fprintf(fp,"%s",str1); ++ else fprintf(fp,"%s",str0); + len+=2; + if (len>68) { fprintf(fp,"\n"); len=0; } + } |