--- a/ChangeLog Thu Sep 24 14:10:04 2009 +0000
+++ b/ChangeLog Fri Oct 30 05:15:31 2009 +0000
@@ -1,3 +1,7 @@
+2009-10-30 Abhijit Nath <[email protected]>
+ * base-specs/pidgin.spec: Bump to 2.6.3 to fix CR #6893676
+ * Remove upstreamed patch pidgin-10-crash-when-no-proxy-setting.diff
+
2009-09-24 Hemantha Holla <[email protected]>
* SUNWgnome-im-client.spec: Update %files for 2.6.2
--- a/base-specs/pidgin.spec Thu Sep 24 14:10:04 2009 +0000
+++ b/base-specs/pidgin.spec Fri Oct 30 05:15:31 2009 +0000
@@ -11,7 +11,7 @@
#
%include l10n.inc
Name: pidgin
-Version: 2.6.2
+Version: 2.6.3
Release: 1
License: GPL
Group: Applications/Internet
@@ -44,8 +44,6 @@
# date:2009-09-03 owner:hawklu type:bug doo:10848
Patch9: pidgin-09-crash.diff
-# date:2009-09-03 owner:hawklu type:bug doo:11160 bugzilla:10242
-Patch10: pidgin-10-crash-when-no-proxy-setting.diff
URL: http://www.pidgin.im
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -95,7 +93,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
%build
%ifos linux
@@ -198,6 +195,10 @@
rm -r $RPM_BUILD_ROOT
%changelog
+* Fri Oct 30 2009 - [email protected]
+- Bump to 2.6.3 to include security fixes as fix for 6893676.
+- Remove upstreamed patch pidgin-10-crash-when-no-proxy-setting.diff
+
* Thu Sep 24 2009 - [email protected]
- Bump to 2.6.2 to include security fixes as fix for 6875021. Modifications are
pulled from spec-files-trunk (rev 19302) They are
--- a/patches/pidgin-10-crash-when-no-proxy-setting.diff Thu Sep 24 14:10:04 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- pidgin-2.6.1/libpurple/dnsquery.c.old 2009-09-03 18:40:02.593372000 +0800
-+++ pidgin-2.6.1/libpurple/dnsquery.c 2009-09-03 18:40:14.489648000 +0800
-@@ -956,11 +956,11 @@
- memset(&sin, 0, sizeof(struct sockaddr_in));
- memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
- sin.sin_family = hp->h_addrtype;
-+ g_free(hostname);
- } else
- sin.sin_family = AF_INET;
- sin.sin_port = htons(query_data->port);
-
-- g_free(hostname);
- hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
- hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));
-