From ee2fb71e20a2774e6d2d26e9e7c1a1ac022bd42d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Sep 2006 22:55:25 +0000 Subject: [PATCH] Revision bump with a GCC patch and a security patch. Closing bug #142394 and bug #135154. Package-Manager: portage-2.1.1_rc1-r1 --- games-action/armagetronad/ChangeLog | 11 ++- games-action/armagetronad/Manifest | 45 ++++++---- .../armagetronad-0.2.7.1-r1.ebuild | 82 +++++++++++++++++++ .../files/armagetronad-0.2.7.1-gcc4.patch | 60 ++++++++++++++ .../armagetronad-0.2.7.1-security-1.patch | 20 +++++ .../files/digest-armagetronad-0.2.7.1-r1 | 9 ++ 6 files changed, 211 insertions(+), 16 deletions(-) create mode 100644 games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild create mode 100644 games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch create mode 100644 games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch create mode 100644 games-action/armagetronad/files/digest-armagetronad-0.2.7.1-r1 diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog index a3696759845e..5f739861fd7d 100644 --- a/games-action/armagetronad/ChangeLog +++ b/games-action/armagetronad/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for games-action/armagetronad # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.7 2006/05/01 03:20:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.8 2006/09/06 22:55:25 wolf31o2 Exp $ + +*armagetronad-0.2.7.1-r1 (06 Sep 2006) + + 06 Sep 2006; Chris Gianelloni + +files/armagetronad-0.2.7.1-gcc4.patch, + +files/armagetronad-0.2.7.1-security-1.patch, + +armagetronad-0.2.7.1-r1.ebuild: + Revision bump with a GCC patch and a security patch. Closing bug #142394 and + bug #135154. 10 Feb 2006; Chris Gianelloni armagetronad-0.2.7.1.ebuild: diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest index 92e2d7cc3361..674c514122c1 100644 --- a/games-action/armagetronad/Manifest +++ b/games-action/armagetronad/Manifest @@ -1,36 +1,51 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX armagetronad 1102 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b SHA1 bd4feaba945fe12dc47bfae4e8fe18992e4546cd SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 size 1102 +AUX armagetronad 1102 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b SHA1 bd4feaba945fe12dc47bfae4e8fe18992e4546cd SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 MD5 617e831d7f4c02cd72d67800bcf0144f files/armagetronad 1102 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b files/armagetronad 1102 SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 files/armagetronad 1102 -AUX armagetronad-ded 1340 RMD160 508417bcacbf0583513c5407517e79bd15ce06af SHA1 254cb6460fb43a35f8cc8ccf8e6bc51d7312f350 SHA256 24935ddbb1e82b5a0695e03bd5e7f23f3ecae503b61459c6168cb7ae0d62080a size 1340 +AUX armagetronad-0.2.7.1-gcc4.patch 2269 RMD160 aabe55c0522d5cf6112fd4f3195dbb902c9ce0be SHA1 2a6769775e08ebfb42c837b6750031c67a9da1d4 SHA256 17bd03efb07f729db9f37e730b9e6582f13cf333c66e68941cbbc6634fdb8e86 +MD5 345a68fc8620586e70edae5f9444a62d files/armagetronad-0.2.7.1-gcc4.patch 2269 +RMD160 aabe55c0522d5cf6112fd4f3195dbb902c9ce0be files/armagetronad-0.2.7.1-gcc4.patch 2269 +SHA256 17bd03efb07f729db9f37e730b9e6582f13cf333c66e68941cbbc6634fdb8e86 files/armagetronad-0.2.7.1-gcc4.patch 2269 +AUX armagetronad-0.2.7.1-security-1.patch 527 RMD160 c9e68014c8a1fc1aaf06aacbcac8521007996932 SHA1 0029073a50655e6f87935732de186ced9d4db16e SHA256 b813bb1e74188e200217fa31f075c90ff625d8e9d2f073d8a6ced120af228cd0 +MD5 670d4b614568e27d820f556214804787 files/armagetronad-0.2.7.1-security-1.patch 527 +RMD160 c9e68014c8a1fc1aaf06aacbcac8521007996932 files/armagetronad-0.2.7.1-security-1.patch 527 +SHA256 b813bb1e74188e200217fa31f075c90ff625d8e9d2f073d8a6ced120af228cd0 files/armagetronad-0.2.7.1-security-1.patch 527 +AUX armagetronad-ded 1340 RMD160 508417bcacbf0583513c5407517e79bd15ce06af SHA1 254cb6460fb43a35f8cc8ccf8e6bc51d7312f350 SHA256 24935ddbb1e82b5a0695e03bd5e7f23f3ecae503b61459c6168cb7ae0d62080a MD5 37312a765833708af1d1712bc4fad0ac files/armagetronad-ded 1340 RMD160 508417bcacbf0583513c5407517e79bd15ce06af files/armagetronad-ded 1340 SHA256 24935ddbb1e82b5a0695e03bd5e7f23f3ecae503b61459c6168cb7ae0d62080a files/armagetronad-ded 1340 -DIST armagetronad-0.2.7.1.tar.bz2 1243746 RMD160 0dcf9d383fccd42509cae3aacc2df0d5531bd021 SHA256 0ec8793f6d4d4f5a90feec1c8b0a4846aa4fa2c1f3c69a20b21b5e930d70992c size 1243746 -DIST moviepack.zip 352253 RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 size 352253 -DIST moviesounds_fq.zip 2182021 RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba size 2182021 -EBUILD armagetronad-0.2.7.1.ebuild 2041 RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe SHA1 9e77bf079cc2280151f3fd6fffbccba14225c71e SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 size 2041 +DIST armagetronad-0.2.7.1.tar.bz2 1243746 RMD160 0dcf9d383fccd42509cae3aacc2df0d5531bd021 SHA1 a93d587e1154f0465c6fdb3c5518a5003add6240 SHA256 0ec8793f6d4d4f5a90feec1c8b0a4846aa4fa2c1f3c69a20b21b5e930d70992c +DIST moviepack.zip 352253 RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 SHA1 2dfe328f325add441a74c79685806d16fddce2c6 SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 +DIST moviesounds_fq.zip 2182021 RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a SHA1 357d87ef40e25bec19fdc8a3aac70db53d3820ec SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba +EBUILD armagetronad-0.2.7.1-r1.ebuild 2168 RMD160 3b20b2f3cb6d19d14be2119ae84128abae2322c5 SHA1 c605302886712027b2c0decc301931cfe8439deb SHA256 69edb5bbd297c7e75a79ec9db0f8f303a87928ea1f0207ac05a6125046bcf672 +MD5 a9cf1f5e73150ea8b66c10a56c775162 armagetronad-0.2.7.1-r1.ebuild 2168 +RMD160 3b20b2f3cb6d19d14be2119ae84128abae2322c5 armagetronad-0.2.7.1-r1.ebuild 2168 +SHA256 69edb5bbd297c7e75a79ec9db0f8f303a87928ea1f0207ac05a6125046bcf672 armagetronad-0.2.7.1-r1.ebuild 2168 +EBUILD armagetronad-0.2.7.1.ebuild 2041 RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe SHA1 9e77bf079cc2280151f3fd6fffbccba14225c71e SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 MD5 7cf5f4a1d194616d98e9a1e272f901fc armagetronad-0.2.7.1.ebuild 2041 RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe armagetronad-0.2.7.1.ebuild 2041 SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 armagetronad-0.2.7.1.ebuild 2041 -MISC ChangeLog 1061 RMD160 508ff4758e3071ad5c9b918f31fc2c900fd528f6 SHA1 8168b345c64ad620b317441e3cbdf8ad4ac6c140 SHA256 f3adcef481213a7f25b5550585fb483d4fb46dd6b796fabdd48a0c01cd48261c size 1061 -MD5 56bac21a5e9d5eec261c23f707f4d2a1 ChangeLog 1061 -RMD160 508ff4758e3071ad5c9b918f31fc2c900fd528f6 ChangeLog 1061 -SHA256 f3adcef481213a7f25b5550585fb483d4fb46dd6b796fabdd48a0c01cd48261c ChangeLog 1061 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 +MISC ChangeLog 1377 RMD160 6df3303c99051dd02b1457c5a2c41dfed5d339d7 SHA1 019ee32dfabbfbe4b67a58335e5485febf284179 SHA256 6cf842143f7eee7825a7319dc4c8fdf81e8f1769d3e1d5832a2187be3de8b17e +MD5 518c6aee932476420598ff69092bae7e ChangeLog 1377 +RMD160 6df3303c99051dd02b1457c5a2c41dfed5d339d7 ChangeLog 1377 +SHA256 6cf842143f7eee7825a7319dc4c8fdf81e8f1769d3e1d5832a2187be3de8b17e ChangeLog 1377 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 MD5 a4a3ed1eb083c092c71645327d510a72 files/digest-armagetronad-0.2.7.1 726 RMD160 8d234e4c16713cbc4067c6359e41a377c12c3725 files/digest-armagetronad-0.2.7.1 726 SHA256 1841508c1a90c849360c296c55631a65462f160e12626ed3d333635d787afe72 files/digest-armagetronad-0.2.7.1 726 +MD5 a4a3ed1eb083c092c71645327d510a72 files/digest-armagetronad-0.2.7.1-r1 726 +RMD160 8d234e4c16713cbc4067c6359e41a377c12c3725 files/digest-armagetronad-0.2.7.1-r1 726 +SHA256 1841508c1a90c849360c296c55631a65462f160e12626ed3d333635d787afe72 files/digest-armagetronad-0.2.7.1-r1 726 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEVX6s2+ySkm8kpY0RAiOaAJ9gX0TqN384tHCZbH0VX6/OdYiupQCcDrjw -cGpCP6Y2AZAEaAeGyRojeGI= -=gMAk +iD8DBQFE/1H8kT4lNIS36YERAib3AKCmnwXqHK8tHGIJNz07xlrgXNFKqwCeM4AC +TEocc4si2fN7yJaoI5/viPM= +=Q1nQ -----END PGP SIGNATURE----- diff --git a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild new file mode 100644 index 000000000000..a5c19ef77716 --- /dev/null +++ b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.1 2006/09/06 22:55:25 wolf31o2 Exp $ + + +inherit flag-o-matic eutils games + +DESCRIPTION="3d tron lightcycles, just like the movie" +HOMEPAGE="http://armagetronad.sourceforge.net/" +SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2 + !dedicated? ( + http://armagetron.sourceforge.net/addons/moviesounds_fq.zip + http://armagetron.sourceforge.net/addons/moviepack.zip + )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="dedicated" + +RDEPEND=" + !dedicated? ( + sys-libs/zlib + virtual/opengl + virtual/glu + media-libs/libsdl + media-libs/sdl-image + media-libs/jpeg + media-libs/libpng )" +DEPEND="${RDEPEND} + !dedicated? ( app-arch/unzip )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P}-security-1.patch +} + +src_compile() { + filter-flags -fno-exceptions + if use dedicated; then + egamesconf --disable-glout || die "egamesconf failed" + else + egamesconf || die "egamesconf failed" + fi + emake || die "emake failed" + make documentation || "make doc failed" +} + +src_install() { + dohtml doc/*.html + docinto html/net + dohtml doc/net/*.html + newicon tron.ico ${PN}.ico + exeinto "${GAMES_LIBDIR}/${PN}" + if use dedicated; then + doexe src/tron/${PN}-dedicated || die "copying files" + else + doexe src/tron/${PN} || die "copying files" + fi + doexe src/network/armagetronad-* || die "copying files" + insinto "${GAMES_DATADIR}/${PN}" + doins -r log language || die "copying files" + if ! use dedicated; then + doins -r arenas models sound textures music || die "copying files" + fi + insinto "${GAMES_SYSCONFDIR}/${PN}" + doins -r config/* || die "copying files" + if use dedicated; then + dogamesbin "${FILESDIR}/${PN}-ded" + fi + cd "${S}" + insinto "${GAMES_DATADIR}/${PN}" + if ! use dedicated; then + dogamesbin "${FILESDIR}/${PN}" + insinto "${GAMES_DATADIR}/${PN}" + doins -r ../moviepack ../moviesounds || die "copying movies" + make_desktop_entry armagetronad "Armagetron Advanced" ${PN}.ico + fi + prepgamesdirs +} diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch new file mode 100644 index 000000000000..fd12a5c971ce --- /dev/null +++ b/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc4.patch @@ -0,0 +1,60 @@ +diff -ur armagetronad-0.2.7.1-orig/src/engine/eGrid.h armagetronad-0.2.7.1/src/engine/eGrid.h +--- armagetronad-0.2.7.1-orig/src/engine/eGrid.h 2005-02-03 17:26:03.000000000 +0100 ++++ armagetronad-0.2.7.1/src/engine/eGrid.h 2006-06-04 20:06:17.000000000 +0200 +@@ -39,6 +39,7 @@ + class ePoint; + class eFace; + class eHalfEdge; ++class eGameObject; + class eWall; + class eGrid; + class eWallView; +diff -ur armagetronad-0.2.7.1-orig/src/engine/eVoter.cpp armagetronad-0.2.7.1/src/engine/eVoter.cpp +--- armagetronad-0.2.7.1-orig/src/engine/eVoter.cpp 2005-03-02 23:25:18.000000000 +0100 ++++ armagetronad-0.2.7.1/src/engine/eVoter.cpp 2006-06-04 20:13:54.000000000 +0200 +@@ -39,6 +39,8 @@ + #include "ePlayer.h" + #include "eGrid.h" + ++class eMenuItemVote; ++ + static unsigned short se_votingItemID = 0; + static float se_votingTimeout = 300.0f; + static nSettingItem< float > se_vt( "VOTING_TIMEOUT", se_votingTimeout ); +diff -ur armagetronad-0.2.7.1-orig/src/engine/eWall.h armagetronad-0.2.7.1/src/engine/eWall.h +--- armagetronad-0.2.7.1-orig/src/engine/eWall.h 2005-02-01 17:54:13.000000000 +0100 ++++ armagetronad-0.2.7.1/src/engine/eWall.h 2006-06-04 19:49:36.000000000 +0200 +@@ -53,6 +53,8 @@ + + + class eWall; ++class eWallView; ++class eWallHolder; + class eGameObject; + + class eWallView:public tHeapElement{ +diff -ur armagetronad-0.2.7.1-orig/src/network/nPriorizing.h armagetronad-0.2.7.1/src/network/nPriorizing.h +--- armagetronad-0.2.7.1-orig/src/network/nPriorizing.h 2004-11-29 11:26:42.000000000 +0100 ++++ armagetronad-0.2.7.1/src/network/nPriorizing.h 2006-06-04 20:16:45.000000000 +0200 +@@ -36,6 +36,7 @@ + class nSendBuffer; + class nBandwidthControl; + class nBandwidthTask; ++class nBandwidthTaskPriorizer; + + tDECLARE_REFOBJ( nBandwidthTask ); + tDECLARE_REFOBJ( nBandwidthArbitrator ); +diff -ur armagetronad-0.2.7.1-orig/src/tron/gCycle.h armagetronad-0.2.7.1/src/tron/gCycle.h +--- armagetronad-0.2.7.1-orig/src/tron/gCycle.h 2005-03-06 08:26:03.000000000 +0100 ++++ armagetronad-0.2.7.1/src/tron/gCycle.h 2006-06-04 19:59:52.000000000 +0200 +@@ -40,6 +40,10 @@ + class gTextureCycle; + class eSoundPlayer; + class gSensor; ++class gCycle; ++class gPlayerWall; ++class gNetPlayerWall; ++class gDestination; + + // minimum time between two cycle turns + extern REAL sg_delayCycle; diff --git a/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch b/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch new file mode 100644 index 000000000000..3b7a7759b44c --- /dev/null +++ b/games-action/armagetronad/files/armagetronad-0.2.7.1-security-1.patch @@ -0,0 +1,20 @@ +Index: src/network/nNetObject.cpp +=================================================================== +--- src/network/nNetObject.cpp (revision 5965) ++++ src/network/nNetObject.cpp (working copy) +@@ -661,6 +661,15 @@ + #endif + m.Read( owner ); + ++ // clients are only allowed to create self-owned objects ++ if ( sn_GetNetState() == nSERVER ) ++ { ++ if ( owner != m.SenderID() ) ++ { ++ throw nKillHim(); ++ } ++ } ++ + registrar.object = this; + registrar.sender = m.SenderID(); + diff --git a/games-action/armagetronad/files/digest-armagetronad-0.2.7.1-r1 b/games-action/armagetronad/files/digest-armagetronad-0.2.7.1-r1 new file mode 100644 index 000000000000..48aaee5e5d72 --- /dev/null +++ b/games-action/armagetronad/files/digest-armagetronad-0.2.7.1-r1 @@ -0,0 +1,9 @@ +MD5 cc29c2fd7de5699173de84d7cde57b97 armagetronad-0.2.7.1.tar.bz2 1243746 +RMD160 0dcf9d383fccd42509cae3aacc2df0d5531bd021 armagetronad-0.2.7.1.tar.bz2 1243746 +SHA256 0ec8793f6d4d4f5a90feec1c8b0a4846aa4fa2c1f3c69a20b21b5e930d70992c armagetronad-0.2.7.1.tar.bz2 1243746 +MD5 e2d40309dde7e1339ca6aff7599cdfa3 moviepack.zip 352253 +RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 moviepack.zip 352253 +SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 moviepack.zip 352253 +MD5 3c5d04af52eb296cdeb2fba5ecbd8899 moviesounds_fq.zip 2182021 +RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a moviesounds_fq.zip 2182021 +SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba moviesounds_fq.zip 2182021 -- 2.26.2