rpms/gaim/devel gaim-2.0.0beta5-cyrus-md5-crash.patch, NONE, 1.1 gaim-2.0.0beta5-debian-10_text-arrow-keys.patch, NONE, 1.1 gaim-2.0.0beta5-debian-11_reread-resolvconf.patch, NONE, 1.1 gaim.spec, 1.155, 1.156 gaim2-PIE.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 28 16:03:26 UTC 2006
Author: wtogami
Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10825
Modified Files:
gaim.spec
Added Files:
gaim-2.0.0beta5-cyrus-md5-crash.patch
gaim-2.0.0beta5-debian-10_text-arrow-keys.patch
gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
Removed Files:
gaim2-PIE.patch
Log Message:
- Debian patch 10_text-arrow-keys
- Debian patch 11_reread-resolvconf
- Jabber cyrus-sasl-md5 plugin crash (#217335 ari, kingant)
gaim-2.0.0beta5-cyrus-md5-crash.patch:
auth.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE gaim-2.0.0beta5-cyrus-md5-crash.patch ---
--- trunk/libgaim/protocols/jabber/auth.c 2006/11/28 06:37:12 17833
+++ trunk/libgaim/protocols/jabber/auth.c 2006/11/28 06:59:48 17834
@@ -753,7 +753,9 @@
* 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);
+ const char *c_out;
+ unsigned int clen;
+ js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, &c_out, &clen);
if (js->sasl_state != SASL_OK) {
/* This should never happen! */
gaim_connection_error(js->gc, _("Invalid response from server."));
gaim-2.0.0beta5-debian-10_text-arrow-keys.patch:
gntkeys.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
--- NEW FILE gaim-2.0.0beta5-debian-10_text-arrow-keys.patch ---
--- trunk/console/libgnt/gntkeys.c 2006/11/01 05:53:09 17646
+++ trunk/console/libgnt/gntkeys.c 2006/11/15 07:18:16 17750
@@ -3,17 +3,27 @@
#include <stdlib.h>
#include <string.h>
-const char *term;
+static const char *term;
void gnt_keys_refine(char *text)
{
+ if (term == NULL) {
+ term = getenv("TERM");
+ if (!term)
+ term = ""; /* Just in case */
+ }
+
if (*text == 27 && *(text + 1) == '[' && *(text + 3) == '\0' &&
(*(text + 2) >= 'A' || *(text + 2) <= 'D')) {
- if (term == NULL)
- term = getenv("TERM");
- /* Apparently this is necessary for urxvt and screen */
- if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0)
+ /* Apparently this is necessary for urxvt and screen and xterm */
+ if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0 ||
+ strcmp(term, "xterm") == 0)
*(text + 1) = 'O';
+ } else if (*(unsigned char*)text == 195) {
+ if (*(text + 2) == 0 && strcmp(term, "xterm") == 0) {
+ *(text) = 27;
+ *(text + 1) -= 64; /* Say wha? */
+ }
}
}
gaim-2.0.0beta5-debian-11_reread-resolvconf.patch:
connection.c | 7 +++++++
network.c | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
--- 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;
Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gaim.spec 26 Nov 2006 22:29:33 -0000 1.155
+++ gaim.spec 28 Nov 2006 16:03:24 -0000 1.156
@@ -54,7 +54,7 @@
## Patches 0-99: Fedora specific or upstream wont accept
-Patch5: gaim2-PIE.patch
+#Patch5: gaim2-PIE.patch
## Patches 100+: To be Included in Future Upstream
Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
@@ -64,8 +64,11 @@
Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch
Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch
Patch108: gaim-2.0.0beta5-debian-08_jabber-info-crash.patch
+Patch110: gaim-2.0.0beta5-debian-10_text-arrow-keys.patch
+Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
+Patch151: gaim-2.0.0beta5-cyrus-md5-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -178,8 +181,11 @@
%prep
%setup -q -n gaim-%{version}%{betaver}
## Patches 0-99: Fedora specific or upstream wont accept
-# PIE patch is broken, hoping for a better future proofed upstream solution
#%patch5 -p1
+# 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
+
## Patches 100+: To be Included in Future Upstream
%patch102 -p0
%patch103 -p1
@@ -188,8 +194,11 @@
%patch106 -p1
%patch107 -p1
%patch108 -p1
+%patch110 -p1
+%patch111 -p1
%patch150 -p1
+%patch151 -p1
# Relabel internal version for support purposes
sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -203,8 +212,6 @@
fi
-
-
%build
%if %{krb_integration}
WITH_KRB="--with-krb4"
@@ -236,8 +243,6 @@
WITH_GSTREAMER="--disable-gstreamer"
%endif
-
-
# FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
export CFLAGS="$RPM_OPT_FLAGS"
@@ -340,6 +345,11 @@
%{_libdir}/pkgconfig/gnt.pc
%changelog
+* Tue Nov 28 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.24.beta5
+- Debian patch 10_text-arrow-keys
+- Debian patch 11_reread-resolvconf
+- Jabber cyrus-sasl-md5 plugin crash (#217335 ari, kingant)
+
* Sun Nov 26 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.23.beta5
- Debian patch 08_jabber-info-crash
--- gaim2-PIE.patch DELETED ---
More information about the fedora-cvs-commits
mailing list