rpms/gaim/devel .cvsignore, 1.32, 1.33 gaim-desktop.patch, 1.13, 1.14 gaim.spec, 1.95, 1.96 sources, 1.32, 1.33 gaim-1.4.0-aim-login.crash.patch, 1.1, NONE gaim-1.4.0-gadugadu-memory-alignment.patch, 1.1, NONE gaim-1.4.0-mailto-parse-crash-msn.patch, 1.1, NONE gaim-1.4.0-mailto-parse-crash-util.c.patch, 1.1, NONE gaim-1.4.0-mailto-parse-crash-zephyr.patch, 1.1, NONE gaim-1.4.0-msn-email-corrupt.patch, 1.1, NONE gaim-1.4.0-rename-group-merge-crash.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25217

Modified Files:
	.cvsignore gaim-desktop.patch gaim.spec sources 
Removed Files:
	gaim-1.4.0-aim-login.crash.patch 
	gaim-1.4.0-gadugadu-memory-alignment.patch 
	gaim-1.4.0-mailto-parse-crash-msn.patch 
	gaim-1.4.0-mailto-parse-crash-util.c.patch 
	gaim-1.4.0-mailto-parse-crash-zephyr.patch 
	gaim-1.4.0-msn-email-corrupt.patch 
	gaim-1.4.0-rename-group-merge-crash.patch 
Log Message:
- 1.5.0 security and bug fixes
  CAN-2005-2370 Gadu-Gadu memory alignment bug
  CAN-2005-2102 AIM/ICQ non-UTF-8 Filename Crash
  CAN-2005-2103 AIM/ICQ away message buffer overflow



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	8 Jul 2005 04:34:40 -0000	1.32
+++ .cvsignore	12 Aug 2005 04:36:10 -0000	1.33
@@ -1 +1 @@
-gaim-1.4.0.tar.bz2
+gaim-1.5.0.tar.bz2

gaim-desktop.patch:
 gaim.desktop |   52 +++-------------------------------------------------
 1 files changed, 3 insertions(+), 49 deletions(-)

Index: gaim-desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim-desktop.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gaim-desktop.patch	8 Jul 2005 04:34:40 -0000	1.13
+++ gaim-desktop.patch	12 Aug 2005 04:36:13 -0000	1.14
@@ -1,7 +1,7 @@
-diff -urN gaim-1.4.0.old/gaim.desktop gaim-1.4.0/gaim.desktop
---- gaim-1.4.0.old/gaim.desktop	2005-07-07 05:27:22.000000000 -1000
-+++ gaim-1.4.0/gaim.desktop	2005-07-07 18:27:28.000000000 -1000
-@@ -1,58 +1,14 @@
+diff -urN gaim-1.5.0.orig/gaim.desktop gaim-1.5.0/gaim.desktop
+--- gaim-1.5.0.orig/gaim.desktop	2005-07-10 15:50:53.000000000 -0400
++++ gaim-1.5.0/gaim.desktop	2005-08-12 00:34:14.000000000 -0400
+@@ -1,60 +1,14 @@
  [Desktop Entry]
  Encoding=UTF-8
 -Categories=Application;Network;
@@ -31,6 +31,7 @@
 -Name[pt_BR]=Mensageiro via Internet Gaim
 -Name[pt]=Mensageiro Internet Gaim
 -Name[ro]=Mesagerul Gaim
+-Name[ru]=Gaim - клиент обмена мгновенными сообщениями
 -Name[sl]=Gaim - spletni sel
 -Name[sq]=Lajmësjellësi Internet Gaim
 -Name[sv]=Gaim Internet Messenger
@@ -54,6 +55,7 @@
 -GenericName[pt_BR]=Mensageiro via Internet
 -GenericName[pt]=Mensageiro Internet
 -GenericName[ro]=Client de mesagerie
+-GenericName[ru]=Клиент обмена мгновенными сообщениями
 -GenericName[sl]=Spletni sel
 -GenericName[sq]=Lajmësjellës Internet
 -GenericName[sv]=Meddelandeklient


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gaim.spec	9 Aug 2005 22:33:46 -0000	1.95
+++ gaim.spec	12 Aug 2005 04:36:13 -0000	1.96
@@ -12,8 +12,8 @@
 %define silc_integration	1
 
 Name:		gaim
-Version:	1.4.0
-Release:	7.fc5
+Version:	1.5.0
+Release:	1.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -43,15 +43,7 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-Patch148:       gaim-1.4.0-aim-login.crash.patch
-#Patch149:       gaim-1.4.0-msn-space-username-disconnect.patch
-#150 supercedes 149 with the better upstream fix
-Patch150: gaim-1.4.0-msn-email-corrupt.patch
-Patch151: gaim-1.4.0-gadugadu-memory-alignment.patch
-Patch152: gaim-1.4.0-rename-group-merge-crash.patch
-Patch153: gaim-1.4.0-mailto-parse-crash-util.c.patch
-Patch154: gaim-1.4.0-mailto-parse-crash-msn.patch
-Patch155: gaim-1.4.0-mailto-parse-crash-zephyr.patch
+#Patch155: gaim-1.4.0-mailto-parse-crash-zephyr.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -117,14 +109,7 @@
 %patch6 -p1
 
 # CVS backports go here
-%patch148 -p2
-#%patch149 -p2 superceded by 150, upstream rewrote the fix
-%patch150 -p2
-%patch151 -p2
-%patch152 -p2
-%patch153 -p2
-%patch154 -p2
-%patch155 -p2
+#%patch155 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -222,6 +207,12 @@
 %endif
 
 %changelog
+* Thu Aug 11 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-1
+- 1.5.0 security and bug fixes
+  CAN-2005-2370 Gadu-Gadu memory alignment bug
+  CAN-2005-2102 AIM/ICQ non-UTF-8 Filename Crash
+  CAN-2005-2103 AIM/ICQ away message buffer overflow
+
 * Tue Aug  9 2005 Jeremy Katz <katzj at redhat.com> - 1:1.4.0-7
 - rebuild for new evolution-data-server
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	8 Jul 2005 04:34:40 -0000	1.32
+++ sources	12 Aug 2005 04:36:13 -0000	1.33
@@ -1 +1 @@
-d7717cb771e556012ecd5b7f3bdb02ba  gaim-1.4.0.tar.bz2
+9205321ac11fad271c90f2f0d7c5e7ce  gaim-1.5.0.tar.bz2


--- gaim-1.4.0-aim-login.crash.patch DELETED ---


--- gaim-1.4.0-gadugadu-memory-alignment.patch DELETED ---


--- gaim-1.4.0-mailto-parse-crash-msn.patch DELETED ---


--- gaim-1.4.0-mailto-parse-crash-util.c.patch DELETED ---


--- gaim-1.4.0-mailto-parse-crash-zephyr.patch DELETED ---


--- gaim-1.4.0-msn-email-corrupt.patch DELETED ---


--- gaim-1.4.0-rename-group-merge-crash.patch DELETED ---