Apply Debian patchset wrt #137756, #131209 and #214442.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 60 insertions, 265 deletions

diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
new file mode 100644
index 000000000000..0b6c4dcb999d
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
@@ -0,0 +1,60 @@
+diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/Makefile
+--- gramofile-1.6.orig/bplaysrc/Makefile	2009-05-12 22:39:32.000000000 +0300
++++ gramofile-1.6/bplaysrc/Makefile	2009-05-12 22:45:53.000000000 +0300
+@@ -6,13 +6,12 @@
+         ../clrscr.o ../secshms.o
+ #SRCS = bplay.c sndfunc.o shmbuf.c
+ 
+-CC = gcc
+-LDFLAGS = 
++CC ?= gcc
+ 
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
++CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER
+ LIBS = -lncurses
+ 
+ # For FreeBSD (and maybe others), use these:
+diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
+--- gramofile-1.6.orig/gramofile.c	2009-05-12 22:39:32.000000000 +0300
++++ gramofile-1.6/gramofile.c	2009-05-12 22:41:25.000000000 +0300
+@@ -11,6 +11,7 @@
+ #include "splashscr.h"
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+diff -ur gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
+--- gramofile-1.6.orig/Makefile	2009-05-12 22:39:32.000000000 +0300
++++ gramofile-1.6/Makefile	2009-05-12 22:45:28.000000000 +0300
+@@ -14,13 +14,12 @@
+ OBJS = $(SRCS:.c=.o)
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-LDFLAGS = 
++CC ?= gcc
+ 
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+ DEPS = $(OBJS) makebplay
+ LIBS = -lncurses -lrfftw -lfftw -lm
+ COPY_A = -a
+diff -ur gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c
+--- gramofile-1.6.orig/signpr_cmf3.c	2009-05-12 22:39:32.000000000 +0300
++++ gramofile-1.6/signpr_cmf3.c	2009-05-12 22:41:09.000000000 +0300
+@@ -34,6 +34,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
diff --git a/media-sound/gramofile/files/gramofile-1.6_p3-64bit.patch b/media-sound/gramofile/files/gramofile-1.6_p3-64bit.patch
deleted file mode 100644
index 6d127ae1a667..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p3-64bit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- fmtheaders.h.old	2005-10-08 12:40:53.000000000 +0200
-+++ fmtheaders.h	2005-10-08 12:41:38.000000000 +0200
-@@ -2,6 +2,7 @@
- #define _FMTHEADERS_H	1
- 
- #include <sys/types.h>
-+#include <asm/types.h>
- 
- /* Definitions for .VOC files */
- 
-@@ -62,21 +63,21 @@
-  */
- typedef struct wavhead
-   {
--    u_long main_chunk;		/* 'RIFF' */
--    u_long length;		/* Length of rest of file */
--    u_long chunk_type;		/* 'WAVE' */
-+    __u32 main_chunk;		/* 'RIFF' */
-+    __u32 length;		/* Length of rest of file */
-+    __u32 chunk_type;		/* 'WAVE' */
- 
--    u_long sub_chunk;		/* 'fmt ' */
--    u_long sc_len;		/* length of sub_chunk, =16 (rest of chunk) */
-+    __u32 sub_chunk;		/* 'fmt ' */
-+    __u32 sc_len;		/* length of sub_chunk, =16 (rest of chunk) */
-     u_short format;		/* should be 1 for PCM-code */
-     u_short modus;		/* 1 Mono, 2 Stereo */
--    u_long sample_fq;		/* frequence of sample */
--    u_long byte_p_sec;
-+    __u32 sample_fq;		/* frequence of sample */
-+    __u32 byte_p_sec;
-     u_short byte_p_spl;		/* samplesize; 1 or 2 bytes */
-     u_short bit_p_spl;		/* 8, 12 or 16 bit */
- 
--    u_long data_chunk;		/* 'data' */
--    u_long data_length;		/* samplecount (lenth of rest of block?) */
-+    __u32 data_chunk;		/* 'data' */
-+    __u32 data_length;		/* samplecount (lenth of rest of block?) */
-   }
- wavhead;
- 
diff --git a/media-sound/gramofile/files/gramofile-1.6_p3-implicit-declarations.patch b/media-sound/gramofile/files/gramofile-1.6_p3-implicit-declarations.patch
deleted file mode 100644
index 378f7f894d18..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6_p3-implicit-declarations.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-diff -ur gramofile-1.6P.orig/clrscr.c gramofile-1.6P/clrscr.c
---- gramofile-1.6P.orig/clrscr.c	2000-03-29 00:07:25.000000000 +0300
-+++ gramofile-1.6P/clrscr.c	2007-08-19 11:33:41.000000000 +0300
-@@ -13,7 +13,7 @@
- #else
- #include <curses.h>
- #endif
--
-+#include <string.h>
- 
- void
- header (char *headertext)
-diff -ur gramofile-1.6P.orig/errorwindow.c gramofile-1.6P/errorwindow.c
---- gramofile-1.6P.orig/errorwindow.c	2000-11-26 02:55:58.000000000 +0200
-+++ gramofile-1.6P/errorwindow.c	2007-08-19 11:32:53.000000000 +0300
-@@ -20,6 +20,7 @@
- #else
- #include <stdio.h>
- #endif
-+#include <string.h>
- 
- void
- error_window_display (char *text, char *buttontext)
-diff -ur gramofile-1.6P.orig/gramofile.c gramofile-1.6P/gramofile.c
---- gramofile-1.6P.orig/gramofile.c	2000-03-29 00:07:25.000000000 +0300
-+++ gramofile-1.6P/gramofile.c	2007-08-19 11:32:24.000000000 +0300
-@@ -12,6 +12,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stdlib.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
-diff -ur gramofile-1.6P.orig/mainmenu.c gramofile-1.6P/mainmenu.c
---- gramofile-1.6P.orig/mainmenu.c	2000-03-29 00:07:25.000000000 +0300
-+++ gramofile-1.6P/mainmenu.c	2007-08-19 11:45:08.000000000 +0300
-@@ -21,6 +21,7 @@
- #include "tracksplit.h"
- #include <stdlib.h>
- #include <unistd.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
-Only in gramofile-1.6P.orig/perl-swig: errorwindow.c
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_cmf2.c gramofile-1.6P/perl-swig/signpr_cmf2.c
---- gramofile-1.6P.orig/perl-swig/signpr_cmf2.c	2007-08-19 11:30:54.000000000 +0300
-+++ gramofile-1.6P/perl-swig/signpr_cmf2.c	2007-08-19 11:35:42.000000000 +0300
-@@ -35,6 +35,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_cmf.c gramofile-1.6P/perl-swig/signpr_cmf.c
---- gramofile-1.6P.orig/perl-swig/signpr_cmf.c	2000-11-26 02:56:00.000000000 +0200
-+++ gramofile-1.6P/perl-swig/signpr_cmf.c	2007-08-19 11:34:23.000000000 +0300
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_doubmed.c gramofile-1.6P/perl-swig/signpr_doubmed.c
---- gramofile-1.6P.orig/perl-swig/signpr_doubmed.c	2000-11-26 02:56:02.000000000 +0200
-+++ gramofile-1.6P/perl-swig/signpr_doubmed.c	2007-08-19 11:35:08.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_mean.c gramofile-1.6P/perl-swig/signpr_mean.c
---- gramofile-1.6P.orig/perl-swig/signpr_mean.c	2000-11-26 02:56:04.000000000 +0200
-+++ gramofile-1.6P/perl-swig/signpr_mean.c	2007-08-19 11:34:54.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_median.c gramofile-1.6P/perl-swig/signpr_median.c
---- gramofile-1.6P.orig/perl-swig/signpr_median.c	2000-11-26 02:56:05.000000000 +0200
-+++ gramofile-1.6P/perl-swig/signpr_median.c	2007-08-19 11:34:04.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/perl-swig/signpr_rms.c gramofile-1.6P/perl-swig/signpr_rms.c
---- gramofile-1.6P.orig/perl-swig/signpr_rms.c	2000-11-26 02:56:05.000000000 +0200
-+++ gramofile-1.6P/perl-swig/signpr_rms.c	2007-08-19 11:36:13.000000000 +0300
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_cmf2.c gramofile-1.6P/signpr_cmf2.c
---- gramofile-1.6P.orig/signpr_cmf2.c	2007-08-19 11:30:54.000000000 +0300
-+++ gramofile-1.6P/signpr_cmf2.c	2007-08-19 11:35:42.000000000 +0300
-@@ -35,6 +35,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_cmf3.c gramofile-1.6P/signpr_cmf3.c
---- gramofile-1.6P.orig/signpr_cmf3.c	2007-08-19 11:30:59.000000000 +0300
-+++ gramofile-1.6P/signpr_cmf3.c	2007-08-19 11:36:03.000000000 +0300
-@@ -36,6 +36,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_cmf.c gramofile-1.6P/signpr_cmf.c
---- gramofile-1.6P.orig/signpr_cmf.c	2000-11-26 02:56:00.000000000 +0200
-+++ gramofile-1.6P/signpr_cmf.c	2007-08-19 11:34:23.000000000 +0300
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_doubmed.c gramofile-1.6P/signpr_doubmed.c
---- gramofile-1.6P.orig/signpr_doubmed.c	2000-11-26 02:56:02.000000000 +0200
-+++ gramofile-1.6P/signpr_doubmed.c	2007-08-19 11:35:08.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_mean.c gramofile-1.6P/signpr_mean.c
---- gramofile-1.6P.orig/signpr_mean.c	2000-11-26 02:56:04.000000000 +0200
-+++ gramofile-1.6P/signpr_mean.c	2007-08-19 11:34:54.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_median.c gramofile-1.6P/signpr_median.c
---- gramofile-1.6P.orig/signpr_median.c	2000-11-26 02:56:05.000000000 +0200
-+++ gramofile-1.6P/signpr_median.c	2007-08-19 11:34:04.000000000 +0300
-@@ -19,6 +19,7 @@
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/signpr_rms.c gramofile-1.6P/signpr_rms.c
---- gramofile-1.6P.orig/signpr_rms.c	2000-11-26 02:56:05.000000000 +0200
-+++ gramofile-1.6P/signpr_rms.c	2007-08-19 11:36:13.000000000 +0300
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef SWIG
- #ifndef OLD_CURSES
- #include <ncurses.h>
-diff -ur gramofile-1.6P.orig/stringinput.c gramofile-1.6P/stringinput.c
---- gramofile-1.6P.orig/stringinput.c	2000-03-29 00:07:26.000000000 +0300
-+++ gramofile-1.6P/stringinput.c	2007-08-19 11:33:08.000000000 +0300
-@@ -13,7 +13,7 @@
- #else
- #include <curses.h>
- #endif
--
-+#include <string.h>
- 
- void
- stringinput_display (stringinput_t * data)
-diff -ur gramofile-1.6P.orig/tracksplit_parammenu.c gramofile-1.6P/tracksplit_parammenu.c
---- gramofile-1.6P.orig/tracksplit_parammenu.c	2000-03-29 00:07:26.000000000 +0300
-+++ gramofile-1.6P/tracksplit_parammenu.c	2007-08-19 11:35:27.000000000 +0300
-@@ -16,6 +16,7 @@
- #include "helpline.h"
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
-diff -ur gramofile-1.6P.orig/yesnowindow.c gramofile-1.6P/yesnowindow.c
---- gramofile-1.6P.orig/yesnowindow.c	2000-03-29 00:07:26.000000000 +0300
-+++ gramofile-1.6P/yesnowindow.c	2007-08-19 11:33:28.000000000 +0300
-@@ -16,7 +16,7 @@
- #else
- #include <curses.h>
- #endif
--
-+#include <string.h>
- 
- int
- yesno_window (char *text, char *yestext, char *notext, int preselected)