Thu Mar 15 13:25:23 UTC 2007

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23145

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Added Files:
	gaim-2.0.0beta5-cyrus-sasl-crash.patch 
	gaim-2.0.0beta5-debian-11_reread-resolvconf.patch 
	gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch 
Removed Files:
	gaim-2.0.0beta5-debian-04_blist-memleak.patch 
	gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch 
	gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch 
	gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch 
	gaim-2.0.0beta5-silc-edit-account-crash.patch gaim2-PIE.patch 
Log Message:
Rebuild against latest beta6 package from core.  Fixes a segfault on startup


gaim-2.0.0beta5-cyrus-sasl-crash.patch:

--- NEW FILE gaim-2.0.0beta5-cyrus-sasl-crash.patch ---
http://svn.sourceforge.net/viewvc/gaim/trunk/libgaim/protocols/jabber/auth.c?r1=17894&r2=17325&view=patch
Revision 17894
Modified Mon Dec 4 12:52:18 2006 UTC (30 hours, 47 minutes ago) by faceprint
File length: 22396 byte(s)
Diff to previous 17867

hopefully fix the jabber crash people are seeing, and plug a small memory leak

Revision 17867
Modified Fri Dec 1 09:47:20 2006 UTC (4 days, 9 hours ago) by thekingant
File length: 22159 byte(s)
Diff to previous 17834 , to selected 17894

Get rid of some silly casting

Revision 17834
Modified Tue Nov 28 06:59:48 2006 UTC (7 days, 12 hours ago) by thekingant
File length: 22181 byte(s)
Diff to previous 17325 , to selected 17894

I don't think these parameters are allowed to be null... it looks like it
can cause crashes.  See Red Hat bug #217335.  Thanks to Nalin Dahyabhai for
pin pointing the cause of the crash.

http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217335

--- trunk/libgaim/protocols/jabber/auth.c	2006/09/19 23:46:17	17325
+++ trunk/libgaim/protocols/jabber/auth.c	2006/12/04 12:52:18	17894
@@ -716,6 +716,7 @@
 
 		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen,
 						  NULL, &c_out, &clen);
+		g_free(enc_in);
 		g_free(dec_in);
 		if (js->sasl_state != SASL_CONTINUE && js->sasl_state != SASL_OK) {
 			gaim_debug_error("jabber", "Error is %d : %s\n",js->sasl_state,sasl_errdetail(js->sasl));
@@ -740,7 +741,7 @@
 {
 	const char *ns = xmlnode_get_namespace(packet);
 #ifdef HAVE_CYRUS_SASL
-	int *x;
+	const int *x;
 #endif
 
 	if(!ns || strcmp(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
@@ -753,16 +754,29 @@
 	 * should try one more round against it
 	 */
 	if (js->sasl_state != SASL_OK) {
-		js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, NULL, NULL);
+		char *enc_in = xmlnode_get_data(packet);
+		unsigned char *dec_in = NULL;
+		const char *c_out;
+		unsigned int clen;
+		gsize declen = 0;
+
+		if(enc_in != NULL)
+			dec_in = gaim_base64_decode(enc_in, &declen);
+
+		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen, NULL, &c_out, &clen);
+
+		g_free(enc_in);
+		g_free(dec_in);
+
 		if (js->sasl_state != SASL_OK) {
 			/* This should never happen! */
 			gaim_connection_error(js->gc, _("Invalid response from server."));
 		}
 	}
 	/* If we've negotiated a security layer, we need to enable it */
-	sasl_getprop(js->sasl, SASL_SSF, (const void **)&x);
-	if (*x>0) {
-		sasl_getprop(js->sasl, SASL_MAXOUTBUF, (const void **)&x);
+	sasl_getprop(js->sasl, SASL_SSF, &x);
+	if (*x > 0) {
+		sasl_getprop(js->sasl, SASL_MAXOUTBUF, &x);
 		js->sasl_maxbuf = *x;
 	}
 #endif

gaim-2.0.0beta5-debian-11_reread-resolvconf.patch:

--- NEW FILE gaim-2.0.0beta5-debian-11_reread-resolvconf.patch ---
diff -ur gaim-2.0.0+beta5.orig/libgaim/connection.c gaim-2.0.0+beta5/libgaim/connection.c
--- gaim-2.0.0+beta5.orig/libgaim/connection.c	2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/connection.c	2006-11-28 00:24:00.000000000 -0500
@@ -37,6 +37,10 @@
 #include "signals.h"
 #include "util.h"
 
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
 static GList *connections = NULL;
 static GList *connections_connecting = NULL;
 static GaimConnectionUiOps *connection_ui_ops = NULL;
@@ -139,6 +139,9 @@
 
 	gaim_signal_emit(gaim_connections_get_handle(), "signing-on", gc);
 
+	/* Re-read resolv.conf and friends in case DNS servers have changed */
+	res_init();
+
 	if (regist)
 	{
 		gaim_debug_info("connection", "Registering.  gc = %p\n", gc);
diff -ur gaim-2.0.0+beta5.orig/libgaim/network.c gaim-2.0.0+beta5/libgaim/network.c
--- gaim-2.0.0+beta5.orig/libgaim/network.c	2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/network.c	2006-11-28 00:24:15.000000000 -0500
@@ -558,8 +558,6 @@
 	switch(current)
 	{
 	case LIBNM_ACTIVE_NETWORK_CONNECTION:
-		/* Call res_init in case DNS servers have changed */
-		res_init();
 		if (ui_ops != NULL && ui_ops->network_connected != NULL)
 			ui_ops->network_connected();
 		prev = current;

gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch:

--- NEW FILE gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch ---
When Yahoo auth fails, or user types incorrect password, it falls back to webauth.
Webauth is now broken.  Gaim gets stuck in yahoo authentication, causing user confusion.

This patch is not upstream, because they want to look into fixing webauth instead of disabling this.
We need a more stable client now, thus using this as a temporary workaround.

diff -ur gaim-2.0.0+beta5.orig/libgaim/protocols/yahoo/yahoo.c gaim-2.0.0+beta5/libgaim/protocols/yahoo/yahoo.c
--- gaim-2.0.0+beta5.orig/libgaim/protocols/yahoo/yahoo.c	2006-12-11 12:17:48.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/protocols/yahoo/yahoo.c	2006-12-11 12:39:04.000000000 -0500
@@ -1905,6 +1905,7 @@
 		msg = g_strdup(_("Invalid username."));
 		break;
 	case 13:
+#if 0
 		if (!yd->wm) {
 			GaimUtilFetchUrlData *url_data;
 			yd->wm = TRUE;
@@ -1925,6 +1926,7 @@
 			                      "in reduced functionality and features."));
 			return;
 		}
+#endif
 		msg = g_strdup(_("Incorrect password."));
 		break;
 	case 14:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Nov 2006 19:53:35 -0000	1.11
+++ .cvsignore	15 Mar 2007 13:24:50 -0000	1.12
@@ -1 +1 @@
-gaim-2.0.0beta5.tar.bz2
+gaim-2.0.0beta6.tar.bz2


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gaim-meanwhile.spec	26 Nov 2006 19:53:35 -0000	1.17
+++ gaim-meanwhile.spec	15 Mar 2007 13:24:50 -0000	1.18
@@ -10,24 +10,30 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
-# OPTION: Mono integration (FC5+)
-%define mono_integration	0
 # OPTION: dbus integration (FC5+)
 %define dbus_integration	1
+# OPTION: gstreamer integration (FC5+)
+%define gstreamer_integration	1
+# OPTION: NetworkManager integration (FC5+)
+%define nm_integration	        1
+# OPTION: Modular X (FC5+)
+%define modular_x               1
+# OPTION: dbus-glib split (FC6+)
+%define dbus_glib_splt		1
 
+# OPTION: Mono integration (FC5+, broken)
+%define mono_integration	0
 # OPTION: Howl integration (seems broken)
 %define howl_integration	0
-# OPTION: gadugadu integration (not shipped in core)
-%define gadugadu_integration	0
 # OPTION: Meanwhile integration (not shipped in core)
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta5
+%define betaver	beta6
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.5.%{betaver}%{?dist}
+Release:	0.6.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -48,19 +54,16 @@
 # - Smiley Theme "Default"
 Source1:	gaim-fedora-prefs.xml
 
+
 ## Patches 0-99: Fedora specific or upstream wont accept
-# to be replaced by upstream fix
-Patch5:		gaim2-PIE.patch
+#Patch5:  gaim2-PIE.patch
+# Tempory Hack: disable yahoo web auth fallback
+Patch6:   gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch
 
 ## Patches 100+: To be Included in Future Upstream
 Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
 Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
-Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch
-Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch
-Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
-Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
-
-Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -73,14 +76,18 @@
 Requires:       glib2 >= %{glib_ver}
 
 # Basic Library Requirements
-BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
+BuildRequires:  autoconf
+BuildRequires:	startup-notification-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
 BuildRequires:  gettext
-BuildRequires:  libXScrnSaver-devel
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
+BuildRequires:  ncurses-devel
+
+# Bug #212817 Jabber needs cyrus-sasl plugins for authentication
+Requires: cyrus-sasl-plain, cyrus-sasl-md5
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -104,15 +111,36 @@
 %if %{silc_integration}
 BuildRequires:	libsilc-devel
 %endif
-# Mono integration (FC5+)
-%if %{mono_integration}
-BuildRequires:	mono-devel
-%endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
-BuildRequires:	dbus-devel >= 0.35
+BuildRequires:  dbus-devel >= 0.60
+BuildRequires:  python     >= 2.4
+%endif
+# GStreamer integration (FC5+)
+%if %{gstreamer_integration}
+BuildRequires:	gstreamer-devel >= 0.10
+%endif
+# NetworkManager integration (FC5+)
+%if %{nm_integration}
+%ifnarch s390 s390x
+# No NetworkManager on s390/s390x
+BuildRequires:	NetworkManager-glib-devel
+%endif
+%endif
+# Modular X (FC5+)
+%if %{modular_x}
+BuildRequires:  libSM-devel
+BuildRequires:  libXScrnSaver-devel
+%endif
+# DBus GLIB Split (FC6+)
+%if %{dbus_glib_splt}
+BuildRequires:  dbus-glib-devel >= 0.70
 %endif
 
+# Mono integration (FC5+, broken)
+%if %{mono_integration}
+BuildRequires:	mono-devel
+%endif
 # Howl integration (seems to be broken)
 %if %{howl_integration}
 BuildRequires:	avahi-devel
@@ -121,26 +149,25 @@
 %if %{meanwhile_integration}
 BuildRequires:	meanwhile-devel
 %endif
-# Gadugadu integration (not shipped in core)
-%if %{gadugadu_integration}
-BuildRequires:	ekg-devel
-%endif
+
 
 %description
 Gaim protocol library to use the meanwhile Lotus Sametime library
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
+## Patches 0-99: Fedora specific or upstream wont accept
+# Considering not doing PIE anymore in the future, as it seems not necessary
+# given all of the other precautions used to build gaim in Fedora.
+# See Bug #133680 for more information about PIE difficulties
 #%patch5 -p1
+# Temporary Hack: disable yahoo webauth fallback
+%patch6 -p1
+
 ## Patches 100+: To be Included in Future Upstream
 %patch102 -p0
 %patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-
-%patch150 -p1
+%patch111 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -154,8 +181,6 @@
 fi
 
 
-
-
 %build
 %if %{krb_integration}
 	WITH_KRB="--with-krb4"
@@ -181,6 +206,11 @@
 %else
 	WITH_DBUS="--disable-dbus"
 %endif
+%if %{gstreamer_integration}
+	WITH_GSTREAMER="--enable-gstreamer"
+%else
+	WITH_GSTREAMER="--disable-gstreamer"
+%endif
 
 
 # FC5+ automatic -fstack-protector-all switch
@@ -192,7 +222,7 @@
 %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes \
            --enable-cyrus-sasl \
 	   $WITH_KRB $WITH_SILC $WITH_PERL $WITH_HOWL $WITH_MONO \
-	   $WITH_SASL $WITH_DBUS
+	   $WITH_SASL $WITH_DBUS $WITH_GSTREAMER
 # smp_mflags breaks the mono plugin
 make
 
@@ -212,6 +242,7 @@
 rm -rf $RPM_BUILD_ROOT%{_bindir}
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgaim*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnt*
 rm -rf $RPM_BUILD_ROOT%{_libdir}/perl5
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/bin
@@ -229,7 +260,7 @@
 
 # preserve the libsametime libraries and delete the rest
 mv $RPM_BUILD_ROOT%{_libdir}/gaim/libsametime.so $RPM_BUILD_ROOT%{_libdir}/gaim/sametime.tmp
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/*.so*
 mv $RPM_BUILD_ROOT%{_libdir}/gaim/sametime.tmp $RPM_BUILD_ROOT%{_libdir}/gaim/libsametime.so
 
 
@@ -271,6 +302,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Wed Mar 14 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.6.beta6
+- Rebuidl against most recent core package
+
 * Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
 - Rebuild against most recent core package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Nov 2006 19:53:35 -0000	1.11
+++ sources	15 Mar 2007 13:24:50 -0000	1.12
@@ -1 +1 @@
-84099216123de25402fa7e904ceca437  gaim-2.0.0beta5.tar.bz2
+404dcec261f911bcb56f69e5ea192583  gaim-2.0.0beta6.tar.bz2


--- gaim-2.0.0beta5-debian-04_blist-memleak.patch DELETED ---


--- gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch DELETED ---


--- gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch DELETED ---


--- gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch DELETED ---


--- gaim-2.0.0beta5-silc-edit-account-crash.patch DELETED ---


--- gaim2-PIE.patch DELETED ---


