gentoo resync : 14.07.2018

3 files changed, 77 insertions, 0 deletions

diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
new file mode 100644
index 000000000000..c84cc4d5f17d
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
@@ -0,0 +1,23 @@
+diff --git a/compile.sh b/compile.sh
+index fcd6583..2480364 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -26,15 +26,15 @@ ARGS2=$($SDL_CONFIG --cflags);
+ if uname -s | grep -i -c "LINUX" > /dev/null; then 
+     echo "GNU/Linux detected.";
+     echo "compiling...";    
+-    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then 
+     echo "BeOS detected.";
+     echo "compiling...";
+-    gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -lSDL_image -lGL -lglut -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
+ elif uname -s | grep -i -c "BSD" > /dev/null; then 
+     echo "BSD detected.";
+     echo "compiling...";
+-    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ else
+     echo "Unknown OS. If you are running Linux, BeOS or";
+     echo "FreeBSD please send me the output of 'uname -s'." 
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
new file mode 100644
index 000000000000..e7f24d89ebf4
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-debugging.patch
@@ -0,0 +1,28 @@
+diff --git a/compile.sh b/compile.sh
+index 2480364..96e9bd2 100755
+--- a/compile.sh
++++ b/compile.sh
+@@ -23,18 +23,20 @@ echo "Using $SDL_CONFIG.";
+ ARGS1=$($SDL_CONFIG --libs);
+ ARGS2=$($SDL_CONFIG --cflags);
+ 
++set -x
++
+ if uname -s | grep -i -c "LINUX" > /dev/null; then 
+     echo "GNU/Linux detected.";
+     echo "compiling...";    
+-    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then 
+     echo "BeOS detected.";
+     echo "compiling...";
+-    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg;
++    gcc $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lglut -lsmpeg || exit 1
+ elif uname -s | grep -i -c "BSD" > /dev/null; then 
+     echo "BSD detected.";
+     echo "compiling...";
+-    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
++    gcc $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c $ARGS1 -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg || exit 1
+ else
+     echo "Unknown OS. If you are running Linux, BeOS or";
+     echo "FreeBSD please send me the output of 'uname -s'." 
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
new file mode 100644
index 000000000000..55fcc1ba1df3
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-format-security.patch
@@ -0,0 +1,26 @@
+diff --git a/tdfsb.c b/tdfsb.c
+index 5f6b233..a1af5a1 100644
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2436,7 +2436,7 @@ int speckey(int key)
+ 			    if(TDFSB_CSE_FLAG)
+ 				snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING,fullpath);
+ 			    else
+-	    			snprintf(TDFSB_CES_TEMP,4096,TDFSB_CUSTOM_EXECUTE_STRING);
++	    			snprintf(TDFSB_CES_TEMP,4096,"%s", TDFSB_CUSTOM_EXECUTE_STRING);
+ 			}
+ 			system(TDFSB_CES_TEMP);
+ 			printf("EXECUTE COMMAND: %s\n",TDFSB_CES_TEMP);
+@@ -2732,9 +2732,9 @@ int keyboard (unsigned char key)
+ 
+                 else if (key==TDFSB_KC_HELP)
+                         {       TDFSB_SHOW_HELP = 1-TDFSB_SHOW_HELP;
+-                                if (TDFSB_SHOW_HELP)    {       printf("\n=======================================\n");
+-                                                                printf(help_str);
+-                                                                printf("=======================================\n\n");
++                                if (TDFSB_SHOW_HELP)    {       printf("%s", "\n=======================================\n");
++                                                                printf("%s", help_str);
++                                                                printf("%s", "=======================================\n\n");
+                                                         }
+                         }
+