rpms/freeciv/FC-5 freeciv-button-style.patch, NONE, 1.1 freeciv-security.patch, 1.1, 1.2 freeciv.spec, 1.22, 1.23

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/freeciv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21567

Modified Files:
	freeciv-security.patch freeciv.spec 
Added Files:
	freeciv-button-style.patch 
Log Message:
* Wed Aug  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.8-5
- Update security patch.
- Add patch to fix turn done buttons style.


freeciv-button-style.patch:

--- NEW FILE freeciv-button-style.patch ---
diff -ur freeciv-2.0.8.OLD/client/gui-gtk-2.0/gui_main.c freeciv-2.0.8/client/gui-gtk-2.0/gui_main.c
--- freeciv-2.0.8.OLD/client/gui-gtk-2.0/gui_main.c	2005-12-26 17:53:53.000000000 -0500
+++ freeciv-2.0.8/client/gui-gtk-2.0/gui_main.c	2006-08-01 14:34:54.000000000 -0400
@@ -853,7 +853,7 @@
   if (!(style = gtk_rc_get_style(turn_done_button))) {
     style = turn_done_button->style;
   }
-  gtk_widget_set_style(turn_done_button, gtk_style_copy(style));
+  gtk_widget_modify_style(turn_done_button, gtk_style_copy(style));
 
   gtk_table_attach_defaults(GTK_TABLE(table), turn_done_button, 0, 10, 2, 3);
 

freeciv-security.patch:

Index: freeciv-security.patch
===================================================================
RCS file: /cvs/extras/rpms/freeciv/FC-5/freeciv-security.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeciv-security.patch	1 Aug 2006 17:03:46 -0000	1.1
+++ freeciv-security.patch	3 Aug 2006 00:53:53 -0000	1.2
@@ -1,17 +1,21 @@
 diff -ur freeciv-2.0.8.OLD/common/packets.c freeciv-2.0.8/common/packets.c
 --- freeciv-2.0.8.OLD/common/packets.c	2006-03-05 22:35:23.000000000 -0500
-+++ freeciv-2.0.8/common/packets.c	2006-08-01 10:47:33.000000000 -0400
-@@ -577,6 +577,7 @@
++++ freeciv-2.0.8/common/packets.c	2006-08-02 18:27:40.000000000 -0400
+@@ -577,8 +577,11 @@
  	  chunk->total_length, chunk->chunk_length);
  
    if (chunk->total_length < 0
 +      || chunk->chunk_length < 0
        || chunk->total_length >= MAX_ATTRIBUTE_BLOCK
        || chunk->offset < 0
++      || chunk->offset > chunk->total_length /* necessary check on 32 bit systems */
++      || chunk->chunk_length > chunk->total_length
        || chunk->offset + chunk->chunk_length > chunk->total_length
+       || (chunk->offset != 0
+           && chunk->total_length != pplayer->attribute_block_buffer.length)) {
 diff -ur freeciv-2.0.8.OLD/server/unithand.c freeciv-2.0.8/server/unithand.c
 --- freeciv-2.0.8.OLD/server/unithand.c	2005-12-26 16:37:53.000000000 -0500
-+++ freeciv-2.0.8/server/unithand.c	2006-08-01 11:03:44.000000000 -0400
++++ freeciv-2.0.8/server/unithand.c	2006-08-02 18:26:15.000000000 -0400
 @@ -1593,7 +1593,8 @@
    struct unit *punit = player_find_unit_by_id(pplayer, packet->unit_id);
    int i;


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/FC-5/freeciv.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- freeciv.spec	1 Aug 2006 17:03:46 -0000	1.22
+++ freeciv.spec	3 Aug 2006 00:53:53 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           freeciv
 Version:        2.0.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -13,6 +13,7 @@
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-aifill.patch
 Patch3:		%{name}-security.patch
+Patch4:		%{name}-button-style.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -37,6 +38,7 @@
 %patch1 -p1 -b .desktop
 %patch2 -p0 -b .aifill
 %patch3 -p1 -b .security
+%patch4 -p1 -b .button
 
 %build
 %configure --enable-client=gtk2
@@ -93,6 +95,10 @@
 %{_mandir}/man6/civclient.6.gz
 
 %changelog
+* Wed Aug  2 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.8-5
+- Update security patch.
+- Add patch to fix turn done buttons style.
+
 * Tue Aug  1 2006 Brian Pepple <bpepple at fedoraproject.org> - 2.0.8-4
 - Add patch to fix CVE-2006-3913 vulnerability. (#200545)
 - Replace desktop file category 'Strategy' with 'StrategyGame'. (#198086)