rpms/pioneers/F-7 pioneers-0.11.3-CVE2007-6010.patch, NONE, 1.1 pioneers-0.11.3-sanitize.patch, NONE, 1.1 pioneers.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Tue Dec 11 13:47:46 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/pioneers/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11854

Modified Files:
	.cvsignore sources 
Added Files:
	pioneers-0.11.3-CVE2007-6010.patch 
	pioneers-0.11.3-sanitize.patch pioneers.spec 
Log Message:
* Tue Dec 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.3-3
- Fix CVE-2007-6010 (potential server DOS)


pioneers-0.11.3-CVE2007-6010.patch:

--- NEW FILE pioneers-0.11.3-CVE2007-6010.patch ---
--- trunk/pioneers/common/state.c	2007/10/07 17:58:14	1343
+++ trunk/pioneers/common/state.c	2007/11/22 21:21:01	1360
@@ -71,7 +71,11 @@
 	StateFunc curr_state;
 	gpointer user_data;
 
-	curr_state = sm_current(sm);
+	if (sm->stack_ptr >= 0)
+		curr_state = sm_current(sm);
+	else
+		curr_state = NULL;
+
 	user_data = sm->user_data;
 	if (user_data == NULL)
 		user_data = sm;
@@ -89,16 +93,18 @@
 
 	switch (event) {
 	case SM_ENTER:
-		curr_state(user_data, event);
+		if (curr_state != NULL)
+			curr_state(user_data, event);
 		break;
 	case SM_INIT:
-		curr_state(user_data, event);
+		if (curr_state != NULL)
+			curr_state(user_data, event);
 		if (!sm->is_dead && sm->global !=NULL)
 			sm->global (user_data, event);
 		break;
 	case SM_RECV:
 		sm_cancel_prefix(sm);
-		if (curr_state(user_data, event))
+		if (curr_state != NULL && curr_state(user_data, event))
 			break;
 		sm_cancel_prefix(sm);
 		if (!sm->is_dead
@@ -112,7 +118,8 @@
 	case SM_NET_CLOSE:
 		sm_close(sm);
 	default:
-		curr_state(user_data, event);
+		if (curr_state != NULL)
+			curr_state(user_data, event);
 		if (!sm->is_dead && sm->global !=NULL)
 			sm->global (user_data, event);
 		break;

pioneers-0.11.3-sanitize.patch:

--- NEW FILE pioneers-0.11.3-sanitize.patch ---
diff -up pioneers-0.11.3/docs/pioneers-server-gtk.6~ pioneers-0.11.3/docs/pioneers-server-gtk.6
--- pioneers-0.11.3/docs/pioneers-server-gtk.6~	2007-11-27 11:00:18.000000000 +0100
+++ pioneers-0.11.3/docs/pioneers-server-gtk.6	2007-11-27 11:00:18.000000000 +0100
@@ -12,8 +12,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
 model for networked play of between two and eight players.  This program
 provides a GUI-configurable stand-alone server which you connect to
 from 
diff -up pioneers-0.11.3/docs/pioneersai.6~ pioneers-0.11.3/docs/pioneersai.6
--- pioneers-0.11.3/docs/pioneersai.6~	2007-11-27 11:00:20.000000000 +0100
+++ pioneers-0.11.3/docs/pioneersai.6	2007-11-27 11:00:20.000000000 +0100
@@ -26,8 +26,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an emulation of the Settlers of Catan board game which can
-be played over the internet. This is an AI player
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. This is an AI player
 implementation that can take part in Pioneers games.
 
 .SH OPTIONS
diff -up pioneers-0.11.3/docs/pioneers-meta-server.6~ pioneers-0.11.3/docs/pioneers-meta-server.6
--- pioneers-0.11.3/docs/pioneers-meta-server.6~	2007-11-27 11:00:16.000000000 +0100
+++ pioneers-0.11.3/docs/pioneers-meta-server.6	2007-11-27 11:00:16.000000000 +0100
@@ -8,8 +8,10 @@ pioneers-meta-server \- meta game server
 
 .SH DESCRIPTION
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game.  It uses a client/server model for networked play. This program
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers.
+It uses a client/server model for networked play. This program
 provides a piece of network infrastructure that helps match pioneers clients to
 pioneers servers. Casual players of pioneers probably do not need to run this
 program.
diff -up pioneers-0.11.3/docs/pioneers-server-console.6~ pioneers-0.11.3/docs/pioneers-server-console.6
--- pioneers-0.11.3/docs/pioneers-server-console.6~	2007-11-27 11:00:17.000000000 +0100
+++ pioneers-0.11.3/docs/pioneers-server-console.6	2007-11-27 11:00:17.000000000 +0100
@@ -48,8 +48,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
 model for networked play of between two and eight players.  This program
 provides a console-only server that \fBpioneers\fP clients can connect
 to.
diff -up pioneers-0.11.3/docs/pioneers.6~ pioneers-0.11.3/docs/pioneers.6
--- pioneers-0.11.3/docs/pioneers.6~	2007-11-27 11:00:19.000000000 +0100
+++ pioneers-0.11.3/docs/pioneers.6	2007-11-27 11:00:19.000000000 +0100
@@ -1,6 +1,6 @@
 .TH pioneers 6 "April 9, 2006" "pioneers"
 .SH NAME
-pioneers \- network implementation of Settlers of Catan
+pioneers \- Turnbased board strategy game (colonize an island)
 
 .SH SYNOPSIS
 .B pioneers
@@ -24,8 +24,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
 model for networked play of between two and eight players.  You will
 need to connect to a machine running either \fBpioneers-server-gtk\fP
 or \fBpioneers-server-console\fP to play.  An AI client, \fBpioneersai\fP,
diff -up pioneers-0.11.3/client/help/C/pioneers-C.omf~ pioneers-0.11.3/client/help/C/pioneers-C.omf
--- pioneers-0.11.3/client/help/C/pioneers-C.omf~	2007-11-27 11:04:00.000000000 +0100
+++ pioneers-0.11.3/client/help/C/pioneers-C.omf	2007-11-27 11:04:00.000000000 +0100
@@ -17,8 +17,8 @@
     <version identifier="1.0" date="2003-10-07" description="Updated to full OMF format"/>
     <subject category="GNOME|Games"/>
     <description>
-      Pioneers is an Internet playable implementation of
-	  the Settlers of Catan board game.
+      Pioneers is a computerized version of a well known strategy board game.
+      The goal of the game is to colonize an island.
     </description>
     <type>
      user's guide
diff -up pioneers-0.11.3/client/help/C/pioneers.xml~ pioneers-0.11.3/client/help/C/pioneers.xml
--- pioneers-0.11.3/client/help/C/pioneers.xml~	2007-11-27 11:03:16.000000000 +0100
+++ pioneers-0.11.3/client/help/C/pioneers.xml	2007-11-27 11:03:16.000000000 +0100
@@ -58,10 +58,11 @@
     <simplesect id="Authors">
       <title>Authors and History</title>
       <para>
-        Pioneers is a GNOME game based upon the board game Settlers of Catan
-        created by Mayfair Games. Pioneers was originally authored by Dave
-        Cole in the spring and summer of 1999, under the name Gnocatan.
-	Dave wanted to be able to
+        Pioneers is a computerized version of a well known strategy board game.
+        The goal of the game is to colonize an island. The players play the
+        first colonists hence the name pioneers.
+        Pioneers was originally authored by Dave Cole in the spring and summer
+        of 1999. Dave wanted to be able to
         play the game without having to travel, so he developed a computer
         implementation of the game. The Pioneers project stalled in the late
         summer of 1999 and saw little development until the early spring of
@@ -79,9 +80,6 @@
 	on the user interface.
       </para>
       <para>
-        In June 2005 the project was renamed from Gnocatan to Pioneers.
-      </para>
-      <para>
         To be continued...
       </para>
     </simplesect>
diff -U0 pioneers-0.11.3/ChangeLog~ pioneers-0.11.3/ChangeLog
--- pioneers-0.11.3/ChangeLog~	2007-11-27 10:56:43.000000000 +0100
+++ pioneers-0.11.3/ChangeLog	2007-11-27 10:56:43.000000000 +0100
@@ -3537 +3537 @@
-	* One of the official rule variants for Settlers of Catan is
+	* One of the official rule variants is
diff -up pioneers-0.11.3/common/gtk/aboutbox.c~ pioneers-0.11.3/common/gtk/aboutbox.c
--- pioneers-0.11.3/common/gtk/aboutbox.c~	2007-11-27 10:52:58.000000000 +0100
+++ pioneers-0.11.3/common/gtk/aboutbox.c	2007-11-27 10:52:58.000000000 +0100
@@ -36,10 +36,9 @@ static GtkWidget *about = NULL;	/* The a
 
 void aboutbox_display(const gchar * title, const gchar ** authors)
 {
-	GtkWidget *splash = NULL, *view = NULL;
+	GtkWidget *view = NULL;
 	GtkTextBuffer *buffer = NULL;
 	GtkTextIter iter;
-	gchar *imagefile = NULL;
 	gint i;
 
 	if (about != NULL) {
@@ -57,22 +56,11 @@ void aboutbox_display(const gchar * titl
 	g_signal_connect(G_OBJECT(about), "destroy",
 			 G_CALLBACK(gtk_widget_destroyed), &about);
 
-	imagefile = g_build_filename(DATADIR, "pixmaps", "pioneers",
-				     "splash.png", NULL);
-	splash = gtk_image_new_from_file(imagefile);
-	g_free(imagefile);
-
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about)->vbox), splash, FALSE,
-			   FALSE, 0);
-
 	buffer = gtk_text_buffer_new(NULL);
 	gtk_text_buffer_get_start_iter(buffer, &iter);
 	gtk_text_buffer_create_tag(buffer, "bold",
 				   "weight", PANGO_WEIGHT_BOLD, NULL);
 
-	gtk_text_buffer_insert(buffer, &iter,
-			       _("Pioneers is based upon the excellent\n"
-				 "Settlers of Catan board game.\n"), -1);
 	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
 						 _("Version"), -1,
 						 "bold", NULL);
diff -up pioneers-0.11.3/README~ pioneers-0.11.3/README
--- pioneers-0.11.3/README~	2007-11-27 11:01:10.000000000 +0100
+++ pioneers-0.11.3/README	2007-11-27 11:01:10.000000000 +0100
@@ -1,8 +1,8 @@
 Pioneers
 
-Pioneers is an Internet playable implementation of the Settlers of
-Catan board game.  The aim is to remain as faithful to the board game
-as is possible.
+Pioneers is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers.
 
 Playing the Game
 ================
diff -up pioneers-0.11.3/client/gtk/offline.c~ pioneers-0.11.3/client/gtk/offline.c
--- pioneers-0.11.3/client/gtk/offline.c~	2007-11-27 13:48:10.000000000 +0100
+++ pioneers-0.11.3/client/gtk/offline.c	2007-11-27 13:48:10.000000000 +0100
@@ -96,7 +96,6 @@ static void frontend_offline_gui(GuiEven
 				   && !connectable);
 		break;
 	case GUI_CONNECT_TRY:
-		gui_show_splash_page(FALSE);
 		gui_set_net_status(_("Connecting"));
 
 		connectable = FALSE;
diff -up pioneers-0.11.3/client/gtk/gui.c~ pioneers-0.11.3/client/gtk/gui.c
--- pioneers-0.11.3/client/gtk/gui.c~	2007-11-27 13:45:43.000000000 +0100
+++ pioneers-0.11.3/client/gtk/gui.c	2007-11-27 13:45:43.000000000 +0100
@@ -53,14 +53,12 @@ enum {
 	TRADE_PAGE,		/* trading interface */
 	QUOTE_PAGE,		/* submit quotes page */
 	LEGEND_PAGE,		/* legend */
-	SPLASH_PAGE		/* splash screen */
 };
 
 static GtkWidget *map_notebook;	/* map area panel */
 static GtkWidget *trade_page;	/* trade page in map area */
 static GtkWidget *quote_page;	/* quote page in map area */
-static GtkWidget *legend_page;	/* splash page in map area */
-static GtkWidget *splash_page;	/* splash page in map area */
+static GtkWidget *legend_page;	/* legend page in map area */
 
 static GtkWidget *develop_notebook;	/* development card area panel */
 
@@ -83,8 +81,6 @@ static gboolean legend_page_enabled = TR
 
 static GList *rules_callback_list = NULL;
 
-#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png"
-
 static const gchar *pioneers_pixmaps[] = {
 	PIONEERS_PIXMAP_DICE,
 	PIONEERS_PIXMAP_TRADE,
@@ -522,43 +518,6 @@ void gui_show_legend_page(gboolean show)
 		gtk_widget_hide(legend_page);
 }
 
-void gui_show_splash_page(gboolean show)
-{
-	chat_set_grab_focus_on_update(TRUE);
-	if (show) {
-		gtk_widget_show(splash_page);
-		gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
-					      SPLASH_PAGE);
-	} else {
-		gtk_widget_hide(splash_page);
-		gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
-					      MAP_PAGE);
-	}
-}
-
-static GtkWidget *splash_build_page(void)
-{
-	GtkWidget *pm;
-	GtkWidget *viewport;
-	gchar *filename;
-
-	filename = g_build_filename(DATADIR, "pixmaps", "pioneers",
-				    "splash.png", NULL);
-	pm = gtk_image_new_from_file(filename);
-	g_free(filename);
-
-	/* The viewport avoids that the pixmap is drawn up into the tab area if
-	 * it's too large for the space provided. */
-	viewport = gtk_viewport_new(NULL, NULL);
-	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport),
-				     GTK_SHADOW_NONE);
-	gtk_widget_show(viewport);
-	gtk_widget_set_size_request(pm, 1, 1);
-	gtk_widget_show(pm);
-	gtk_container_add(GTK_CONTAINER(viewport), pm);
-	return viewport;
-}
-
 static GtkWidget *build_map_panel(void)
 {
 	GtkWidget *lbl;
@@ -599,14 +558,6 @@ static GtkWidget *build_map_panel(void)
 		gui_show_legend_page(FALSE);
 	theme_register_callback(G_CALLBACK(gui_theme_changed));
 
-	/* Tab page name, shown for the splash screen */
-	lbl = gtk_label_new(_("Welcome to Pioneers"));
-	gtk_widget_show(lbl);
-	splash_page = splash_build_page();
-	gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook),
-				 splash_page, lbl, SPLASH_PAGE);
-	gui_show_splash_page(TRUE);
-
 	return map_notebook;
 }
 
diff -up pioneers-0.11.3/po/af.po~ pioneers-0.11.3/po/af.po
--- pioneers-0.11.3/po/af.po~	2007-11-29 19:43:19.000000000 +0100
+++ pioneers-0.11.3/po/af.po	2007-11-29 19:43:19.000000000 +0100
@@ -2059,14 +2059,6 @@ msgstr "Aanvaar kwotasie"
 msgid "_Finish Trading"
 msgstr "Stop met ruilhandel"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioniers is gebaseer op die uitstekende\n"
-"bordspel \"Settlers of Catan\".\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Tuisblad"
diff -up pioneers-0.11.3/po/hu.po~ pioneers-0.11.3/po/hu.po
--- pioneers-0.11.3/po/hu.po~	2007-11-29 19:42:33.000000000 +0100
+++ pioneers-0.11.3/po/hu.po	2007-11-29 19:42:33.000000000 +0100
@@ -2069,14 +2069,6 @@ msgstr "_Ajánlat elfogadása"
 msgid "_Finish Trading"
 msgstr "_Kereskedés befejezése"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"A Pioneers a kíváló táblajáték a\n"
-"Catan telepesei alapján készült.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Honlap"
diff -up pioneers-0.11.3/po/ja.po~ pioneers-0.11.3/po/ja.po
--- pioneers-0.11.3/po/ja.po~	2007-11-29 19:43:02.000000000 +0100
+++ pioneers-0.11.3/po/ja.po	2007-11-29 19:43:02.000000000 +0100
@@ -2054,14 +2054,6 @@ msgstr "_Accept·Quote"
 msgid "_Finish Trading"
 msgstr "_Finish·Trading"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"パイオニアは、カタンの植民 という\n"
-"すばらしいボードゲームが元になっています.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "ホームページ"
diff -up pioneers-0.11.3/po/es.po~ pioneers-0.11.3/po/es.po
--- pioneers-0.11.3/po/es.po~	2007-11-29 19:42:09.000000000 +0100
+++ pioneers-0.11.3/po/es.po	2007-11-29 19:42:09.000000000 +0100
@@ -2059,14 +2059,6 @@ msgstr "_Aceptar presupuesto"
 msgid "_Finish Trading"
 msgstr "Terminar negocio"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioneers está basado en el excelente\n"
-"juego de mesa 'Los fundadores de Catán'.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Pagina principal"
diff -up pioneers-0.11.3/po/de.po~ pioneers-0.11.3/po/de.po
--- pioneers-0.11.3/po/de.po~	2007-11-29 19:41:59.000000000 +0100
+++ pioneers-0.11.3/po/de.po	2007-11-29 19:41:59.000000000 +0100
@@ -2059,14 +2059,6 @@ msgstr "Angebot annehmen"
 msgid "_Finish Trading"
 msgstr "Handel beenden"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioneers basiert auf dem exzellenten\n"
-"Brettspiel 'Die Siedler von Catan'.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Homepage"
diff -up pioneers-0.11.3/po/nl.po~ pioneers-0.11.3/po/nl.po
--- pioneers-0.11.3/po/nl.po~	2007-11-29 19:43:09.000000000 +0100
+++ pioneers-0.11.3/po/nl.po	2007-11-29 19:43:09.000000000 +0100
@@ -2057,14 +2057,6 @@ msgstr "Accepteer voorstel"
 msgid "_Finish Trading"
 msgstr "Beëindig handelsfase"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioniers is gebaseerd op\n"
-"het bordspel \"de kolonisten van Catan\".\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Homepage"
diff -up pioneers-0.11.3/po/sv.po~ pioneers-0.11.3/po/sv.po
--- pioneers-0.11.3/po/sv.po~	2007-11-29 19:43:14.000000000 +0100
+++ pioneers-0.11.3/po/sv.po	2007-11-29 19:43:14.000000000 +0100
@@ -2055,14 +2055,6 @@ msgstr "_Acceptera pris"
 msgid "_Finish Trading"
 msgstr "Avsluta _handel"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioneers är baserad på det utmärkta\n"
-"brädspelet Settlers of Catan.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Hemsida"
diff -up pioneers-0.11.3/po/fr.po~ pioneers-0.11.3/po/fr.po
--- pioneers-0.11.3/po/fr.po~	2007-11-29 19:42:24.000000000 +0100
+++ pioneers-0.11.3/po/fr.po	2007-11-29 19:42:24.000000000 +0100
@@ -2066,14 +2066,6 @@ msgstr "_Accepter l'offre"
 msgid "_Finish Trading"
 msgstr "_Fin des échanges"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioneers est basé sur l'excellent\n"
-"jeu de plateau 'Les colons de Catan'.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Page d'accueil"
diff -up pioneers-0.11.3/po/it.po~ pioneers-0.11.3/po/it.po
--- pioneers-0.11.3/po/it.po~	2007-11-29 19:42:42.000000000 +0100
+++ pioneers-0.11.3/po/it.po	2007-11-29 19:42:42.000000000 +0100
@@ -2059,14 +2059,6 @@ msgstr "_Accetta Quotazione"
 msgid "_Finish Trading"
 msgstr "_Termina Contrattazioni"
 
-#: common/gtk/aboutbox.c:74
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"Pioneers è basato sull'eccellente gioco\n"
-"I Coloni di Catan.\n"
-
 #: common/gtk/aboutbox.c:83
 msgid "Homepage"
 msgstr "Homepage"


--- NEW FILE pioneers.spec ---
Name:           pioneers
Version:        0.11.3
Release:        3%{?dist}
Summary:        Turnbased board strategy game (colonize an island)
Group:          Amusements/Games
License:        GPLv2+
URL:            http://pio.sourceforge.net/
Source0:        http://downloads.sourceforge.net/pio/%{name}-%{version}.tar.gz
Patch0:         pioneers-0.11.3-sanitize.patch
Patch1:         pioneers-0.11.3-CVE2007-6010.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libgnome-devel gtk2-devel gettext scrollkeeper
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme
Requires(post): scrollkeeper
Requires(postun): scrollkeeper

%description
Pioneers is a computerized version of a well known strategy board game. The
goal of the game is to colonize an island. The players play the first
colonists hence the name pioneers.

Pioneers is a networkbased multiplayer game, this package contains the GUI
client as well as both a GUI and CLI version of the server for local games.


%package editor
Summary:        Pioneers Game Editor
Group:          Amusements/Games
Requires:       pioneers = %{version}-%{release}

%description editor
Pioneers is a computerized version of a well known strategy board game. The
goal of the game is to colonize an island. The players play the first
colinists hence the name pioneers.

The game editor allows maps and game descriptions to be created and
edited graphically.


%prep
%setup -q
%patch0 -p1
%patch1 -p2


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

# Remove the too much like the original splashscreen
rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}/splash.png

# Reinstall the .desktop files
desktop-file-install --vendor fedora --delete-original \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-editor.desktop \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-server.desktop


%check
if grep Catan `find $RPM_BUILD_ROOT ! -path "$RPM_BUILD_ROOT/usr/src/debug*"`;
  then
  exit 1
fi


%clean
rm -rf $RPM_BUILD_ROOT


%post
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%postun
scrollkeeper-update -q || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README NEWS
%{_bindir}/%{name}
%{_bindir}/%{name}ai
%{_bindir}/%{name}-meta-server
%{_bindir}/%{name}-server-console
%{_bindir}/%{name}-server-gtk
%{_datadir}/games/%{name}
%{_datadir}/pixmaps/%{name}
%{_datadir}/omf/%{name}
%{_datadir}/gnome/help/%{name}
%{_mandir}/man6/%{name}*.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/applications/fedora-%{name}-server.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/pixmaps/%{name}-server.png

%files editor
%defattr(-,root,root,-)
%{_bindir}/%{name}-editor
%{_datadir}/applications/fedora-%{name}-editor.desktop
%{_datadir}/pixmaps/%{name}-editor.png


%changelog
* Tue Dec 11 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.3-3
- Fix CVE-2007-6010 (potential server DOS)

* Thu Nov 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.3-2
- Also sanitize the .po files just to be sure
- Remove bogus pkgdatadir argument to make install
- Add %%check section
- Leave the icons in /usr/share/pixmaps so that the window icons work

* Tue Nov 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.3-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pioneers/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Dec 2007 21:00:31 -0000	1.1
+++ .cvsignore	11 Dec 2007 13:47:10 -0000	1.2
@@ -0,0 +1 @@
+pioneers-0.11.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pioneers/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Dec 2007 21:00:31 -0000	1.1
+++ sources	11 Dec 2007 13:47:10 -0000	1.2
@@ -0,0 +1 @@
+b9184fb30f3fb04d3d010628a2a12b52  pioneers-0.11.3.tar.gz




More information about the fedora-extras-commits mailing list