Fri Dec 26 22:37:07 UTC 2008

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12083

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch 
Removed Files:
	pidgin-2.4.2-reread-resolvconf.patch 
	pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch 
	pidgin-2.5.2-NetworkManager-improvement.patch 
	pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch 
	pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch 
	pidgin-2.5.2-sametime-redirect-null.patch 
	pidgin-2.5.2-smilie-theme-change-crash.patch 
	pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch 
	pidgin-2.5.2-url_fetch_connect_cb-double-free.patch 
Log Message:
2.5.3


pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch:

--- NEW FILE pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch ---
This forces resolv.conf to be re-read every time a connection is made instead of only if NetworkManager establishes a new connection.
This prevents some error cases for roving clients, especially if they do not use NetworkManager.

diff -urN pidgin-2.5.3.orig/libpurple/connection.c pidgin-2.5.3/libpurple/connection.c
--- pidgin-2.5.3.orig/libpurple/connection.c	2008-12-20 19:38:16.000000000 -0500
+++ pidgin-2.5.3/libpurple/connection.c	2008-12-26 16:55:32.000000000 -0500
@@ -42,6 +42,10 @@
 
 #define KEEPALIVE_INTERVAL 30
 
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
 static GList *connections = NULL;
 static GList *connections_connecting = NULL;
 static PurpleConnectionUiOps *connection_ui_ops = NULL;
@@ -161,6 +165,9 @@
 
 	purple_signal_emit(purple_connections_get_handle(), "signing-on", gc);
 
+	/* Re-read resolv.conf and friends in case DNS servers have changed */
+	res_init();
+
 	if (regist)
 	{
 		purple_debug_info("connection", "Registering.  gc = %p\n", gc);
diff -urN pidgin-2.5.3.orig/libpurple/network.c pidgin-2.5.3/libpurple/network.c
--- pidgin-2.5.3.orig/libpurple/network.c	2008-12-20 19:38:16.000000000 -0500
+++ pidgin-2.5.3/libpurple/network.c	2008-12-26 16:55:32.000000000 -0500
@@ -633,8 +633,6 @@
 	switch(state)
 	{
 		case NM_STATE_CONNECTED:
-			/* Call res_init in case DNS servers have changed */
-			res_init();
 			if (ui_ops != NULL && ui_ops->network_connected != NULL)
 				ui_ops->network_connected();
 			break;


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- pidgin.spec	10 Dec 2008 04:52:20 -0000	1.63
+++ pidgin.spec	26 Dec 2008 22:36:36 -0000	1.64
@@ -61,8 +61,8 @@
 %endif
 
 Name:		pidgin
-Version:	2.5.2
-Release:	6%{?dist}
+Version:	2.5.3
+Release:	1%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -92,19 +92,10 @@
 
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0: pidgin-2.4.2-reread-resolvconf.patch
+Patch0: pidgin-NOT-UPSTREAM-2.5.3-reread-resolvconf.patch
 Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch100:      pidgin-2.5.2-sametime-redirect-null.patch
-Patch101:      pidgin-2.5.2-NetworkManager-improvement.patch
-Patch102:      pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch 
-Patch103:      pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch
-Patch104:      pidgin-2.5.2-smilie-theme-change-crash.patch
-Patch105:      pidgin-2.5.2-url_fetch_connect_cb-double-free.patch
-Patch106:      pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch
-Patch107:      pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch
-
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -344,14 +335,6 @@
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
-%patch100 -p1 -b sametime-redirect-null
-%patch101 -p1 -b NetworkManager-improvement
-%patch102 -p1 -b no-password-in-dialog-if-not-remembering
-%patch103 -p1 -b temporarily-remember-password-during-auto-reconnect
-%patch104 -p1 -b smilie-theme-change-crash
-%patch105 -p1 -b url_fetch_connect_cb-double-free
-%patch106 -p1 -b GtkIMHtmlSmileys-remove-crash
-%patch107 -p1 -b remove-dialog-from-open-dialog-list
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -578,6 +561,9 @@
 %endif
 
 %changelog
+* Fri Dec 26 2008 Warren Togami <wtogami at redhat.com> 2.5.3-1
+- 2.5.3
+
 * Sat Nov 22 2008 Warren Togami <wtogami at redhat.com> 2.5.2-6
 - Automatically detect booleans to enable build features from dist tag
 - Unify RHEL4 and RHEL5 spec with Fedora to make both easier to maintain


--- pidgin-2.4.2-reread-resolvconf.patch DELETED ---


--- pidgin-2.5.2-GtkIMHtmlSmileys-remove-crash.patch DELETED ---


--- pidgin-2.5.2-NetworkManager-improvement.patch DELETED ---


--- pidgin-2.5.2-no-password-in-dialog-if-not-remembering.patch DELETED ---


--- pidgin-2.5.2-remove-dialog-from-open-dialog-list.patch DELETED ---


--- pidgin-2.5.2-sametime-redirect-null.patch DELETED ---


--- pidgin-2.5.2-smilie-theme-change-crash.patch DELETED ---


--- pidgin-2.5.2-temporarily-remember-password-during-auto-reconnect.patch DELETED ---


--- pidgin-2.5.2-url_fetch_connect_cb-double-free.patch DELETED ---


