diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-action/0verkill | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-action/0verkill')
-rw-r--r-- | games-action/0verkill/0verkill-0.16-r3.ebuild | 66 | ||||
-rw-r--r-- | games-action/0verkill/Manifest | 1 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-CC.patch | 50 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-docs.patch | 32 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch | 23 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-home-overflow.patch | 26 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-ovflfix.patch | 24 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-segv.patch | 39 | ||||
-rw-r--r-- | games-action/0verkill/files/0verkill-0.16-underflow-check.patch | 17 | ||||
-rw-r--r-- | games-action/0verkill/metadata.xml | 5 |
10 files changed, 283 insertions, 0 deletions
diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild new file mode 100644 index 000000000000..9af4419c1599 --- /dev/null +++ b/games-action/0verkill/0verkill-0.16-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit autotools eutils games + +DESCRIPTION="a bloody 2D action deathmatch-like game in ASCII-ART" +HOMEPAGE="http://artax.karlin.mff.cuni.cz/~brain/0verkill/" +SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ia64 ppc sparc x86" +IUSE="X" + +DEPEND="X? ( x11-libs/libXpm )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-docs.patch \ + "${FILESDIR}"/${P}-home-overflow.patch \ + "${FILESDIR}"/${P}-segv.patch \ + "${FILESDIR}"/${P}-gentoo-paths.patch \ + "${FILESDIR}"/${P}-ovflfix.patch \ + "${FILESDIR}"/${P}-CC.patch \ + "${FILESDIR}"/${P}-underflow-check.patch #136222 \ + sed -i \ + -e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h \ + || die "sed failed" + sed -i \ + -e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in \ + || die "sed failed" + sed -i \ + -e "/gettimeofday/s/getopt/getopt calloc/" configure.in \ + || die "sed failed" + eautoreconf +} + +src_configure() { + egamesconf $(use_with X x) +} + +src_install() { + local x + dogamesbin 0verkill + for x in avi bot editor server test_server ; do + newgamesbin ${x} 0verkill-${x} + done + if use X ; then + dogamesbin x0verkill + for x in avi editor ; do + newgamesbin ${x} 0verkill-${x} + done + fi + + insinto "${GAMES_DATADIR}/${PN}" + doins -r data grx + + dohtml doc/*.html + rm doc/*.html doc/README.OS2 doc/Readme\ Win32.txt doc/COPYING + dodoc doc/* + + prepgamesdirs +} diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest new file mode 100644 index 000000000000..fe6f4567ebb3 --- /dev/null +++ b/games-action/0verkill/Manifest @@ -0,0 +1 @@ +DIST 0verkill-0.16.tgz 276579 SHA256 8091261c3fef3535edb97ab46cb48c067befb329e951bfa3f1b54ae6b7e1dadf SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144 WHIRLPOOL 7a1dff93014ea67f6d16efea408ed77219a391b015a0d533a53d52eb735d8b84c8cc0f4e1cb6997aca2b3d238b57f7cff780f11fe838ded362769529cf437665 diff --git a/games-action/0verkill/files/0verkill-0.16-CC.patch b/games-action/0verkill/files/0verkill-0.16-CC.patch new file mode 100644 index 000000000000..b2ba0f014d86 --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-CC.patch @@ -0,0 +1,50 @@ +--- Makefile.in.orig 2010-11-08 13:30:42.060916323 -0500 ++++ Makefile.in 2010-11-08 13:31:03.199940471 -0500 +@@ -24,7 +24,7 @@ + server.o: server.c server.h net.h data.h hash.h cfg.h time.h math.h config.h error.h + client.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h blit.h config.h error.h + xclient.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h config.h error.h +- gcc -c $(CFLAGS) -DXWINDOW -o xclient.o client.c ++ $(CC) -c $(CFLAGS) -DXWINDOW -o xclient.o client.c + time.o: time.c time.h error.h + help.o: help.c blit.h error.h + avihelp.o: avihelp.c blit.h error.h +@@ -38,29 +38,29 @@ + + + avi: avi.o blit.o console.o kbd.o time.o avihelp.o error.o +- gcc $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS) ++ $(CC) $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS) + + xavi: avi.o blit.o xinterface.o xkbd.o time.o avihelp.o error.o +- gcc $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS) ++ $(CC) $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS) + + bot: bot.o data.o hash.o time.o net.o crc32.o md5.o md5hl.o error.o +- gcc $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS) ++ $(CC) $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS) + + 0verkill: client.o data.o sprite.o blit.o console.o hash.o time.o net.o error.o crc32.o md5.o md5hl.o kbd.o help.o +- gcc $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS) ++ $(CC) $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS) + @OVERKILL_SPECIAL@ + + x0verkill: xclient.o data.o sprite.o blit.o xinterface.o hash.o time.o net.o crc32.o error.o xkbd.o help.o md5.o md5hl.o +- gcc $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS) ++ $(CC) $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS) + + server: server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o net.o crc32.o md5.o md5hl.o error.o +- gcc $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS) ++ $(CC) $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS) + + editor: editor.o data.o blit.o sprite.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o +- gcc $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS) ++ $(CC) $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS) + + xeditor: editor.o data.o blit.o sprite.o xinterface.o hash.o time.o xkbd.o md5.o md5hl.o error.o +- gcc $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS) ++ $(CC) $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS) + + test_server: test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o console.o kbd.o md5.o md5hl.o error.o +- gcc $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS) ++ $(CC) $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS) diff --git a/games-action/0verkill/files/0verkill-0.16-docs.patch b/games-action/0verkill/files/0verkill-0.16-docs.patch new file mode 100644 index 000000000000..90d049309f4d --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-docs.patch @@ -0,0 +1,32 @@ +--- 0verkill-0.16/doc/README.html ++++ 0verkill-0.16-gentoo/doc/README.html +@@ -30,7 +30,7 @@ + <center><h1><a name="running">RUNNING</a></h1></center> + + <p><h2><a name="server">Running server</a></h2> +-<p>First thing to start 0verkill is run the server - type <i>server</i>. Server ++<p>First thing to start 0verkill is run the server - type <i>0verkill-server</i>. Server + takes options <i>-p</i> and <i>-n</i>. As usual, option <i>-h</i> prints help. + + <p> Option <i>-p</i> takes one argument: port number. Server needs UDP port +@@ -84,9 +84,9 @@ + + <p><h2><a name="testserver">Testing Program</a></h2> + +-<p>There's <i>test_server</i> program in the distribution. It avoids testing ++<p>There's <i>0verkill-test_server</i> program in the distribution. It avoids testing + remote server if it's up and how many players there is. To use it simply type +-<i>test_server -a <server address> -p <port number ></i>. ++<i>0verkill-test_server -a <server address> -p <port number ></i>. + + <center><h1><a name="controls">GAME CONTROLS</a></h1></center> + +--- 0verkill-0.16/doc/adding_a_level.txt ++++ 0verkill-0.16-gentoo/doc/adding_a_level.txt +@@ -19,5 +19,5 @@ + 5) If you want to create some cool new graphics, run + "avi grx/graphics_file.avi". Then add it to the data/new_level.sp + +-6) When the level is done, run "server -lX", where X is again from (1). And ++6) When the level is done, run "0verkill-server -lX", where X is again from (1). And + play! diff --git a/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch new file mode 100644 index 000000000000..a5ecaec01684 --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch @@ -0,0 +1,23 @@ +--- sprite.c.orig 2007-11-15 18:26:30.000000000 -0500 ++++ sprite.c 2007-11-15 18:26:57.000000000 -0500 +@@ -2,6 +2,7 @@ + #include <ctype.h> + #include <stdlib.h> + #include <stdio.h> ++#include <unistd.h> + + #ifndef WIN32 + #include "config.h" +@@ -188,6 +189,12 @@ + + if (!(f=fopen(filename,"rb"))) + { ++ chdir(DATA_PATH); ++ } ++ if (!(f=fopen(filename,"rb"))) { ++ chdir(DATA_PATH "/../"); ++ } ++ if (!(f=fopen(filename,"rb"))) { + unsigned char msg[256]; + snprintf(msg,256,"Error opening file \"%s\"!\n",filename); + ERROR(msg); diff --git a/games-action/0verkill/files/0verkill-0.16-home-overflow.patch b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch new file mode 100644 index 000000000000..ec9b7efb36e7 --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch @@ -0,0 +1,26 @@ +--- client.c.orig 2001-12-16 04:26:38.000000000 -0500 ++++ client.c 2003-11-17 15:12:52.850772508 -0500 +@@ -191,9 +191,9 @@ + unsigned char txt[256]; + + #ifndef WIN32 +- sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE); ++ snprintf(txt,sizeof(txt),"%s/%s",getenv("HOME"),CFG_FILE); + #else +- sprintf(txt,"./%s",CFG_FILE); ++ snprintf(txt,sizeof(txt),"./%s",CFG_FILE); + #endif + stream=fopen(txt,"r"); + if (!stream)return; +@@ -223,9 +223,9 @@ + unsigned char txt[256]; + + #ifndef WIN32 +- sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE); ++ snprintf(txt,sizeof(txt),"%s/%s",getenv("HOME"),CFG_FILE); + #else +- sprintf(txt,"./%s",CFG_FILE); ++ snprintf(txt,sizeof(txt),"./%s",CFG_FILE); + #endif + stream=fopen(txt,"w"); + if (!stream)return; diff --git a/games-action/0verkill/files/0verkill-0.16-ovflfix.patch b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch new file mode 100644 index 000000000000..3df8a0789545 --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch @@ -0,0 +1,24 @@ +--- server.c.old 2010-11-08 11:53:18.000000000 +0100 ++++ server.c 2010-11-08 11:53:43.000000000 +0100 +@@ -905,8 +905,8 @@ + int len; + + packet[0]=P_MESSAGE; +- if (!name){snprintf(packet+1,256,"%s",msg);len=strlen(msg)+1+1;} +- else {snprintf(packet+1,256,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;} ++ if (!name){snprintf(packet+1,255,"%s",msg);len=strlen(msg)+1+1;} ++ else {snprintf(packet+1,255,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;} + send_chunk_packet_to_player(packet,len,player); + } + +--- console.c.old 2010-11-08 11:53:26.000000000 +0100 ++++ console.c 2010-11-08 11:54:44.000000000 +0100 +@@ -206,7 +206,7 @@ + void c_setcolor_3b(unsigned char a) + { + char txt[8]; +- snprintf(txt,16,"\033[%dm",30+(a&7)); ++ snprintf(txt,sizeof(txt),"\033[%dm",30+(a&7)); + my_print(txt); + } + diff --git a/games-action/0verkill/files/0verkill-0.16-segv.patch b/games-action/0verkill/files/0verkill-0.16-segv.patch new file mode 100644 index 000000000000..9f9656dfd9fa --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-segv.patch @@ -0,0 +1,39 @@ +diff -Naurp 0verkill-0.16.old/data.c 0verkill-0.16/data.c +--- 0verkill-0.16.old/data.c 2007-10-30 19:49:59.000000000 +0100 ++++ 0verkill-0.16/data.c 2007-10-30 20:25:08.000000000 +0100 +@@ -471,7 +471,7 @@ my_double can_go_x(my_double old_x,my_do + for (x=double2int(old_x)+1;x<=round_up(new_x);x++) /* go to the right */ + { + if (x>AREA_X-1) return int2double(AREA_X-1); +- for (y=yh;y<=yl;y++) ++ for (y=(yh>=0?yh:0);y<=yl;y++) + if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) + return int2double(x-1); + } +@@ -479,7 +479,7 @@ my_double can_go_x(my_double old_x,my_do + for (x=round_up(old_x)-1;x>=double2int(new_x);x--) /* go to the left */ + { + if (x<0) return 0; +- for (y=yh;y<=yl;y++) ++ for (y=(yh>=0?yh:0);y<=yl;y++) + if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(x+1); + } + if(flag)*flag=0; +@@ -501,7 +501,7 @@ my_double can_go_y(my_double old_y, my_d + for (y=double2int(old_y)+1;y<=round_up(new_y);y++) /* go down */ + { + if (y>AREA_Y-1) return int2double(AREA_Y-1); +- for (x=xl;x<=xr;x++) ++ for (x=(xl>=0?xl:0);x<=xr;x++) + if ((area_a[x+y*AREA_X]&240)==TYPE_WALL||(!down_ladder&&((area_a[x+y*AREA_X]&240)==TYPE_JUMP||(area_a[x+y*AREA_X]&240)==TYPE_JUMP_FOREGROUND))) return int2double(y-1); + } + else +@@ -510,7 +510,7 @@ my_double can_go_y(my_double old_y, my_d + for (y=round_up(old_y)-1;y>=double2int(new_y);y--) /* go up */ + { + if (y<0) return 0; +- for (x=xl;x<=xr;x++) ++ for (x=(xl>=0?xl:0);x<=xr;x++) + if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(y+1); + } + } diff --git a/games-action/0verkill/files/0verkill-0.16-underflow-check.patch b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch new file mode 100644 index 000000000000..d0af396deafd --- /dev/null +++ b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch @@ -0,0 +1,17 @@ +The vulnerability is cause due to an integer underflow error in "recv_packet()" +within the handling of a received UDP packet. This can be exploited to cause +out-of-bounds memory access which crashes the server process via a UDP packet +that is smaller than 12 bytes in size. + +http://bugs.gentoo.org/136222 + +--- 0verkill-0.16/net.c ++++ 0verkill-0.16/net.c +@@ -84,6 +84,7 @@ + p=mem_alloc(max_len+12); + if (!p)return -1; /* not enough memory */ + retval=recvfrom(fd,p,max_len+12,0,addr,addr_len); ++ if (retval<12)return -1; /* not enough data from network */ + memcpy(packet,p+12,max_len); + crc=p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24); + s=p[4]+(p[5]<<8)+(p[6]<<16)+(p[7]<<24); diff --git a/games-action/0verkill/metadata.xml b/games-action/0verkill/metadata.xml new file mode 100644 index 000000000000..d3c2cc926f0b --- /dev/null +++ b/games-action/0verkill/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>games</herd> +</pkgmetadata> |