rpms/pidgin/F-12 .cvsignore, 1.34, 1.35 pidgin-2.6.2-crash-validate-jid.patch, 1.1, 1.2 pidgin.spec, 1.97, 1.98 sources, 1.34, 1.35 pidgin-2.6.2-aim-buddy-status-grab.patch, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22328

Modified Files:
	.cvsignore pidgin-2.6.2-crash-validate-jid.patch pidgin.spec 
	sources 
Removed Files:
	pidgin-2.6.2-aim-buddy-status-grab.patch 
Log Message:
2.6.3 CVE-2009-3615



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	6 Sep 2009 01:43:41 -0000	1.34
+++ .cvsignore	16 Oct 2009 20:10:47 -0000	1.35
@@ -1,2 +1 @@
-pidgin-2.6.2.tar.bz2
-pidgin-2.6.2.tar.bz2
+pidgin-2.6.3.tar.bz2

pidgin-2.6.2-crash-validate-jid.patch:
 protocols/jabber/jutil.c  |    7 +++----
 tests/test_jabber_jutil.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: pidgin-2.6.2-crash-validate-jid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin-2.6.2-crash-validate-jid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pidgin-2.6.2-crash-validate-jid.patch	9 Sep 2009 20:52:46 -0000	1.1
+++ pidgin-2.6.2-crash-validate-jid.patch	16 Oct 2009 20:10:47 -0000	1.2
@@ -2,12 +2,6 @@ http://developer.pidgin.im/ticket/10259
 http://developer.pidgin.im/viewmtn/revision/info/cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
 Fix a crash when attempting to validate a JID with an invalid resource.
 
-#
-#
-# patch "ChangeLog"
-#  from [959824a520d41286c4d89d8899a8e12b684e5ad8]
-#    to [6e78b15060f29fe30ae1b695f61248014b305d49]
-# 
 # patch "libpurple/protocols/jabber/jutil.c"
 #  from [9047c2dfd575de6ec516dd8377bce70df42d5063]
 #    to [603120abe6629d5e8f9e79d5198134bb252b0875]
@@ -17,19 +11,6 @@ Fix a crash when attempting to validate 
 #    to [42bdbb36f39b7d894d5f6f68e1b02f4c1ce4973a]
 #
 ============================================================
---- ChangeLog	959824a520d41286c4d89d8899a8e12b684e5ad8
-+++ ChangeLog	6e78b15060f29fe30ae1b695f61248014b305d49
-@@ -1,5 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
- Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
- 
-+version 2.6.3 (??/??/20??):
-+	XMPP:
-+	* Fix a crash when attempting to validate an invalid JID.
-+
- version 2.6.2 (09/05/2009):
- 	libpurple:
- 	* Fix --disable-avahi to actually disable it in configure, as opposed
-============================================================
 --- libpurple/protocols/jabber/jutil.c	9047c2dfd575de6ec516dd8377bce70df42d5063
 +++ libpurple/protocols/jabber/jutil.c	603120abe6629d5e8f9e79d5198134bb252b0875
 @@ -153,10 +153,9 @@ jabber_idn_validate(const char *str, con


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/pidgin.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- pidgin.spec	9 Sep 2009 20:52:46 -0000	1.97
+++ pidgin.spec	16 Oct 2009 20:10:47 -0000	1.98
@@ -81,8 +81,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.6.2
-Release:	2%{?dist}
+Version:	2.6.3
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -116,7 +116,6 @@ Source2:        one_time_password.c
 Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.6.2-aim-buddy-status-grab.patch
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
@@ -377,7 +376,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p0 -b .aim-buddy-status-grab
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
@@ -625,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
+- 2.6.3 CVE-2009-3615
+
 * Wed Sep 09 2009 Warren Togami <wtogami at redhat.com> 2.6.2-2
 - Upstream backports:
     97e003ed2bc2bafbb993693c9ae9c6d667731cc1 aim-buddy-status-grab


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	6 Sep 2009 01:43:41 -0000	1.34
+++ sources	16 Oct 2009 20:10:47 -0000	1.35
@@ -1,2 +1 @@
-306b6b60aefa9c5d5bffb08c576aa955  pidgin-2.6.1.tar.bz2
-a1bbb3c9be7d4ee1f53590d319cbfa72  pidgin-2.6.2.tar.bz2
+8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2


--- pidgin-2.6.2-aim-buddy-status-grab.patch DELETED ---