From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-action/maelstrom/Manifest | 8 - .../maelstrom/files/maelstrom-3.0.6-64bits.patch | 15 - .../maelstrom/files/maelstrom-3.0.6-gcc34.patch | 30 -- .../maelstrom/files/maelstrom-3.0.6-gcc53.patch | 11 - .../maelstrom/files/maelstrom-3.0.6-security.patch | 380 --------------------- .../maelstrom/files/maelstrom-3.0.6-warnings.patch | 20 -- games-action/maelstrom/maelstrom-3.0.6-r3.ebuild | 71 ---- games-action/maelstrom/metadata.xml | 8 - 8 files changed, 543 deletions(-) delete mode 100644 games-action/maelstrom/Manifest delete mode 100644 games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch delete mode 100644 games-action/maelstrom/files/maelstrom-3.0.6-gcc34.patch delete mode 100644 games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch delete mode 100644 games-action/maelstrom/files/maelstrom-3.0.6-security.patch delete mode 100644 games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch delete mode 100644 games-action/maelstrom/maelstrom-3.0.6-r3.ebuild delete mode 100644 games-action/maelstrom/metadata.xml (limited to 'games-action/maelstrom') diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest deleted file mode 100644 index 254815c37b6d..000000000000 --- a/games-action/maelstrom/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX maelstrom-3.0.6-64bits.patch 499 BLAKE2B fd74e9af6a9c5937ceef5c95ee865a133a5cd6eaa3864437fcd6f8b1db1bd8934861ec11c802dbb19875e81583b7f0e53db857071de209275c66793df1b00d22 SHA512 b75c094aa91ff443bed86b34ebb52a19221cdc69fd2745a714f1d7728dddd9886c8874054dff7a02513cff7a67cb6c115d7a2757401dd5bcaa96a52537f530a1 -AUX maelstrom-3.0.6-gcc34.patch 878 BLAKE2B 6b260e8214f2a9b20f32ab3fde9950b2a115c9f6ca81bb1de7d7ea045c40a6c5b54694b034f554e6e060497b6d13495d822a410b7201244b5e1ce429cffbd885 SHA512 5427e198d6a595f9d68357d0ad31b8d1d7c6bc8db7dde261269a660d8e6102d83d592128e1e2f1c82285e764808f166798cb4a9121d88a8ec7c047efa6d856d6 -AUX maelstrom-3.0.6-gcc53.patch 537 BLAKE2B e5b0d5fe7cfdab51633988b93f592acc450b90e3732f035dc5b31a77b3319ab6f54d490eb992cb4d543e04489866ce2f068a24a4860980f4be474a5b04adc43b SHA512 cfd30e1474a084a1c45831b3d7c3f2a22ca6920e84838c4ff7615f179d377713d181f6d2bca3e660ee58ba2a62378838dec52cdb24fd896efecc40ff43a9c459 -AUX maelstrom-3.0.6-security.patch 14189 BLAKE2B 54af3ec92a0b8d3d7fdfa865114e65ab4ee3667cbdfedcd1d4cad6394273619a9d3cb7448dfa0e92f5a017d8778087e9be76e4615557cd59f20118b5c7c8f11b SHA512 7e8c6c5c7244fa8871fe55b95e9d2a8c631735590dba04e9e2dfed62e2dfc6264f1b990f3737d797c7762fbceda17474782b1720f944d444bdb8627b43188cb3 -AUX maelstrom-3.0.6-warnings.patch 438 BLAKE2B 8075ff8a90660e70837c48fa44d10cc0e284e3e51832d689dc87baa6b9aa19c9490c405bbd837aeb6d15988508402cb2a21a209723ff146f5bd5e9c0ca38fba2 SHA512 5310843f4a126acf62686aaa9d2086a85a313258fbc0b35b27a8bf7a24389a70264691454a018252d1997bc70093dbaf80c44282c3c59ba39d8cfaa7018866f7 -DIST Maelstrom-3.0.6.tar.gz 1007421 BLAKE2B 652aff33fa683307632ca1be35701c6cce62536845c459d9a06636871da504b2878ef0853d232ccbe854d8d541b97d91accdecc25f34ca17ef4bc9fcf516ea02 SHA512 fecd2411f5d2109aa99e5a6c65702c74f9f79326fc9f074a53005238c846780f231776b9c170ceb54b0470894b856abaa4708c59afd912fa5b2868e6776893ca -EBUILD maelstrom-3.0.6-r3.ebuild 1946 BLAKE2B ecb3a40b69c420de00ed1f37f3e0410c006385c3672b8b5ef9a807624916eeea552657d7b9a2849d233adac46a7c78dccfd0ba85d4332e13e31dd128a24e5cc3 SHA512 b3c39bb003bb18e214347436cfa3d049cab8357ed376e2c41095371a17e16a8b9535c1914da81c3b28bd03d4954c5d14541f7e11682dbad29bd197fc13b55150 -MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch b/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch deleted file mode 100644 index 7d6f59a5ac26..000000000000 --- a/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/screenlib/SDL_FrameBuf.cpp 2006-10-25 22:37:21.000000000 +0200 -+++ b/screenlib/SDL_FrameBuf.cpp 2006-10-25 22:38:26.000000000 +0200 -@@ -847,10 +847,8 @@ - /* Update the dirty rectangle map with the new list */ - for ( i=0; inext; belem=belem->next ); - belem->next = new button; -@@ -30,7 +30,7 @@ - } - - void Activate_Button(Uint16 x, Uint16 y) { -- struct button *belem; -+ button *belem; - - for ( belem=button_list.next; belem; belem=belem->next ) { - if ( (x >= belem->x1) && (x <= belem->x2) && -@@ -42,7 +42,7 @@ - } - - void Delete_Buttons(void) { -- struct button *belem, *btemp; -+ button *belem, *btemp; - - for ( belem=button_list.next; belem; ) { - btemp = belem; diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch b/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch deleted file mode 100644 index db7624bacf91..000000000000 --- a/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Maelstrom-3.0.6/Maelstrom-netd.c.orig 2016-06-04 06:02:44.000000000 +0300 -+++ Maelstrom-3.0.6/Maelstrom-netd.c 2016-06-05 13:45:11.422533649 +0300 -@@ -204,7 +204,7 @@ - memset(&serv_addr, 0, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); -- serv_addr.sin_port = htons(NETPLAY_PORT-1); -+ serv_addr.sin_port = htons(NETPLAY_PORT - 1); - if (bind(netfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { - perror("Can't bind local address"); - exit(3); diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch b/games-action/maelstrom/files/maelstrom-3.0.6-security.patch deleted file mode 100644 index ae22c0cdd11a..000000000000 --- a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch +++ /dev/null @@ -1,380 +0,0 @@ -diff -ur Maelstrom-3.0.6-orig/controls.cpp Maelstrom-3.0.6/controls.cpp ---- Maelstrom-3.0.6-orig/controls.cpp 2001-03-25 03:04:28 +0900 -+++ Maelstrom-3.0.6/controls.cpp 2003-05-21 11:25:53 +0900 -@@ -83,7 +83,7 @@ - if ( fname ) { - *fname = datafile; - } -- sprintf(datafile, "%s"DIR_SEP"%s", home, MAELSTROM_DATA); -+ snprintf(datafile, sizeof(datafile), "%s"DIR_SEP"%s", home, MAELSTROM_DATA); - if ( (data=fopen(datafile, mode)) == NULL ) - return(NULL); - return(data); -diff -ur Maelstrom-3.0.6-orig/dialog.h Maelstrom-3.0.6/dialog.h ---- Maelstrom-3.0.6-orig/dialog.h 2001-07-21 00:08:10 +0900 -+++ Maelstrom-3.0.6/dialog.h 2003-05-21 11:24:33 +0900 -@@ -92,7 +92,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } -@@ -878,7 +878,7 @@ - if ( entry->text ) { - Fontserv->FreeText(entry->text); - } -- sprintf(buf, "%d", *entry->variable); -+ snprintf(buf, sizeof(buf), "%d", *entry->variable); - - if ( entry->hilite ) { - clear = Fg; -diff -ur Maelstrom-3.0.6-orig/load.cpp Maelstrom-3.0.6/load.cpp ---- Maelstrom-3.0.6-orig/load.cpp 2000-02-15 11:47:39 +0900 -+++ Maelstrom-3.0.6/load.cpp 2003-05-21 11:26:18 +0900 -@@ -81,7 +81,7 @@ - SDL_Surface *bmp, *title; - - /* Open the title file -- we know its colormap is our global one */ -- sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id); -+ snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id); - bmp = SDL_LoadBMP(path.Path(file)); - if ( bmp == NULL ) { - return(NULL); -@@ -103,7 +103,7 @@ - Uint16 w, h; - - /* Open the cicn sprite file.. */ -- sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id); -+ snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id); - if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) { - error("GetCIcon(%hd): Can't open CICN %s: ", - cicn_id, path.Path(file)); -diff -ur Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h Maelstrom-3.0.6/maclib/Mac_FontServ.h ---- Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h 1999-12-03 02:15:33 +0900 -+++ Maelstrom-3.0.6/maclib/Mac_FontServ.h 2003-05-21 11:28:43 +0900 -@@ -135,7 +135,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } -diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Resource.h Maelstrom-3.0.6/maclib/Mac_Resource.h ---- Maelstrom-3.0.6-orig/maclib/Mac_Resource.h 1999-12-04 03:01:47 +0900 -+++ Maelstrom-3.0.6/maclib/Mac_Resource.h 2003-05-21 11:28:35 +0900 -@@ -96,7 +96,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } -diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Sound.h Maelstrom-3.0.6/maclib/Mac_Sound.h ---- Maelstrom-3.0.6-orig/maclib/Mac_Sound.h 2002-10-20 11:53:34 +0900 -+++ Maelstrom-3.0.6/maclib/Mac_Sound.h 2003-05-21 11:28:27 +0900 -@@ -199,7 +199,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } -diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Wave.h Maelstrom-3.0.6/maclib/Mac_Wave.h ---- Maelstrom-3.0.6-orig/maclib/Mac_Wave.h 2000-01-26 01:44:10 +0900 -+++ Maelstrom-3.0.6/maclib/Mac_Wave.h 2003-05-21 11:28:20 +0900 -@@ -108,7 +108,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } -diff -ur Maelstrom-3.0.6-orig/maclib/macres.cpp Maelstrom-3.0.6/maclib/macres.cpp ---- Maelstrom-3.0.6-orig/maclib/macres.cpp 2000-01-26 01:44:20 +0900 -+++ Maelstrom-3.0.6/maclib/macres.cpp 2003-05-21 11:30:01 +0900 -@@ -58,8 +58,8 @@ - ids[j], res->ResourceName(types[i], ids[j])); - if ( argv[2] ) { - char path[23]; -- sprintf(path,"%s/%s:%hu", argv[2], -- types[i], ids[j]); -+ snprintf(path, sizeof(path), "%s/%s:%hu", -+ argv[2], types[i], ids[j]); - FILE *output; - Mac_ResData *D; - if ( (output=fopen(path, "w")) != NULL ) { -diff -ur Maelstrom-3.0.6-orig/maclib/snd2wav.cpp Maelstrom-3.0.6/maclib/snd2wav.cpp ---- Maelstrom-3.0.6-orig/maclib/snd2wav.cpp 2001-03-28 12:54:50 +0900 -+++ Maelstrom-3.0.6/maclib/snd2wav.cpp 2003-05-21 11:29:23 +0900 -@@ -82,7 +82,7 @@ - continue; - } - wave.Load(snd, rate); -- sprintf(wavname, "snd_%d.wav", ids[i]); -+ snprintf(wavname, sizeof(wavname), "snd_%d.wav", ids[i]); - wave.Save(wavname); - } - delete macx; -diff -ur Maelstrom-3.0.6-orig/main.cpp Maelstrom-3.0.6/main.cpp ---- Maelstrom-3.0.6-orig/main.cpp 2002-10-20 11:53:32 +0900 -+++ Maelstrom-3.0.6/main.cpp 2003-05-21 11:27:02 +0900 -@@ -445,7 +445,7 @@ - DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD, - 0x00, 0x00, 0x00); - } -- sprintf(text, "%d", gSoundLevel); -+ snprintf(text, sizeof(text), "%d", gSoundLevel); - DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD, - 30000>>8, 30000>>8, 0xFF); - screen->Update(); -@@ -547,11 +547,11 @@ - } - DrawText(xOff+5, botDiv+42+(index*18), hScores[index].name, - font, STYLE_BOLD, R, G, B); -- sprintf(buffer, "%u", hScores[index].score); -+ snprintf(buffer, sizeof(buffer), "%u", hScores[index].score); - sw = fontserv->TextWidth(buffer, font, STYLE_BOLD); - DrawText(sRt-sw, botDiv+42+(index*18), buffer, - font, STYLE_BOLD, R, G, B); -- sprintf(buffer, "%u", hScores[index].wave); -+ snprintf(buffer, sizeof(buffer), "%u", hScores[index].wave); - sw = fontserv->TextWidth(buffer, font, STYLE_BOLD); - DrawText(wRt-sw, botDiv+42+(index*18), buffer, - font, STYLE_BOLD, R, G, B); -@@ -560,7 +560,7 @@ - - DrawText(xOff+5, botDiv+46+(10*18)+3, "Last Score: ", - bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF); -- sprintf(buffer, "%d", GetScore()); -+ snprintf(buffer, sizeof(buffer), "%d", GetScore()); - sw = fontserv->TextWidth("Last Score: ", bigfont, STYLE_NORM); - DrawText(xOff+5+sw, botDiv+46+(index*18)+3, buffer, - bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF); -diff -ur Maelstrom-3.0.6-orig/myerror.cpp Maelstrom-3.0.6/myerror.cpp ---- Maelstrom-3.0.6-orig/myerror.cpp 1998-07-14 10:50:17 +0900 -+++ Maelstrom-3.0.6/myerror.cpp 2003-05-21 11:23:33 +0900 -@@ -16,7 +16,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(mesg, fmt, ap); -+ vsnprintf(mesg, sizeof(mesg), fmt, ap); - fputs(mesg, stderr); - va_end(ap); - } -@@ -27,7 +27,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(mesg, fmt, ap); -+ vsnprintf(mesg, sizeof(mesg), fmt, ap); - fputs(mesg, stdout); - va_end(ap); - } -@@ -37,7 +37,7 @@ - char buffer[BUFSIZ]; - - if ( *msg ) { -- sprintf(buffer, "%s: %s\n", msg, strerror(errno)); -+ snprintf(buffer, sizeof(buffer), "%s: %s\n", msg, strerror(errno)); - error(buffer); - } else - error((char *)strerror(errno)); -diff -ur Maelstrom-3.0.6-orig/netlogic/game.cpp Maelstrom-3.0.6/netlogic/game.cpp ---- Maelstrom-3.0.6-orig/netlogic/game.cpp 2001-07-23 11:24:03 +0900 -+++ Maelstrom-3.0.6/netlogic/game.cpp 2003-05-21 11:33:19 +0900 -@@ -232,7 +232,7 @@ - - lastDisplayed = gDisplayed; - screen->FillRect(0, 0, SCREEN_WIDTH, 12, ourBlack); -- sprintf(caption, -+ snprintf(caption, sizeof(caption), - "You are player %d --- displaying player %d", - gOurPlayer+1, gDisplayed+1); - DrawText(SPRITES_WIDTH, 11, caption, geneva, -@@ -357,7 +357,7 @@ - /* -- Erase old and draw new score */ - screen->FillRect(45, gStatusLine+1, - score_width, text_height, ourBlack); -- sprintf(numbuf, "%d", Score); -+ snprintf(numbuf, sizeof(numbuf), "%d", Score); - score_width = DrawText(45, gStatusLine+11, - numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -@@ -380,7 +380,7 @@ - if (lastWave != gWave) { - screen->FillRect(255, gStatusLine+1, - wave_width, text_height, ourBlack); -- sprintf(numbuf, "%d", gWave); -+ snprintf(numbuf, sizeof(numbuf), "%d", gWave); - wave_width = DrawText(255, gStatusLine+11, - numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -@@ -391,7 +391,7 @@ - if (lastLives != Lives) { - screen->FillRect(319, gStatusLine+1, - lives_width, text_height, ourBlack); -- sprintf(numbuf, "%-3.1d", Lives); -+ snprintf(numbuf, sizeof(numbuf), "%-3.1d", Lives); - lives_width = DrawText(319, gStatusLine+11, - numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -@@ -402,7 +402,7 @@ - if (lastBonus != Bonus) { - screen->FillRect(384, gStatusLine+1, - bonus_width, text_height, ourBlack); -- sprintf(numbuf, "%-7.1d", Bonus); -+ snprintf(numbuf, sizeof(numbuf), "%-7.1d", Bonus); - bonus_width = DrawText(384, gStatusLine+11, - numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -@@ -414,7 +414,7 @@ - if (lastFrags != Frags) { - screen->FillRect(fragoff, gStatusLine+1, - frags_width, text_height, ourBlack); -- sprintf(numbuf, "%-3.1d", Frags); -+ snprintf(numbuf, sizeof(numbuf), "%-3.1d", Frags); - frags_width = DrawText(fragoff, gStatusLine+11, - numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -@@ -747,10 +747,11 @@ - for ( i=0; i>8, 30000>>8, 0xFF); - } -@@ -898,7 +899,7 @@ - - - /* -- Draw the wave completed message */ -- sprintf(numbuf, "Wave %d completed.", gWave); -+ snprintf(numbuf, sizeof(numbuf), "Wave %d completed.", gWave); - sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD); - x = (SCREEN_WIDTH - sw) / 2; - DrawText(x, 150, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00); -@@ -935,7 +936,7 @@ - if (OurShip->GetBonusMult() != 1) { - SDL_Surface *sprite; - -- sprintf(numbuf, "%-5.1d", OurShip->GetBonus()); -+ snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus()); - DrawText(x, 200, numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); - x += 75; -@@ -951,10 +952,10 @@ - Delay(SOUND_DELAY); - sound->PlaySound(gFunk, 5); - -- sprintf(numbuf, "%-5.1d", OurShip->GetBonus()); -+ snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus()); - bonus_width = DrawText(x, 200, numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); -- sprintf(numbuf, "%-5.1d", OurShip->GetScore()); -+ snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore()); - score_width = DrawText(xt, 220, numbuf, geneva, STYLE_BOLD, - 0xFF, 0xFF, 0xFF); - screen->Update(); -@@ -997,12 +998,12 @@ - - screen->FillRect(x, 200-text_height+2, - bonus_width, text_height, ourBlack); -- sprintf(numbuf, "%-5.1d", OurShip->GetBonus()); -+ snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus()); - bonus_width = DrawText(x, 200, numbuf, - geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF); - screen->FillRect(xt, 220-text_height+2, - score_width, text_height, ourBlack); -- sprintf(numbuf, "%-5.1d", OurShip->GetScore()); -+ snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore()); - score_width = DrawText(xt, 220, numbuf, - geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF); - -@@ -1015,7 +1016,7 @@ - HandleEvents(10); - - /* -- Draw the "next wave" message */ -- sprintf(numbuf, "Prepare for Wave %d...", gWave+1); -+ snprintf(numbuf, sizeof(numbuf), "Prepare for Wave %d...", gWave+1); - sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD); - x = (SCREEN_WIDTH - sw)/2; - DrawText(x, 259, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00); -diff -ur Maelstrom-3.0.6-orig/netlogic/netplay.cpp Maelstrom-3.0.6/netlogic/netplay.cpp ---- Maelstrom-3.0.6-orig/netlogic/netplay.cpp 2002-10-20 13:11:52 +0900 -+++ Maelstrom-3.0.6/netlogic/netplay.cpp 2003-05-21 11:31:43 +0900 -@@ -670,7 +670,9 @@ - strcpy(message, "Waiting for players:"); - for ( i=0; i 0 ) { -diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp ---- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp 2001-07-23 06:03:13 +0900 -+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp 2003-05-21 11:31:01 +0900 -@@ -628,7 +628,7 @@ - - found = 0; - for ( which=0; !found; ++which ) { -- sprintf(file, "%s%d.bmp", prefix, which); -+ snprintf(file, sizeof(file), "%s%d.bmp", prefix, which); - if ( ((fp=fopen(file, "r")) == NULL) && - ((fp=fopen(file, "w")) != NULL) ) { - found = 1; -diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h ---- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h 2000-09-25 02:55:39 +0900 -+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h 2003-05-21 11:27:41 +0900 -@@ -165,7 +165,7 @@ - va_list ap; - - va_start(ap, fmt); -- vsprintf(errbuf, fmt, ap); -+ vsnprintf(errbuf, sizeof(errbuf), fmt, ap); - va_end(ap); - errstr = errbuf; - } diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch b/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch deleted file mode 100644 index 8b2ca084c65f..000000000000 --- a/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Maelstrom-netd.c 2014-03-18 01:00:28.408099526 -0400 -+++ b/Maelstrom-netd.c 2014-03-18 01:01:29.892142782 -0400 -@@ -1,7 +1,9 @@ - - /* Here we go... */ - -+#include - #include -+#include - #include - #include - #include -@@ -9,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild deleted file mode 100644 index bd1110643dbe..000000000000 --- a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils user - -MY_P=Maelstrom-${PV} -DESCRIPTION="An asteroids battle game" -HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/" -SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND="media-libs/libsdl[sound,joystick,video] - media-libs/sdl-net" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-security.patch - "${FILESDIR}"/${P}-64bits.patch - "${FILESDIR}"/${P}-gcc34.patch - "${FILESDIR}"/${P}-warnings.patch - "${FILESDIR}"/${P}-gcc53.patch -) - -pkg_setup(){ - enewgroup gamestat 36 -} - -src_prepare() { - default - - # Install the data into $(datadir)/..., not $(prefix)/games/... - sed -i \ - -e "s:(prefix)/games/:(datadir)/:" configure.in || die - sed -i \ - -e '/make install_gamedata/ { s:=:=$(DESTDIR)/:; s/make/$(MAKE)/; s/install_gamedata/install-binPROGRAMS install_gamedata/; }' Makefile.am || die - # Install the high scores file in ${GAMES_STATEDIR} - sed -i \ - -e "s:path.Path(MAELSTROM_SCORES):\"/var/games/\"MAELSTROM_SCORES:" scores.cpp || die - mv configure.{in,ac} - rm aclocal.m4 acinclude.m4 - eautoreconf -} - -src_install() { - default - dodoc Changelog Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*} - - newicon "${D}/usr/share/Maelstrom/icon.xpm" maelstrom.xpm - make_desktop_entry Maelstrom "Maelstrom" maelstrom - - # Put the high scores file in the right place - insinto /var/games - doins "${D}/usr/share/Maelstrom/Maelstrom-Scores" - - # clean up some cruft - rm -f \ - "${D}/usr/share/Maelstrom/Maelstrom-Scores" \ - "${D}/usr/share/Maelstrom/Images/Makefile*" - - # make sure we can update the high scores - fowners root:gamestat /var/games/Maelstrom-Scores /usr/bin/Maelstrom{,-netd} - fperms 2755 /usr/bin/Maelstrom{,-netd} - fperms 660 /var/games/Maelstrom-Scores -} diff --git a/games-action/maelstrom/metadata.xml b/games-action/maelstrom/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-action/maelstrom/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -- cgit v1.2.3