summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2007-02-07 16:45:14 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2007-02-07 16:45:14 +0000
commit81bcc10160a1f0eb274165701af0889766fb7463 (patch)
tree72680800926baefb35bf0ce200d44a303e8d3cf1 /games-strategy/netpanzer
parentBring 0.8.1 keywords up to 0.8 and remove old DOSable version (diff)
downloadgentoo-2-81bcc10160a1f0eb274165701af0889766fb7463.tar.gz
gentoo-2-81bcc10160a1f0eb274165701af0889766fb7463.tar.bz2
gentoo-2-81bcc10160a1f0eb274165701af0889766fb7463.zip
Bring 0.8.1 keywords up to 0.8 and remove old DOSable version
(Portage version: 2.1.1-r2) (Unsigned Manifest commit)
Diffstat (limited to 'games-strategy/netpanzer')
-rw-r--r--games-strategy/netpanzer/Manifest46
-rw-r--r--games-strategy/netpanzer/files/digest-netpanzer-0.8-r16
-rw-r--r--games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch36
-rw-r--r--games-strategy/netpanzer/files/netpanzer-0.8-min-size-check.patch33
-rw-r--r--games-strategy/netpanzer/files/netpanzer-0.8-robust.patch205
-rw-r--r--games-strategy/netpanzer/netpanzer-0.8-r1.ebuild72
6 files changed, 8 insertions, 390 deletions
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
index 9f1d7bf72bd6..fcd642182dee 100644
--- a/games-strategy/netpanzer/Manifest
+++ b/games-strategy/netpanzer/Manifest
@@ -1,18 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX netpanzer-0.8-gcc41.patch 1055 RMD160 980f6d989cb792162912a04d5f758795c76bfe5e SHA1 14cb3ebd47972a5e211c592d1c2169fa7e8031c0 SHA256 9de127700051dcd1ea0b40ff3939fd1ade52b4eb5769418f2efc6472b0fb0fc2
-MD5 02b54887b0c2d34d6c4e8ec046a9db18 files/netpanzer-0.8-gcc41.patch 1055
-RMD160 980f6d989cb792162912a04d5f758795c76bfe5e files/netpanzer-0.8-gcc41.patch 1055
-SHA256 9de127700051dcd1ea0b40ff3939fd1ade52b4eb5769418f2efc6472b0fb0fc2 files/netpanzer-0.8-gcc41.patch 1055
-AUX netpanzer-0.8-min-size-check.patch 1385 RMD160 236c57478879366dc446831dedeeb01683eac7b0 SHA1 3bb10d7c4f00667042e583f34db09501d011d45e SHA256 1c30f7c6ada47a7a8c10a2c9408215e2b272f07c09c283465aaaea9362068d06
-MD5 616b3d065523e34fd3e0d5d8ada5d053 files/netpanzer-0.8-min-size-check.patch 1385
-RMD160 236c57478879366dc446831dedeeb01683eac7b0 files/netpanzer-0.8-min-size-check.patch 1385
-SHA256 1c30f7c6ada47a7a8c10a2c9408215e2b272f07c09c283465aaaea9362068d06 files/netpanzer-0.8-min-size-check.patch 1385
-AUX netpanzer-0.8-robust.patch 8203 RMD160 b96eb189eeb710a6c081cddbf5321cdb9a934c36 SHA1 a343bf52f6f3f35b75c2969fa06bc44f7862b6d8 SHA256 1755b57816ec17e27efda9425783afd7dab3fd79ff8c68d0ec38c527c0ae46fe
-MD5 c40c9070d28732d4ca56e37277e5807f files/netpanzer-0.8-robust.patch 8203
-RMD160 b96eb189eeb710a6c081cddbf5321cdb9a934c36 files/netpanzer-0.8-robust.patch 8203
-SHA256 1755b57816ec17e27efda9425783afd7dab3fd79ff8c68d0ec38c527c0ae46fe files/netpanzer-0.8-robust.patch 8203
AUX netpanzer-ded 353 RMD160 6d5d75daaf32d6c4a73eaa129588089b0bb0abd4 SHA1 92b085008d13e16b5e0d48761e43d6e90e42c892 SHA256 c3d4e23f9ce73200e1107648840477fa3386eae175761cc46dab9199ce424053
MD5 e45870d0456ec36ed692b70fada22bb5 files/netpanzer-ded 353
RMD160 6d5d75daaf32d6c4a73eaa129588089b0bb0abd4 files/netpanzer-ded 353
@@ -26,34 +11,19 @@ MD5 d91dca0533299f6e0458bca934b06338 files/netpanzer.rc 887
RMD160 cfaad90d7046a69f4089307f4139a4d387561f46 files/netpanzer.rc 887
SHA256 0ed2bfd323f4eb0d1210b56a89443986a68c69d4b46e661f3dbb9281e6b9f9d7 files/netpanzer.rc 887
DIST netpanzer-0.8.1.tar.bz2 392603 RMD160 082f74e593e1097af952b53c4b4bb8b6014b83bd SHA1 467035ac35fb20f21db8329fa7606f4f94b4348d SHA256 9c6706142c2d39f0fb09a48c94d4c90069a8959cc5c30a98d8c10d03d0b2432d
-DIST netpanzer-0.8.tar.bz2 382007 RMD160 1be9730ae1ac56765eda87251207b0cf35affbdb SHA1 9d2c3938732db12496dca7e91f75e86c8ba3f4d6 SHA256 468e0d7a6d16aeeb9f7f68214a26db7ceb90fc4876a3da2de63b711b83d71233
DIST netpanzer-data-0.8.tar.bz2 10123751 RMD160 a2746ba759b61a1ddc31847144e407674dc46900 SHA1 4fec331aab570a2d76895c5799fadcfe1ad933eb SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b
-EBUILD netpanzer-0.8-r1.ebuild 2112 RMD160 9ba7e7fa967549920c229defd77834e1d526f074 SHA1 3cc124764fc0646f4be725c310cb20adb449da8f SHA256 b86ddc929394f80d65669149ccaca1b81dcc0a9dd84ba0c8a747d1a8d9c7abd2
-MD5 b17feed1ae66a1baca608441a3b2bf2a netpanzer-0.8-r1.ebuild 2112
-RMD160 9ba7e7fa967549920c229defd77834e1d526f074 netpanzer-0.8-r1.ebuild 2112
-SHA256 b86ddc929394f80d65669149ccaca1b81dcc0a9dd84ba0c8a747d1a8d9c7abd2 netpanzer-0.8-r1.ebuild 2112
-EBUILD netpanzer-0.8.1.ebuild 1777 RMD160 aa951f9dc89ae6721c8ad916baf37cb6b0628370 SHA1 2c43b9cdaa6448f27ed80a65a65a9e2b9d1846e0 SHA256 c53da21c20867bf79a49d546ddfa4d242f5d56c75b660361685cd525588389bd
-MD5 b34dad2b4da995276ec28cb77bb454aa netpanzer-0.8.1.ebuild 1777
-RMD160 aa951f9dc89ae6721c8ad916baf37cb6b0628370 netpanzer-0.8.1.ebuild 1777
-SHA256 c53da21c20867bf79a49d546ddfa4d242f5d56c75b660361685cd525588389bd netpanzer-0.8.1.ebuild 1777
-MISC ChangeLog 3825 RMD160 625569cf01eda29828cc74abe1471e6915f208cf SHA1 e21a621c6211c0f2caf7b94838c8cf9d6f2cf2d8 SHA256 3f985dc6be1e16d6d36f4044a118aabf821b171fb8cac804767c6068c4b7e189
-MD5 645b472014a360431b191b10c1327fc9 ChangeLog 3825
-RMD160 625569cf01eda29828cc74abe1471e6915f208cf ChangeLog 3825
-SHA256 3f985dc6be1e16d6d36f4044a118aabf821b171fb8cac804767c6068c4b7e189 ChangeLog 3825
+EBUILD netpanzer-0.8.1.ebuild 1779 RMD160 97966037c985ce8ceafcbad6a763b43ccf5ee25f SHA1 3f3452d80599eb6672c970bd596854669925d51a SHA256 a821451ecb7641f7cf47ee0d48049c053321d7c5e5a125f875c414aae2553422
+MD5 8f4c9e7b0c5a82e7c7016b952c4ccd43 netpanzer-0.8.1.ebuild 1779
+RMD160 97966037c985ce8ceafcbad6a763b43ccf5ee25f netpanzer-0.8.1.ebuild 1779
+SHA256 a821451ecb7641f7cf47ee0d48049c053321d7c5e5a125f875c414aae2553422 netpanzer-0.8.1.ebuild 1779
+MISC ChangeLog 4120 RMD160 083aa08cdac5840c1c192b6150e57f2bd9f2ab44 SHA1 7ad8f942844ecbf632902eb22104e370060db9c2 SHA256 5982a8ad654d6a50baa37474012c8baa21176021b987c53092df94626b323f8e
+MD5 09983ebd62efd8453ec3ecb1c494d824 ChangeLog 4120
+RMD160 083aa08cdac5840c1c192b6150e57f2bd9f2ab44 ChangeLog 4120
+SHA256 5982a8ad654d6a50baa37474012c8baa21176021b987c53092df94626b323f8e ChangeLog 4120
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 1d32d5dcce16f2225cde587494fd92e4 files/digest-netpanzer-0.8-r1 509
-RMD160 c1dcd945ccaf8b39cda7032bcee23cbc6b7aa5c9 files/digest-netpanzer-0.8-r1 509
-SHA256 295fd5788341584e2e31752ae5e6d7d278514f555423c94a4766ed542ee16833 files/digest-netpanzer-0.8-r1 509
MD5 fcf5290b34eccc2fba0e60307a107591 files/digest-netpanzer-0.8.1 515
RMD160 efc83a7af66d9c70f3f309b42a0c759046ffe362 files/digest-netpanzer-0.8.1 515
SHA256 78452065cf4b943fc2b817536f91670c9176b3a66dc91858b519eadd73514101 files/digest-netpanzer-0.8.1 515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFyZo1dz7hIScOURERAl/kAJ9uKtk67ogrDCg3X/X8g5y/aVS/lgCeMW8P
-gt082GTMhpQb/9VCvytgBYw=
-=jHVf
------END PGP SIGNATURE-----
diff --git a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1 b/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
deleted file mode 100644
index b799f2f8cf5f..000000000000
--- a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c08c1b703eac533407db02510deca68e netpanzer-0.8.tar.bz2 382007
-RMD160 1be9730ae1ac56765eda87251207b0cf35affbdb netpanzer-0.8.tar.bz2 382007
-SHA256 468e0d7a6d16aeeb9f7f68214a26db7ceb90fc4876a3da2de63b711b83d71233 netpanzer-0.8.tar.bz2 382007
-MD5 d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 10123751
-RMD160 a2746ba759b61a1ddc31847144e407674dc46900 netpanzer-data-0.8.tar.bz2 10123751
-SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b netpanzer-data-0.8.tar.bz2 10123751
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch b/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
deleted file mode 100644
index f81008c45fa3..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/Lib/Network/Address.hpp
-+++ src/Lib/Network/Address.hpp
-@@ -34,7 +34,7 @@
- /** resolves a hostname or IP-Number together with a port and returns a
- * new Address object.
- */
-- static Address Address::resolve(const std::string& name, uint16_t port);
-+ static Address resolve(const std::string& name, uint16_t port);
-
- /** returns the ip address of this Address as string */
- std::string getIP() const;
-
---- src/NetPanzer/Classes/PlayerState.hpp
-+++ src/NetPanzer/Classes/PlayerState.hpp
-@@ -81,8 +81,8 @@
- public:
- PlayerUnitConfig unit_config;
-
-- PlayerState::PlayerState();
-- PlayerState::PlayerState(const PlayerState& other);
-+ PlayerState();
-+ PlayerState(const PlayerState& other);
-
- void operator= (const PlayerState& other);
-
---- src/NetPanzer/Interfaces/Console.cpp
-+++ src/NetPanzer/Interfaces/Console.cpp
-@@ -46,7 +46,7 @@
- setp(buf, buf+sizeof(buf));
- }
-
-- FileStampStreamBuf::~FileStampStreamBuf()
-+ ~FileStampStreamBuf()
- {
- sync();
- if(file)
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8-min-size-check.patch b/games-strategy/netpanzer/files/netpanzer-0.8-min-size-check.patch
deleted file mode 100644
index dc97ffcf4a7c..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-0.8-min-size-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-The size needs to be at least 2 or the code gets hung up.
-
-http://bugs.gentoo.org/98922
-
---- src/NetPanzer/Network/ServerSocket.cpp
-+++ src/NetPanzer/Network/ServerSocket.cpp
-@@ -169,7 +169,7 @@
-
- size = htol16(*((int16_t*) tempbuffer));
-
-- if ( (size < 0) || (size > _MAX_NET_PACKET_SIZE) ) {
-+ if ( (size < 2) || (size > _MAX_NET_PACKET_SIZE) ) {
- LOG( ("OnReadStreamServer : Invalid Packet Size %d", size) );
- recvoffset = 0;
- client->headerincomplete = false;
-@@ -224,7 +224,7 @@
-
- size = htol16(*((int16_t*) tempbuffer));
-
-- if ( (size < 0) || (size > _MAX_NET_PACKET_SIZE) ) {
-+ if ( (size < 2) || (size > _MAX_NET_PACKET_SIZE) ) {
- LOG( ("OnReadStreamServer : Invalid Packet Size %d", size) );
- recvoffset = 0;
- client->messageincomplete = false;
-@@ -266,7 +266,7 @@
- } else if (recvsize >= 2) {
- size = htol16(*((int16_t*) (recvbuffer + recvoffset)));
-
-- if( (size < 0) || (size > _MAX_NET_PACKET_SIZE) ) {
-+ if( (size < 2) || (size > _MAX_NET_PACKET_SIZE) ) {
- LOG( ("OnReadStreamServer : Invalid Packet Size %d", size) );
- recvoffset = 0;
- client->tempoffset = 0;
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8-robust.patch b/games-strategy/netpanzer/files/netpanzer-0.8-robust.patch
deleted file mode 100644
index d0e138e7f687..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-0.8-robust.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-A few more sanity checks from upstream svn.
-
-Index: src/NetPanzer/Interfaces/ChatInterface.cpp
-===================================================================
---- src/NetPanzer/Interfaces/ChatInterface.cpp (revision 928)
-+++ src/NetPanzer/Interfaces/ChatInterface.cpp (revision 929)
-@@ -39,9 +39,16 @@
- ChatMesg chat_mesg;
- const ChatMesgRequest* chat_request = (const ChatMesgRequest*) message;
-
-+ if(chat_request->getSourcePlayerIndex() >= PlayerInterface::getMaxPlayers())
-+ {
-+ LOGGER.warning("Invalid chatMessageRequest");
-+ return;
-+ }
-+
- chat_mesg.setSourcePlayerIndex(chat_request->getSourcePlayerIndex());
- chat_mesg.message_scope = chat_request->message_scope;
-- strcpy( chat_mesg.message_text, chat_request->message_text );
-+ snprintf(chat_mesg.message_text, sizeof(chat_mesg.message_text), "%s",
-+ chat_request->message_text);
-
- if( chat_request->message_scope == _chat_mesg_scope_all ) {
- SERVER->sendMessage(&chat_mesg, sizeof(ChatMesg));
-@@ -126,6 +133,11 @@
- unsigned short local_player_index;
- const ChatMesg *chat_mesg = (const ChatMesg*) message;
-
-+ if(chat_mesg->getSourcePlayerIndex() >= PlayerInterface::getMaxPlayers()) {
-+ LOGGER.warning("malformed chatmessage packet.");
-+ return;
-+ }
-+
- if( chat_mesg->message_scope == _chat_mesg_scope_server ) {
- ConsoleInterface::postMessage("Server: %s", chat_mesg->message_text );
- return;
-Index: src/NetPanzer/Interfaces/GameManager.cpp
-===================================================================
---- src/NetPanzer/Interfaces/GameManager.cpp (revision 928)
-+++ src/NetPanzer/Interfaces/GameManager.cpp (revision 929)
-@@ -411,6 +411,11 @@
- = (const SystemConnectAlert*) message;
- PlayerState *player_state = 0;
-
-+ if(connect_alert->getPlayerID() >= PlayerInterface::getMaxPlayers()) {
-+ LOGGER.warning("Malformed connect alert message.");
-+ return;
-+ }
-+
- player_state = PlayerInterface::getPlayerState( connect_alert->getPlayerID() );
-
- switch (connect_alert->alert_enum) {
-@@ -471,6 +476,11 @@
- const SystemPingRequest *ping_request
- = (const SystemPingRequest*) message;
-
-+ if(ping_request->getClientPlayerIndex() >= PlayerInterface::getMaxPlayers()) {
-+ LOGGER.warning("Invalid pingRequest message");
-+ return;
-+ }
-+
- player_id = PlayerInterface::getPlayerID( ping_request->getClientPlayerIndex() );
-
- SystemPingAcknowledge ping_ack;
-Index: src/NetPanzer/Interfaces/PlayerInterface.cpp
-===================================================================
---- src/NetPanzer/Interfaces/PlayerInterface.cpp (revision 928)
-+++ src/NetPanzer/Interfaces/PlayerInterface.cpp (revision 929)
-@@ -25,6 +25,7 @@
- #include "PlayerNetMessage.hpp"
- #include "Server.hpp"
- #include "NetworkServer.hpp"
-+#include "Util/Log.hpp"
-
- #include "ConsoleInterface.hpp"
- // for UNIT_FLAGS_SURFACE
-@@ -410,6 +411,10 @@
- = (const PlayerConnectID *) message;
-
- local_player_index = connect_mesg->connect_state.getPlayerIndex();
-+ if(local_player_index >= max_players) {
-+ LOGGER.warning("Invalide netMessageConnectID Message");
-+ return;
-+ }
-
- SDL_mutexP(mutex);
- player_lists[local_player_index].setFromNetworkPlayerState
-@@ -423,6 +428,12 @@
- const PlayerStateSync *sync_mesg
- = (const PlayerStateSync *) message;
- uint16_t player_index = sync_mesg->player_state.getPlayerIndex();
-+
-+ if(player_index >= max_players) {
-+ LOGGER.warning("Malformed MessageSyncState message");
-+ return;
-+ }
-+
- SDL_mutexP(mutex);
- player_lists[player_index].setFromNetworkPlayerState(&sync_mesg->player_state);
- forceUniquePlayerFlags();
-@@ -475,6 +486,14 @@
- const PlayerScoreUpdate* score_update
- = (const PlayerScoreUpdate *) message;
-
-+ if(score_update->getKillByPlayerIndex() >= PlayerInterface::getMaxPlayers()
-+ || score_update->getKillOnPlayerIndex()
-+ >= PlayerInterface::getMaxPlayers())
-+ {
-+ LOGGER.warning("Malformed scrore update packet.");
-+ return;
-+ }
-+
- PlayerState* player1 = getPlayer(score_update->getKillByPlayerIndex());
- PlayerState* player2 = getPlayer(score_update->getKillOnPlayerIndex());
- setKill(player1, player2, (UnitType) score_update->unit_type );
-@@ -487,6 +506,12 @@
- const PlayerAllianceRequest *allie_request
- = (const PlayerAllianceRequest *) message;
-
-+ if(allie_request->getAllieByPlayerIndex() >= max_players
-+ || allie_request->getAllieWithPlayerIndex() >= max_players) {
-+ LOGGER.warning("Invalid alliance request message");
-+ return;
-+ }
-+
- SDL_mutexP(mutex);
- if ( allie_request->alliance_request_type == _player_make_alliance ) {
- setAlliance(
-@@ -541,6 +566,12 @@
- const PlayerAllianceUpdate* allie_update
- = (const PlayerAllianceUpdate *) message;
-
-+ if(allie_update->getAllieByPlayerIndex() >= max_players
-+ || allie_update->getAllieWithPlayerIndex() >= max_players) {
-+ LOGGER.warning("Invalid alliance update message");
-+ return;
-+ }
-+
- SDL_mutexP(mutex);
- if (allie_update->alliance_update_type == _player_make_alliance) {
- setAlliance(
-Index: src/NetPanzer/Interfaces/InfoThread.cpp
-===================================================================
---- src/NetPanzer/Interfaces/InfoThread.cpp (revision 928)
-+++ src/NetPanzer/Interfaces/InfoThread.cpp (revision 929)
-@@ -174,15 +174,20 @@
- InfoThread::sendPlayers(std::stringstream& out)
- {
- ObjectiveInterface::updatePlayerObjectiveCounts();
-- for(int i = 0; i < PlayerInterface::countPlayers(); ++i) {
-+ int n = 0;
-+ for(int i = 0; i < PlayerInterface::getMaxPlayers(); ++i) {
- PlayerState* playerState = PlayerInterface::getPlayerState(i);
-- out << "player_" << i << "\\" << playerState->getName() << "\\"
-- << "kills_" << i << "\\" << playerState->getKills() << "\\"
-- << "deaths_" << i << "\\" << playerState->getLosses() << "\\"
-- << "score_" << i << "\\"
-+ if(playerState->getStatus() != _player_state_active)
-+ continue;
-+
-+ out << "player_" << n << "\\" << playerState->getName() << "\\"
-+ << "kills_" << n << "\\" << playerState->getKills() << "\\"
-+ << "deaths_" << n << "\\" << playerState->getLosses() << "\\"
-+ << "score_" << n << "\\"
- << playerState->getObjectivesHeld() << "\\"
-- << "flag_" << i << "\\"
-+ << "flag_" << n << "\\"
- << (int) playerState->getFlag() << "\\";
-+ n++;
- }
- // TODO add team/alliance info
- }
-Index: src/NetPanzer/Classes/Network/NetMessageDecoder.cpp
-===================================================================
---- src/NetPanzer/Classes/Network/NetMessageDecoder.cpp (revision 928)
-+++ src/NetPanzer/Classes/Network/NetMessageDecoder.cpp (revision 929)
-@@ -57,6 +57,12 @@
- return false;
-
- *message = (NetMessage *) (decode_message.data + decode_message_index);
-+ if( (*message)->getSize() >
-+ decode_message.getSize() - decode_message.getHeaderSize() -
-+ decode_message_index) {
-+ LOGGER.warning("Malformed Multimessage!");
-+ return false;
-+ }
- decode_message_index += (*message)->getSize();
- decode_current_count++;
-
-Index: src/NetPanzer/Classes/Objective.cpp
-===================================================================
---- src/NetPanzer/Classes/Objective.cpp (revision 928)
-+++ src/NetPanzer/Classes/Objective.cpp (revision 929)
-@@ -69,6 +69,11 @@
- {
- const SyncObjective *sync_mesg = (const SyncObjective*) message;
-
-+ if(sync_mesg->getOccupyingPlayerID() >= PlayerInterface::getMaxPlayers()) {
-+ LOGGER.warning("Malformed ObjectvieMesgSync");
-+ return;
-+ }
-+
- objective_state.objective_status = sync_mesg->objective_status;
- objective_state.occupation_status = sync_mesg->occupation_status;
- if(objective_state.occupation_status != _occupation_status_unoccupied) {
diff --git a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
deleted file mode 100644
index bb1e2e2e5374..000000000000
--- a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.4 2006/10/04 01:22:30 nyhm Exp $
-
-inherit eutils games
-
-DATAVERSION="0.8"
-DESCRIPTION="Fast-action multiplayer strategic network game"
-HOMEPAGE="http://netpanzer.berlios.de/"
-SRC_URI="http://download.berlios.de/netpanzer/netpanzer-${PV}.tar.bz2
- http://download.berlios.de/netpanzer/netpanzer-data-${DATAVERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="dedicated"
-
-RDEPEND="dedicated? ( app-misc/screen )
- >=media-libs/libsdl-1.2.5
- >=media-libs/sdl-mixer-1.2.4
- >=media-libs/sdl-image-1.2.3
- >=dev-games/physfs-0.1.9"
-DEPEND="${RDEPEND}
- >=dev-util/jam-2.5"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch \
- "${FILESDIR}"/${P}-min-size-check.patch \
- "${FILESDIR}"/${P}-robust.patch \
- "${FILESDIR}"/${P}-gcc41.patch
-}
-
-src_compile() {
- egamesconf || die
- jam -q || die "jam failed"
-
- einfo "Working in ${WORKDIR}/${PN}-data-${DATAVERSION}/"
- cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
- egamesconf || die
- jam -q || die "jam failed (on data package)"
-}
-
-src_install() {
- jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die "jam install failed"
-
- cd "${WORKDIR}"/${PN}-data-${DATAVERSION}/
- jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die "jam install failed (data package)"
-
- if use dedicated ; then
- newinitd "${FILESDIR}/netpanzer.rc" netpanzer || die "newinitd failed"
- sed -i \
- -e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
- -e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
- "${D}/etc/init.d/netpanzer" \
- || die "sed failed"
-
- insinto /etc
- doins "${FILESDIR}/netpanzer-ded.ini" || die "doins failed"
- exeinto "${GAMES_BINDIR}"
- doexe "${FILESDIR}/netpanzer-ded" || die "doexe failed"
- sed -i \
- -e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
- "${D}${GAMES_BINDIR}/netpanzer-ded" \
- || die "sed failed"
- fi
- rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
- doicon "${S}"/${PN}.png
- make_desktop_entry ${PN} NetPanzer
- prepgamesdirs
-}