gentoo resync : 14.07.2018

3 files changed, 0 insertions, 111 deletions

diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch
deleted file mode 100644
index 1aaa9e43dcc3..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-4.0.0.1/src/libgame/setup.c
---- rocksndiamonds-4.0.0.1/src/libgame/setup.c.CVE-2011-4606	2017-01-12 07:53:09.497075662 -0500
-+++ rocksndiamonds-4.0.0.1/src/libgame/setup.c	2017-01-12 07:58:19.319076661 -0500
-@@ -1311,11 +1311,13 @@ void sortTreeInfo(TreeInfo **node_first)
- #define MODE_W_ALL		(S_IWUSR | S_IWGRP | S_IWOTH)
- #define MODE_X_ALL		(S_IXUSR | S_IXGRP | S_IXOTH)
- 
-+#define MODE_R_PRIVATE		(S_IRUSR)
- #define MODE_W_PRIVATE		(S_IWUSR)
-+#define MODE_X_PRIVATE		(S_IXUSR)
- #define MODE_W_PUBLIC_FILE	(S_IWUSR | S_IWGRP)
- #define MODE_W_PUBLIC_DIR	(S_IWUSR | S_IWGRP | S_ISGID)
- 
--#define DIR_PERMS_PRIVATE	(MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
-+#define DIR_PERMS_PRIVATE	(MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE)
- #define DIR_PERMS_PUBLIC	(MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
- #define DIR_PERMS_PUBLIC_ALL	(MODE_R_ALL | MODE_X_ALL | MODE_W_ALL)
- 
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
deleted file mode 100644
index 70c95bd076dc..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/tools.c.yesno rocksndiamonds-4.0.0.1/src/tools.c
---- rocksndiamonds-4.0.0.1/src/tools.c.yesno	2017-01-12 07:47:09.921343574 -0500
-+++ rocksndiamonds-4.0.0.1/src/tools.c	2017-01-12 07:51:45.059649653 -0500
-@@ -3901,6 +3901,18 @@ static int RequestHandleEvents(unsigned
- 		result = 0;
- 		break;
- 
-+              case KSYM_y:
-+              case KSYM_Y:
-+                if (req_state & REQ_ASK)
-+                  result = TRUE;
-+                break;
-+
-+              case KSYM_n:
-+              case KSYM_N:
-+                if (req_state & REQ_ASK)
-+                  result = FALSE;
-+                break;
-+
- 	      default:
- 		HandleKeysDebug(key);
- 		break;
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
deleted file mode 100644
index f913be382e94..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files.c
---- rocksndiamonds-4.1.0.0/src/files.c.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/files.c	2018-04-17 16:30:19.726734512 -0400
-@@ -10127,11 +10127,13 @@ static struct MusicFileInfo *get_music_f
-     { "artist_header",	&tmp_music_file_info.artist_header	},
-     { "album_header",	&tmp_music_file_info.album_header	},
-     { "year_header",	&tmp_music_file_info.year_header	},
-+    { "url_header",	&tmp_music_file_info.url_header		},
- 
-     { "title",		&tmp_music_file_info.title		},
-     { "artist",		&tmp_music_file_info.artist		},
-     { "album",		&tmp_music_file_info.album		},
-     { "year",		&tmp_music_file_info.year		},
-+    { "url",		&tmp_music_file_info.url		},
- 
-     { NULL,		NULL					},
-   };
-@@ -10247,11 +10249,13 @@ void LoadMusicInfo()
-     checked_free(music_file_info->artist_header);
-     checked_free(music_file_info->album_header);
-     checked_free(music_file_info->year_header);
-+    checked_free(music_file_info->url_header);
- 
-     checked_free(music_file_info->title);
-     checked_free(music_file_info->artist);
-     checked_free(music_file_info->album);
-     checked_free(music_file_info->year);
-+    checked_free(music_file_info->url);
- 
-     free(music_file_info);
- 
-diff -up rocksndiamonds-4.1.0.0/src/main.h.url rocksndiamonds-4.1.0.0/src/main.h
---- rocksndiamonds-4.1.0.0/src/main.h.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/main.h	2018-04-17 16:30:19.727734490 -0400
-@@ -3463,11 +3463,13 @@ struct MusicFileInfo
-   char *artist_header;
-   char *album_header;
-   char *year_header;
-+  char *url_header;
- 
-   char *title;
-   char *artist;
-   char *album;
-   char *year;
-+  char *url;
- 
-   int music;
- 
-diff -up rocksndiamonds-4.1.0.0/src/screens.c.url rocksndiamonds-4.1.0.0/src/screens.c
---- rocksndiamonds-4.1.0.0/src/screens.c.url	2018-04-17 16:30:19.728734467 -0400
-+++ rocksndiamonds-4.1.0.0/src/screens.c	2018-04-17 16:34:00.653803869 -0400
-@@ -3060,6 +3060,19 @@ void HandleInfoScreen_Music(int button)
-       ystart += ystep_head;
-     }
- 
-+    if (!strEqual(list->url, UNKNOWN_NAME))
-+    {
-+      if (!strEqual(list->url_header, UNKNOWN_NAME))
-+        DrawTextSCentered(ystart, font_head, list->url_header);
-+      else
-+        DrawTextSCentered(ystart, font_head, "from the website");
-+
-+      ystart += ystep_head;
-+
-+      DrawTextFCentered(ystart, font_text, "%s", list->url);
-+      ystart += ystep_head;
-+    }
-+
-     DrawTextSCentered(ybottom, FONT_TEXT_4,
- 		      "Press any key or button for next page");
-