upgrade to gaim 0.77
This commit is contained in:
parent
1f4d6d2e3b
commit
b9cd2b8aaa
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.58 2004/04/13 01:34:57 jolan Exp $
|
||||
# $OpenBSD: Makefile,v 1.59 2004/04/24 08:04:13 brad Exp $
|
||||
|
||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||
|
||||
DISTNAME= gaim-0.75
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
DISTNAME= gaim-0.77
|
||||
CATEGORIES= net
|
||||
|
||||
# GPL
|
||||
@ -27,7 +26,8 @@ BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= --disable-gnutls \
|
||||
CONFIGURE_ARGS+= --disable-gevolution \
|
||||
--disable-gnutls \
|
||||
--disable-nas \
|
||||
--disable-nss \
|
||||
--disable-perl \
|
||||
|
@ -1,6 +1,3 @@
|
||||
MD5 (gaim-0.74-openssl.patch.gz) = 7d766e388cd1bacd661adca1bd5fb54f
|
||||
MD5 (gaim-0.75.tar.gz) = d0164327233a6ce2ec1eab887ccbb59d
|
||||
RMD160 (gaim-0.74-openssl.patch.gz) = 48b0a2ee7abfce5da0c76a79f64010554a8b2d49
|
||||
RMD160 (gaim-0.75.tar.gz) = a26e1418d5cadaccf378c6973dffc3c058fef9ce
|
||||
SHA1 (gaim-0.74-openssl.patch.gz) = 230ce6408cf6a11c6dd38b8fcb7f3ec7dd58ec86
|
||||
SHA1 (gaim-0.75.tar.gz) = dfb474edeb4e6d697c18f65e3a74ca56b7fcdcde
|
||||
MD5 (gaim-0.77.tar.gz) = f0b00df491c5865557032367b3f2ac17
|
||||
RMD160 (gaim-0.77.tar.gz) = d8bdd7550025794d0f49095b4e1a29ed6e029eeb
|
||||
SHA1 (gaim-0.77.tar.gz) = 74141af612da8a5bbb316885dba7e03567588dbd
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ssl-openssl.c,v 1.4 2004/01/22 08:59:32 brad Exp $ */
|
||||
/* $OpenBSD: ssl-openssl.c,v 1.5 2004/04/24 08:04:13 brad Exp $ */
|
||||
|
||||
/*
|
||||
* OpenSSL SSL-plugin for gaim
|
||||
@ -275,7 +275,7 @@ static gboolean plugin_unload(GaimPlugin *plugin)
|
||||
|
||||
static GaimPluginInfo info =
|
||||
{
|
||||
2, /* api_version */
|
||||
GAIM_PLUGIN_API_VERSION, /* api_version */
|
||||
GAIM_PLUGIN_STANDARD, /* type */
|
||||
NULL, /* ui_requirement */
|
||||
GAIM_PLUGIN_FLAG_INVISIBLE, /* flags */
|
||||
|
@ -1,24 +1,24 @@
|
||||
$OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
--- configure.orig 2004-01-10 01:10:04.000000000 -0500
|
||||
+++ configure 2004-01-17 14:45:46.000000000 -0500
|
||||
@@ -467,7 +467,7 @@ ac_includes_default="\
|
||||
$OpenBSD: patch-configure,v 1.11 2004/04/24 08:04:13 brad Exp $
|
||||
--- configure.orig 2004-04-22 21:36:00.000000000 -0400
|
||||
+++ configure 2004-04-23 04:02:38.000000000 -0400
|
||||
@@ -468,7 +468,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS DISTRIB_TRUE DISTRIB_FALSE STATIC_PRPLS STATIC_GG_TRUE STATIC_GG_FALSE STATIC_IRC_TRUE STATIC_IRC_FALSE STATIC_JABBER_TRUE STATIC_JABBER_FALSE STATIC_MSN_TRUE STATIC_MSN_FALSE STATIC_NAPSTER_TRUE STATIC_NAPSTER_FALSE STATIC_OSCAR_TRUE STATIC_OSCAR_FALSE STATIC_TOC_TRUE STATIC_TOC_FALSE STATIC_TREPIA_TRUE STATIC_TREPIA_FALSE STATIC_YAHOO_TRUE STATIC_YAHOO_FALSE STATIC_ZEPHYR_TRUE STATIC_ZEPHYR_FALSE STATIC_LINK_LIBS DYNAMIC_PRPLS DYNAMIC_GG_TRUE DYNAMIC_GG_FALSE DYNAMIC_IRC_TRUE DYNAMIC_IRC_FALSE DYNAMIC_JABBER_TRUE DYNAMIC_JABBER_FALSE DYNAMIC_MSN_TRUE DYNAMIC_MSN_FALSE DYNAMIC_NAPSTER_TRUE DYNAMIC_NAPSTER_FALSE DYNAMIC_OSCAR_TRUE DYNAMIC_OSCAR_FALSE DYNAMIC_TOC_TRUE DYNAMIC_TOC_FALSE DYNAMIC_TREPIA_TRUE DYNAMIC_TREPIA_FALSE DYNAMIC_YAHOO_TRUE DYNAMIC_YAHOO_FALSE DYNAMIC_ZEPHYR_TRUE DYNAMIC_ZEPHYR_FALSE PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS GTK_CFLAGS GTK_LIBS gaimpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS STARTUP_NOTIFICATION_CFLAGS STARTUP_NOTIFICATION_LIBS XSS_LIBS SM_LIBS perlpath PERL USE_PERL_TRUE USE_PERL_FALSE PERL_CFLAGS PERL_LIBS PERL_MM_PARAMS DYNALOADER_A LIBPERL_A GNUTLS_CFLAGS GNUTLS_LIBS USE_GNUTLS_TRUE USE_GNUTLS_FALSE NSS_CFLAGS NSS_LIBS USE_NSS_TRUE USE_NSS_FALSE USE_TCL_TRUE USE_TCL_FALSE TCL_LIBS TCL_CFLAGS USE_TK_TRUE USE_TK_FALSE TK_LIBS GTKSPELL_CFLAGS GTKSPELL_LIBS AO_CFLAGS AO_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS SOUND_LIBS DEBUG_CFLAGS LDADD PLUGINS_TRUE PLUGINS_FALSE PRPLS_TRUE PRPLS_FALSE KRB4_CFLAGS KRB4_LDFLAGS KRB4_LIBS LTLIBOBJS'
|
||||
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS DISTRIB_TRUE DISTRIB_FALSE STATIC_PRPLS STATIC_GG_TRUE STATIC_GG_FALSE STATIC_IRC_TRUE STATIC_IRC_FALSE STATIC_JABBER_TRUE STATIC_JABBER_FALSE STATIC_MSN_TRUE STATIC_MSN_FALSE STATIC_NAPSTER_TRUE STATIC_NAPSTER_FALSE STATIC_OSCAR_TRUE STATIC_OSCAR_FALSE STATIC_TOC_TRUE STATIC_TOC_FALSE STATIC_TREPIA_TRUE STATIC_TREPIA_FALSE STATIC_YAHOO_TRUE STATIC_YAHOO_FALSE STATIC_ZEPHYR_TRUE STATIC_ZEPHYR_FALSE STATIC_LINK_LIBS DYNAMIC_PRPLS DYNAMIC_GG_TRUE DYNAMIC_GG_FALSE DYNAMIC_IRC_TRUE DYNAMIC_IRC_FALSE DYNAMIC_JABBER_TRUE DYNAMIC_JABBER_FALSE DYNAMIC_MSN_TRUE DYNAMIC_MSN_FALSE DYNAMIC_NAPSTER_TRUE DYNAMIC_NAPSTER_FALSE DYNAMIC_OSCAR_TRUE DYNAMIC_OSCAR_FALSE DYNAMIC_TOC_TRUE DYNAMIC_TOC_FALSE DYNAMIC_TREPIA_TRUE DYNAMIC_TREPIA_FALSE DYNAMIC_YAHOO_TRUE DYNAMIC_YAHOO_FALSE DYNAMIC_ZEPHYR_TRUE DYNAMIC_ZEPHYR_FALSE PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS GTK_CFLAGS GTK_LIBS gaimpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS STARTUP_NOTIFICATION_CFLAGS STARTUP_NOTIFICATION_LIBS XSS_LIBS SM_LIBS perlpath PERL USE_PERL_TRUE USE_PERL_FALSE PERL_CFLAGS PERL_LIBS PERL_MM_PARAMS DYNALOADER_A LIBPERL_A OPENSSL_CFLAGS OPENSSL_LIBS USE_OPENSSL_TRUE USE_OPENSSL_FALSE GNUTLS_CFLAGS GNUTLS_LIBS USE_GNUTLS_TRUE USE_GNUTLS_FALSE NSS_CFLAGS NSS_LIBS USE_NSS_TRUE USE_NSS_FALSE USE_TCL_TRUE USE_TCL_FALSE TCL_LIBS TCL_CFLAGS USE_TK_TRUE USE_TK_FALSE TK_LIBS GTKSPELL_CFLAGS GTKSPELL_LIBS AO_CFLAGS AO_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS SOUND_LIBS DEBUG_CFLAGS LDADD PLUGINS_TRUE PLUGINS_FALSE PRPLS_TRUE PRPLS_FALSE KRB4_CFLAGS KRB4_LDFLAGS KRB4_LIBS LTLIBOBJS'
|
||||
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS DISTRIB_TRUE DISTRIB_FALSE STATIC_PRPLS STATIC_GG_TRUE STATIC_GG_FALSE STATIC_IRC_TRUE STATIC_IRC_FALSE STATIC_JABBER_TRUE STATIC_JABBER_FALSE STATIC_MSN_TRUE STATIC_MSN_FALSE STATIC_NAPSTER_TRUE STATIC_NAPSTER_FALSE STATIC_NOVELL_TRUE STATIC_NOVELL_FALSE STATIC_OSCAR_TRUE STATIC_OSCAR_FALSE STATIC_RENDEZVOUS_TRUE STATIC_RENDEZVOUS_FALSE STATIC_TOC_TRUE STATIC_TOC_FALSE STATIC_TREPIA_TRUE STATIC_TREPIA_FALSE STATIC_YAHOO_TRUE STATIC_YAHOO_FALSE STATIC_ZEPHYR_TRUE STATIC_ZEPHYR_FALSE STATIC_LINK_LIBS DYNAMIC_PRPLS DYNAMIC_GG_TRUE DYNAMIC_GG_FALSE DYNAMIC_IRC_TRUE DYNAMIC_IRC_FALSE DYNAMIC_JABBER_TRUE DYNAMIC_JABBER_FALSE DYNAMIC_MSN_TRUE DYNAMIC_MSN_FALSE DYNAMIC_NAPSTER_TRUE DYNAMIC_NAPSTER_FALSE DYNAMIC_NOVELL_TRUE DYNAMIC_NOVELL_FALSE DYNAMIC_OSCAR_TRUE DYNAMIC_OSCAR_FALSE DYNAMIC_RENDEZVOUS_TRUE DYNAMIC_RENDEZVOUS_FALSE DYNAMIC_TOC_TRUE DYNAMIC_TOC_FALSE DYNAMIC_TREPIA_TRUE DYNAMIC_TREPIA_FALSE DYNAMIC_YAHOO_TRUE DYNAMIC_YAHOO_FALSE DYNAMIC_ZEPHYR_TRUE DYNAMIC_ZEPHYR_FALSE EXTERNAL_LIBZEPHYR_TRUE EXTERNAL_LIBZEPHYR_FALSE PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS GTK_CFLAGS GTK_LIBS gaimpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS STARTUP_NOTIFICATION_CFLAGS STARTUP_NOTIFICATION_LIBS EVOLUTION_ADDRESSBOOK_CFLAGS EVOLUTION_ADDRESSBOOK_LIBS BUILD_GEVOLUTION_TRUE BUILD_GEVOLUTION_FALSE XSS_LIBS SM_LIBS perlpath PERL USE_PERL_TRUE USE_PERL_FALSE PERL_CFLAGS PERL_LIBS PERL_MM_PARAMS DYNALOADER_A LIBPERL_A GNUTLS_CFLAGS GNUTLS_LIBS USE_GNUTLS_TRUE USE_GNUTLS_FALSE NSS_CFLAGS NSS_LIBS USE_NSS_TRUE USE_NSS_FALSE USE_TCL_TRUE USE_TCL_FALSE TCL_LIBS TCL_CFLAGS USE_TK_TRUE USE_TK_FALSE TK_LIBS GTKSPELL_CFLAGS GTKSPELL_LIBS AO_CFLAGS AO_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS SOUND_LIBS DEBUG_CFLAGS LDADD PLUGINS_TRUE PLUGINS_FALSE PRPLS_TRUE PRPLS_FALSE KRB4_CFLAGS KRB4_LDFLAGS KRB4_LIBS ZEPHYR_CFLAGS ZEPHYR_LDFLAGS ZEPHYR_LIBS LTLIBOBJS'
|
||||
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS DISTRIB_TRUE DISTRIB_FALSE STATIC_PRPLS STATIC_GG_TRUE STATIC_GG_FALSE STATIC_IRC_TRUE STATIC_IRC_FALSE STATIC_JABBER_TRUE STATIC_JABBER_FALSE STATIC_MSN_TRUE STATIC_MSN_FALSE STATIC_NAPSTER_TRUE STATIC_NAPSTER_FALSE STATIC_NOVELL_TRUE STATIC_NOVELL_FALSE STATIC_OSCAR_TRUE STATIC_OSCAR_FALSE STATIC_RENDEZVOUS_TRUE STATIC_RENDEZVOUS_FALSE STATIC_TOC_TRUE STATIC_TOC_FALSE STATIC_TREPIA_TRUE STATIC_TREPIA_FALSE STATIC_YAHOO_TRUE STATIC_YAHOO_FALSE STATIC_ZEPHYR_TRUE STATIC_ZEPHYR_FALSE STATIC_LINK_LIBS DYNAMIC_PRPLS DYNAMIC_GG_TRUE DYNAMIC_GG_FALSE DYNAMIC_IRC_TRUE DYNAMIC_IRC_FALSE DYNAMIC_JABBER_TRUE DYNAMIC_JABBER_FALSE DYNAMIC_MSN_TRUE DYNAMIC_MSN_FALSE DYNAMIC_NAPSTER_TRUE DYNAMIC_NAPSTER_FALSE DYNAMIC_NOVELL_TRUE DYNAMIC_NOVELL_FALSE DYNAMIC_OSCAR_TRUE DYNAMIC_OSCAR_FALSE DYNAMIC_RENDEZVOUS_TRUE DYNAMIC_RENDEZVOUS_FALSE DYNAMIC_TOC_TRUE DYNAMIC_TOC_FALSE DYNAMIC_TREPIA_TRUE DYNAMIC_TREPIA_FALSE DYNAMIC_YAHOO_TRUE DYNAMIC_YAHOO_FALSE DYNAMIC_ZEPHYR_TRUE DYNAMIC_ZEPHYR_FALSE EXTERNAL_LIBZEPHYR_TRUE EXTERNAL_LIBZEPHYR_FALSE PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS GTK_CFLAGS GTK_LIBS gaimpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS STARTUP_NOTIFICATION_CFLAGS STARTUP_NOTIFICATION_LIBS EVOLUTION_ADDRESSBOOK_CFLAGS EVOLUTION_ADDRESSBOOK_LIBS BUILD_GEVOLUTION_TRUE BUILD_GEVOLUTION_FALSE XSS_LIBS SM_LIBS perlpath PERL USE_PERL_TRUE USE_PERL_FALSE PERL_CFLAGS PERL_LIBS PERL_MM_PARAMS DYNALOADER_A LIBPERL_A OPENSSL_CFLAGS OPENSSL_LIBS USE_OPENSSL_TRUE USE_OPENSSL_FALSE GNUTLS_CFLAGS GNUTLS_LIBS USE_GNUTLS_TRUE USE_GNUTLS_FALSE NSS_CFLAGS NSS_LIBS USE_NSS_TRUE USE_NSS_FALSE USE_TCL_TRUE USE_TCL_FALSE TCL_LIBS TCL_CFLAGS USE_TK_TRUE USE_TK_FALSE TK_LIBS GTKSPELL_CFLAGS GTKSPELL_LIBS AO_CFLAGS AO_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS SOUND_LIBS DEBUG_CFLAGS LDADD PLUGINS_TRUE PLUGINS_FALSE PRPLS_TRUE PRPLS_FALSE KRB4_CFLAGS KRB4_LDFLAGS KRB4_LIBS ZEPHYR_CFLAGS ZEPHYR_LDFLAGS ZEPHYR_LIBS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -1033,6 +1033,7 @@ Optional Features:
|
||||
--disable-sm compile without X session management support
|
||||
--disable-glibtest do not try to compile and run a test GLIB program
|
||||
@@ -1039,6 +1039,7 @@ Optional Features:
|
||||
--disable-gtktest do not try to compile and run a test GTK+ program
|
||||
--disable-startup-notification compile without startup notification support
|
||||
--disable-gevolution compile without the Gaim-Evolution plugin
|
||||
+ --enable-openssl=yes,no Attempt to use OpenSSL for SSL support (preferred) default=yes
|
||||
--enable-gnutls=yes,no Attempt to use GNUTLS for SSL support (preferred) default=yes
|
||||
--enable-nss=yes,no,static Attempt to use Mozilla libnss for SSL support default=yes
|
||||
--disable-aotest Do not try to compile and run a test ao program
|
||||
@@ -1056,6 +1057,8 @@ Optional Packages:
|
||||
@@ -1063,6 +1064,8 @@ Optional Packages:
|
||||
--with-x use the X Window System
|
||||
--with-perl-lib=site|vendor|DIR Specify where to install the
|
||||
Perl libraries for gaim. Default is site.
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
--with-gnutls-includes=PREFIX Location of GNUTLS includes.
|
||||
--with-gnutls-libs=PREFIX Location of GNUTLS libraries.
|
||||
--with-nspr-includes=PREFIX Specify location of Mozilla nspr4 includes.
|
||||
@@ -16383,6 +16386,14 @@ fi
|
||||
@@ -16610,6 +16613,14 @@ fi
|
||||
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
# Check whether --enable-gnutls or --disable-gnutls was given.
|
||||
if test "${enable_gnutls+set}" = set; then
|
||||
enableval="$enable_gnutls"
|
||||
@@ -16401,6 +16412,299 @@ fi;
|
||||
@@ -16628,6 +16639,299 @@ fi;
|
||||
|
||||
msg_ssl="None"
|
||||
|
||||
@ -342,7 +342,7 @@ $OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
if test "x$enable_gnutls" != "xno"; then
|
||||
enable_gnutls="no"
|
||||
prefix=`eval echo $prefix`
|
||||
@@ -17516,12 +17820,20 @@ else
|
||||
@@ -17743,12 +18047,20 @@ else
|
||||
fi
|
||||
|
||||
|
||||
@ -364,7 +364,7 @@ $OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
fi
|
||||
|
||||
if test "$enable_tcl" = yes; then
|
||||
@@ -20786,6 +21098,13 @@ echo "$as_me: error: conditional \"USE_P
|
||||
@@ -21154,6 +21466,13 @@ echo "$as_me: error: conditional \"USE_P
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
@ -378,7 +378,7 @@ $OpenBSD: patch-configure,v 1.10 2004/01/18 00:11:21 brad Exp $
|
||||
if test -z "${USE_GNUTLS_TRUE}" && test -z "${USE_GNUTLS_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"USE_GNUTLS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
@@ -21571,6 +21890,10 @@ s,@PERL_LIBS@,$PERL_LIBS,;t t
|
||||
@@ -21963,6 +22282,10 @@ s,@PERL_LIBS@,$PERL_LIBS,;t t
|
||||
s,@PERL_MM_PARAMS@,$PERL_MM_PARAMS,;t t
|
||||
s,@DYNALOADER_A@,$DYNALOADER_A,;t t
|
||||
s,@LIBPERL_A@,$LIBPERL_A,;t t
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
--- plugins/ssl/Makefile.in.orig 2004-01-10 01:10:25.000000000 -0500
|
||||
+++ plugins/ssl/Makefile.in 2004-01-17 14:45:46.000000000 -0500
|
||||
@@ -123,6 +123,8 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
$OpenBSD: patch-plugins_ssl_Makefile_in,v 1.2 2004/04/24 08:04:13 brad Exp $
|
||||
--- plugins/ssl/Makefile.in.orig 2004-04-01 23:09:29.000000000 -0500
|
||||
+++ plugins/ssl/Makefile.in 2004-04-02 05:54:04.000000000 -0500
|
||||
@@ -125,6 +125,8 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
NSS_CFLAGS = @NSS_CFLAGS@
|
||||
NSS_LIBS = @NSS_LIBS@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
PACKAGE = @PACKAGE@
|
||||
PERL = @PERL@
|
||||
PERL_CFLAGS = @PERL_CFLAGS@
|
||||
@@ -162,19 +164,23 @@ EXTRA_DIST = \
|
||||
@@ -167,19 +169,23 @@ EXTRA_DIST = \
|
||||
plugindir = $(libdir)/gaim
|
||||
|
||||
ssl_la_LDFLAGS = -module -avoid-version
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GNUTLS_LIBS)
|
||||
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(NSS_LIBS)
|
||||
|
||||
@@ -185,6 +191,7 @@ AM_CPPFLAGS = \
|
||||
@@ -190,6 +196,7 @@ AM_CPPFLAGS = \
|
||||
$(DEBUG_CFLAGS) \
|
||||
$(GTK_CFLAGS) \
|
||||
$(PLUGIN_CFLAGS) \
|
||||
@ -42,7 +42,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
$(NSS_CFLAGS) \
|
||||
$(GNUTLS_CFLAGS)
|
||||
|
||||
@@ -194,6 +201,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
|
||||
@@ -199,6 +206,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(plugin_LTLIBRARIES)
|
||||
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES =
|
||||
@PLUGINS_FALSE@ssl_gnutls_la_DEPENDENCIES =
|
||||
@PLUGINS_TRUE@am_ssl_gnutls_la_OBJECTS = ssl-gnutls.lo
|
||||
@@ -213,7 +224,7 @@ LDFLAGS = @LDFLAGS@
|
||||
@@ -218,7 +229,7 @@ LDFLAGS = @LDFLAGS@
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ssl-gnutls.Plo \
|
||||
@ -62,7 +62,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
|
||||
@@ -222,9 +233,9 @@ CCLD = $(CC)
|
||||
@@ -227,9 +238,9 @@ CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
|
||||
@ -74,7 +74,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
|
||||
all: all-am
|
||||
|
||||
@@ -263,6 +274,8 @@ clean-pluginLTLIBRARIES:
|
||||
@@ -268,6 +279,8 @@ clean-pluginLTLIBRARIES:
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
@ -83,7 +83,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.1 2004/01/18 00:11:21 brad Exp $
|
||||
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
|
||||
$(LINK) -rpath $(plugindir) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
|
||||
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
|
||||
@@ -276,6 +289,7 @@ mostlyclean-compile:
|
||||
@@ -281,6 +294,7 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2004/01/26 19:52:05 brad Exp $
|
||||
--- src/Makefile.in.orig 2004-01-10 01:10:29.000000000 -0500
|
||||
+++ src/Makefile.in 2004-01-25 18:43:58.000000000 -0500
|
||||
@@ -443,7 +443,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2004/04/24 08:04:13 brad Exp $
|
||||
--- src/Makefile.in.orig 2004-04-22 21:36:28.000000000 -0400
|
||||
+++ src/Makefile.in 2004-04-23 03:56:03.000000000 -0400
|
||||
@@ -479,7 +479,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
|
||||
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-src_protocols_oscar_ft_c,v 1.1 2004/01/27 01:03:54 brad Exp $
|
||||
--- src/protocols/oscar/ft.c.orig 2004-01-26 14:53:17.000000000 -0500
|
||||
+++ src/protocols/oscar/ft.c 2004-01-26 14:53:38.000000000 -0500
|
||||
@@ -49,6 +49,7 @@
|
||||
#ifndef _WIN32
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
+#include <limits.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/utsname.h> /* for aim_odc_initiate */
|
@ -1,184 +0,0 @@
|
||||
$OpenBSD: patch-src_protocols_yahoo_yahoo_c,v 1.3 2004/01/27 01:03:54 brad Exp $
|
||||
--- src/protocols/yahoo/yahoo.c.orig 2004-01-10 00:04:09.000000000 -0500
|
||||
+++ src/protocols/yahoo/yahoo.c 2004-01-26 14:51:13.000000000 -0500
|
||||
@@ -20,6 +20,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
+#include <limits.h>
|
||||
#include "internal.h"
|
||||
|
||||
#include "account.h"
|
||||
@@ -131,8 +132,15 @@ static void yahoo_packet_read(struct yah
|
||||
while (pos + 1 < len) {
|
||||
if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
|
||||
break;
|
||||
+ if (x >= sizeof(key)-1) {
|
||||
+ x++;
|
||||
+ continue;
|
||||
+
|
||||
+ }
|
||||
key[x++] = data[pos++];
|
||||
}
|
||||
+ if (x >= sizeof(key)-1)
|
||||
+ x = 0;
|
||||
key[x] = 0;
|
||||
pos += 2;
|
||||
pair->key = strtol(key, NULL, 10);
|
||||
@@ -868,32 +876,66 @@ static void yahoo_process_contact(GaimCo
|
||||
}
|
||||
}
|
||||
|
||||
+
|
||||
+static void octal(const char **p, const char *end, unsigned char *n)
|
||||
+{
|
||||
+ int i, c;
|
||||
+
|
||||
+ for (i = 0, c = 0; i < 3 && *p < end; ++i, ++*p) {
|
||||
+ c <<= 3;
|
||||
+ switch (**p) {
|
||||
+ case '0': break;
|
||||
+ case '1': c += 1; break;
|
||||
+ case '2': c += 2; break;
|
||||
+ case '3': c += 3; break;
|
||||
+ case '4': c += 4; break;
|
||||
+ case '5': c += 5; break;
|
||||
+ case '6': c += 6; break;
|
||||
+ case '7': c += 7; break;
|
||||
+ default:
|
||||
+ if (i == 0) {
|
||||
+ *n = **p;
|
||||
+ ++*p;
|
||||
+ return;
|
||||
+ }
|
||||
+ c >>= 3;
|
||||
+ goto done;
|
||||
+ }
|
||||
+ }
|
||||
+done:
|
||||
+ *n = (c > UCHAR_MAX) ? '?' : c;
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
#define OUT_CHARSET "utf-8"
|
||||
|
||||
static char *yahoo_decode(const char *text)
|
||||
{
|
||||
char *converted;
|
||||
- char *p, *n, *new;
|
||||
-
|
||||
- n = new = g_malloc(strlen (text) + 1);
|
||||
-
|
||||
- for (p = (char *)text; *p; p++, n++) {
|
||||
+ unsigned char *n, *new;
|
||||
+ size_t len;
|
||||
+ const char *p, *end;
|
||||
+
|
||||
+ len = strlen (text);
|
||||
+ p = text;
|
||||
+ end = &text[len];
|
||||
+ n = new = g_malloc(len + 1);
|
||||
+ while (p < end) {
|
||||
if (*p == '\\') {
|
||||
- sscanf(p + 1, "%3o\n", (int *)n);
|
||||
- p += 3;
|
||||
- }
|
||||
- else
|
||||
- *n = *p;
|
||||
+ ++p;
|
||||
+ octal(&p, end, n);
|
||||
+ } else
|
||||
+ *n = *p++;
|
||||
+ ++n;
|
||||
}
|
||||
-
|
||||
*n = '\0';
|
||||
-
|
||||
converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
|
||||
g_free(new);
|
||||
|
||||
return converted;
|
||||
}
|
||||
|
||||
+
|
||||
static void yahoo_process_mail(GaimConnection *gc, struct yahoo_packet *pkt)
|
||||
{
|
||||
GaimAccount *account = gaim_connection_get_account(gc);
|
||||
@@ -1903,32 +1945,30 @@ static void yahoo_got_web_connected(gpoi
|
||||
|
||||
static void yahoo_web_pending(gpointer data, gint source, GaimInputCondition cond)
|
||||
{
|
||||
+ static const char http302[] = "HTTP/1.0 302";
|
||||
+ static const char setcookie[] = "Set-Cookie: ";
|
||||
GaimConnection *gc = data;
|
||||
GaimAccount *account = gaim_connection_get_account(gc);
|
||||
struct yahoo_data *yd = gc->proto_data;
|
||||
- char buf[1024], buf2[256], *i = buf, *r = buf2;
|
||||
- int len, o = 0;
|
||||
+ char buf[1024], *i = buf;
|
||||
+ int len;
|
||||
+ GString *s;
|
||||
|
||||
len = read(source, buf, sizeof(buf));
|
||||
- if (len <= 0 || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
|
||||
+ if (len <= 0 || (len >= sizeof(http302)-1 &&
|
||||
+ memcmp(http302, buf, sizeof(http302)-1) != 0)) {
|
||||
gaim_connection_error(gc, _("Unable to read"));
|
||||
return;
|
||||
}
|
||||
-
|
||||
- while ((i = strstr(i, "Set-Cookie: ")) && 0 < 2) {
|
||||
- i += strlen("Set-Cookie: ");
|
||||
- for (;*i != ';'; r++, i++) {
|
||||
- *r = *i;
|
||||
- }
|
||||
- *r=';';
|
||||
- r++;
|
||||
- *r=' ';
|
||||
- r++;
|
||||
- o++;
|
||||
- }
|
||||
- /* Get rid of that "; " */
|
||||
- *(r-2) = '\0';
|
||||
- yd->auth = g_strdup(buf2);
|
||||
+ s = g_string_sized_new(len);
|
||||
+ buf[len] = '\0';
|
||||
+ while ((i = strstr(i, setcookie)) != NULL) {
|
||||
+ i += sizeof(setcookie)-1;
|
||||
+ for (;*i != ';'; i++)
|
||||
+ g_string_append_c(s, *i);
|
||||
+ g_string_append(s, "; ");
|
||||
+ }
|
||||
+ yd->auth = g_string_free(s, FALSE);
|
||||
gaim_input_remove(gc->inpa);
|
||||
close(source);
|
||||
/* Now we have our cookies to login with. I'll go get the milk. */
|
||||
@@ -1937,7 +1977,7 @@ static void yahoo_web_pending(gpointer d
|
||||
yahoo_got_web_connected, gc) != 0) {
|
||||
gaim_connection_error(gc, _("Connection problem"));
|
||||
return;
|
||||
- }
|
||||
+ }
|
||||
}
|
||||
|
||||
static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
|
||||
@@ -1974,15 +2014,17 @@ static GHashTable *yahoo_login_page_hash
|
||||
const char *c = buf;
|
||||
char *d;
|
||||
char name[64], value[64];
|
||||
+ int count = sizeof(name)-1;
|
||||
while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
|
||||
c = strstr(c, "name=\"") + strlen("name=\"");
|
||||
- for (d = name; *c!='"'; c++, d++)
|
||||
+ for (d = name; *c!='"' && count; c++, d++, count--)
|
||||
*d = *c;
|
||||
*d = '\0';
|
||||
+ count = sizeof(value)-1;
|
||||
d = strstr(c, "value=\"") + strlen("value=\"");
|
||||
if (strchr(c, '>') < d)
|
||||
break;
|
||||
- for (c = d, d = value; *c!='"'; c++, d++)
|
||||
+ for (c = d, d = value; *c!='"' && count; c++, d++, count--)
|
||||
*d = *c;
|
||||
*d = '\0';
|
||||
g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
|
@ -1,7 +1,16 @@
|
||||
$OpenBSD: patch-src_proxy_c,v 1.3 2004/01/27 01:03:54 brad Exp $
|
||||
--- src/proxy.c.orig 2004-01-09 23:04:56.000000000 -0500
|
||||
+++ src/proxy.c 2004-01-26 19:40:34.000000000 -0500
|
||||
@@ -462,7 +462,7 @@ static void trap_gdb_bug()
|
||||
$OpenBSD: patch-src_proxy_c,v 1.4 2004/04/24 08:04:13 brad Exp $
|
||||
--- src/proxy.c.orig 2004-03-27 13:25:44.000000000 -0500
|
||||
+++ src/proxy.c 2004-04-11 23:13:54.000000000 -0400
|
||||
@@ -315,7 +315,7 @@ static void host_resolved(gpointer data,
|
||||
int rc, err;
|
||||
GSList *hosts = NULL;
|
||||
struct sockaddr *addr = NULL;
|
||||
- size_t addrlen;
|
||||
+ socklen_t addrlen;
|
||||
|
||||
gaim_debug(GAIM_DEBUG_INFO, "dns", "Host '%s' resolved\n", req->host);
|
||||
gaim_input_remove(req->inpa);
|
||||
@@ -389,7 +389,7 @@ static void trap_gdb_bug()
|
||||
fputs("\n* * *\n",stderr);
|
||||
fputs(message,stderr);
|
||||
fputs("* * *\n\n",stderr);
|
||||
@ -10,12 +19,22 @@ $OpenBSD: patch-src_proxy_c,v 1.3 2004/01/27 01:03:54 brad Exp $
|
||||
_exit(1);
|
||||
}
|
||||
|
||||
@@ -974,7 +974,7 @@ http_canread(gpointer data, gint source,
|
||||
|
||||
gaim_input_remove(phb->inpa);
|
||||
|
||||
- while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
|
||||
+ while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
|
||||
if (inputline[pos - 1] == '\n')
|
||||
nlc++;
|
||||
else if (inputline[pos - 1] != '\r')
|
||||
@@ -480,7 +480,7 @@ int gaim_gethostbyname_async(const char
|
||||
char servname[20];
|
||||
#else
|
||||
struct sockaddr_in sin;
|
||||
- const size_t addrlen = sizeof(sin);
|
||||
+ const socklen_t addrlen = sizeof(sin);
|
||||
#endif
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
signal(SIGHUP, SIG_DFL);
|
||||
@@ -549,8 +549,7 @@ int gaim_gethostbyname_async(const char
|
||||
write(child_out[1], &zero, sizeof(zero));
|
||||
tmp = res;
|
||||
while(res) {
|
||||
- size_t ai_addrlen = res->ai_addrlen;
|
||||
- write(child_out[1], &ai_addrlen, sizeof(ai_addrlen));
|
||||
+ write(child_out[1], &(res->ai_addrlen), sizeof(res->ai_addrlen));
|
||||
write(child_out[1], res->ai_addr, res->ai_addrlen);
|
||||
res = res->ai_next;
|
||||
}
|
||||
|
@ -1,135 +0,0 @@
|
||||
$OpenBSD: patch-src_util_c,v 1.1 2004/01/27 01:03:54 brad Exp $
|
||||
--- src/util.c.orig 2004-01-09 23:04:56.000000000 -0500
|
||||
+++ src/util.c 2004-01-26 14:51:51.000000000 -0500
|
||||
@@ -247,24 +247,71 @@ gaim_base64_decode(const char *text, cha
|
||||
/**************************************************************************
|
||||
* Quoted Printable Functions
|
||||
**************************************************************************/
|
||||
-void
|
||||
-gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
|
||||
+static void hex(const char **p, const char *end, unsigned char *n)
|
||||
{
|
||||
- char *p, *n, *new;
|
||||
+ int i, c;
|
||||
|
||||
- n = new = g_malloc(strlen (str) + 1);
|
||||
+ for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
|
||||
+ c <<= 4;
|
||||
+ switch (**p) {
|
||||
+ case '0': break;
|
||||
+ case '1': c += 1; break;
|
||||
+ case '2': c += 2; break;
|
||||
+ case '3': c += 3; break;
|
||||
+ case '4': c += 4; break;
|
||||
+ case '5': c += 5; break;
|
||||
+ case '6': c += 6; break;
|
||||
+ case '7': c += 7; break;
|
||||
+ case '8': c += 8; break;
|
||||
+ case '9': c += 9; break;
|
||||
+ case 'a': c += 10; break;
|
||||
+ case 'b': c += 11; break;
|
||||
+ case 'c': c += 12; break;
|
||||
+ case 'd': c += 13; break;
|
||||
+ case 'e': c += 14; break;
|
||||
+ case 'f': c += 15; break;
|
||||
+ case 'A': c += 10; break;
|
||||
+ case 'B': c += 11; break;
|
||||
+ case 'C': c += 12; break;
|
||||
+ case 'D': c += 13; break;
|
||||
+ case 'E': c += 14; break;
|
||||
+ case 'F': c += 15; break;
|
||||
+ default:
|
||||
+ if (i == 0) {
|
||||
+ *n = **p;
|
||||
+ ++*p;
|
||||
+ return;
|
||||
+ }
|
||||
+ c >>= 4;
|
||||
+ goto done;
|
||||
+ }
|
||||
+ }
|
||||
+done:
|
||||
+ *n = (c > UCHAR_MAX) ? '?' : c;
|
||||
+ return;
|
||||
+}
|
||||
|
||||
- for (p = (char *)str; *p; p++, n++) {
|
||||
+void
|
||||
+gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
|
||||
+{
|
||||
+ const char *p, *end;
|
||||
+ unsigned char *n, *new;
|
||||
+ size_t len;
|
||||
+
|
||||
+ len = strlen (str);
|
||||
+ n = new = g_malloc(len + 1);
|
||||
+ p = str;
|
||||
+ end = &p[len];
|
||||
+ while (p < end) {
|
||||
if (*p == '=') {
|
||||
- sscanf(p + 1, "%2x\n", (int *)n);
|
||||
- p += 2;
|
||||
- }
|
||||
- else if (*p == '_')
|
||||
+ ++p;
|
||||
+ hex(&p, end, n);
|
||||
+ } else if (*p == '_')
|
||||
*n = ' ';
|
||||
else
|
||||
*n = *p;
|
||||
+ ++n;
|
||||
}
|
||||
-
|
||||
*n = '\0';
|
||||
|
||||
if (ret_len)
|
||||
@@ -1962,7 +2009,7 @@ gaim_url_parse(const char *url, char **r
|
||||
char **ret_path)
|
||||
{
|
||||
char scan_info[255];
|
||||
- char port_str[5];
|
||||
+ char port_str[6];
|
||||
int f;
|
||||
const char *turl;
|
||||
char host[256], path[256];
|
||||
@@ -1982,16 +2029,21 @@ gaim_url_parse(const char *url, char **r
|
||||
}
|
||||
|
||||
g_snprintf(scan_info, sizeof(scan_info),
|
||||
- "%%[%s]:%%[%s]/%%[%s]", addr_ctrl, port_ctrl, page_ctrl);
|
||||
+ "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
|
||||
+ addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
|
||||
+ port_ctrl[sizeof(port_ctrl)-1] = '\0';
|
||||
+ page_ctrl[sizeof(page_ctrl)-1] = '\0';
|
||||
|
||||
f = sscanf(url, scan_info, host, port_str, path);
|
||||
|
||||
if (f == 1)
|
||||
{
|
||||
g_snprintf(scan_info, sizeof(scan_info),
|
||||
- "%%[%s]/%%[%s]",
|
||||
+ "%%255[%s]/%%255[%s]",
|
||||
addr_ctrl, page_ctrl);
|
||||
f = sscanf(url, scan_info, host, path);
|
||||
+ addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
|
||||
+ page_ctrl[sizeof(page_ctrl)-1] = '\0';
|
||||
g_snprintf(port_str, sizeof(port_str), "80");
|
||||
}
|
||||
|
||||
@@ -2081,9 +2133,14 @@ parse_redirect(const char *data, size_t
|
||||
static size_t
|
||||
parse_content_len(const char *data, size_t data_len)
|
||||
{
|
||||
- size_t content_len = 0;
|
||||
+ int content_len = 0;
|
||||
+ char *tmp;
|
||||
|
||||
- sscanf(data, "Content-Length: %d", (int *)&content_len);
|
||||
+ tmp = g_malloc(data_len + 1);
|
||||
+ memcpy(tmp, data, data_len);
|
||||
+ tmp[data_len] = '\0';
|
||||
+ sscanf(tmp, "Content-Length: %d", &content_len);
|
||||
+ g_free(tmp);
|
||||
|
||||
return content_len;
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.21 2003/11/22 23:04:42 brad Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.22 2004/04/24 08:04:13 brad Exp $
|
||||
lib/gaim/autorecon.so
|
||||
lib/gaim/docklet.so
|
||||
lib/gaim/gaim-remote.so
|
||||
@ -11,8 +11,8 @@ lib/gaim/libirc.so
|
||||
lib/gaim/libjabber.so
|
||||
lib/gaim/libmsn.so
|
||||
lib/gaim/libnapster.so
|
||||
lib/gaim/libnovell.so
|
||||
lib/gaim/liboscar.so
|
||||
lib/gaim/libtoc.so
|
||||
lib/gaim/libyahoo.so
|
||||
lib/gaim/libzephyr.so
|
||||
lib/gaim/notify.so
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.29 2004/01/18 01:02:41 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.30 2004/04/24 08:04:13 brad Exp $
|
||||
bin/gaim
|
||||
bin/gaim-remote
|
||||
include/gaim-remote/remote-socket.h
|
||||
@ -15,8 +15,8 @@ include/gaim-remote/remote.h
|
||||
@comment lib/gaim/libjabber.la
|
||||
@comment lib/gaim/libmsn.la
|
||||
@comment lib/gaim/libnapster.la
|
||||
@comment lib/gaim/libnovell.la
|
||||
@comment lib/gaim/liboscar.la
|
||||
@comment lib/gaim/libtoc.la
|
||||
@comment lib/gaim/libyahoo.la
|
||||
@comment lib/gaim/libzephyr.la
|
||||
@comment lib/gaim/notify.la
|
||||
@ -49,6 +49,7 @@ share/locale/hu/LC_MESSAGES/gaim.mo
|
||||
share/locale/it/LC_MESSAGES/gaim.mo
|
||||
share/locale/ja/LC_MESSAGES/gaim.mo
|
||||
share/locale/ko/LC_MESSAGES/gaim.mo
|
||||
share/locale/mk/LC_MESSAGES/gaim.mo
|
||||
share/locale/nl/LC_MESSAGES/gaim.mo
|
||||
share/locale/no/LC_MESSAGES/gaim.mo
|
||||
share/locale/pl/LC_MESSAGES/gaim.mo
|
||||
@ -85,6 +86,7 @@ share/pixmaps/gaim/dialogs/gaim_question.png
|
||||
share/pixmaps/gaim/dialogs/gaim_warning.png
|
||||
share/pixmaps/gaim/icons/away.png
|
||||
share/pixmaps/gaim/icons/connect.png
|
||||
share/pixmaps/gaim/icons/info.png
|
||||
share/pixmaps/gaim/icons/msgpend.png
|
||||
share/pixmaps/gaim/icons/msgunread.png
|
||||
share/pixmaps/gaim/icons/offline.png
|
||||
@ -279,12 +281,15 @@ share/pixmaps/gaim/status/default/msn.png
|
||||
share/pixmaps/gaim/status/default/na.png
|
||||
share/pixmaps/gaim/status/default/napster.png
|
||||
share/pixmaps/gaim/status/default/notauthorized.png
|
||||
share/pixmaps/gaim/status/default/novell.png
|
||||
share/pixmaps/gaim/status/default/occupied.png
|
||||
share/pixmaps/gaim/status/default/offline.png
|
||||
share/pixmaps/gaim/status/default/rendezvous.png
|
||||
share/pixmaps/gaim/status/default/secure.png
|
||||
share/pixmaps/gaim/status/default/trepia.png
|
||||
share/pixmaps/gaim/status/default/wireless.png
|
||||
share/pixmaps/gaim/status/default/yahoo.png
|
||||
share/pixmaps/gaim/status/default/zephyr.png
|
||||
share/pixmaps/gaim/tb_drag_arrow_down.xpm
|
||||
share/pixmaps/gaim/tb_drag_arrow_left.xpm
|
||||
share/pixmaps/gaim/tb_drag_arrow_right.xpm
|
||||
@ -308,66 +313,5 @@ share/sounds/gaim/send.wav
|
||||
@dirrm share/pixmaps/gaim/buttons
|
||||
@dirrm share/pixmaps/gaim
|
||||
@dirrm share/pixmaps
|
||||
@dirrm share/locale/zh_TW/LC_MESSAGES
|
||||
@dirrm share/locale/zh_TW
|
||||
@dirrm share/locale/zh_CN/LC_MESSAGES
|
||||
@dirrm share/locale/zh_CN
|
||||
@dirrm share/locale/vi/LC_MESSAGES
|
||||
@dirrm share/locale/vi
|
||||
@dirrm share/locale/sv/LC_MESSAGES
|
||||
@dirrm share/locale/sv
|
||||
@dirrm share/locale/sr@Latn/LC_MESSAGES
|
||||
@dirrm share/locale/sr@Latn
|
||||
@dirrm share/locale/sr/LC_MESSAGES
|
||||
@dirrm share/locale/sr
|
||||
@dirrm share/locale/sk/LC_MESSAGES
|
||||
@dirrm share/locale/sk
|
||||
@dirrm share/locale/ru/LC_MESSAGES
|
||||
@dirrm share/locale/ru
|
||||
@dirrm share/locale/ro/LC_MESSAGES
|
||||
@dirrm share/locale/ro
|
||||
@dirrm share/locale/pt_BR/LC_MESSAGES
|
||||
@dirrm share/locale/pt_BR
|
||||
@dirrm share/locale/pt/LC_MESSAGES
|
||||
@dirrm share/locale/pt
|
||||
@dirrm share/locale/pl/LC_MESSAGES
|
||||
@dirrm share/locale/pl
|
||||
@dirrm share/locale/no/LC_MESSAGES
|
||||
@dirrm share/locale/no
|
||||
@dirrm share/locale/nl/LC_MESSAGES
|
||||
@dirrm share/locale/nl
|
||||
@dirrm share/locale/ko/LC_MESSAGES
|
||||
@dirrm share/locale/ko
|
||||
@dirrm share/locale/ja/LC_MESSAGES
|
||||
@dirrm share/locale/ja
|
||||
@dirrm share/locale/it/LC_MESSAGES
|
||||
@dirrm share/locale/it
|
||||
@dirrm share/locale/hu/LC_MESSAGES
|
||||
@dirrm share/locale/hu
|
||||
@dirrm share/locale/hi/LC_MESSAGES
|
||||
@dirrm share/locale/hi
|
||||
@dirrm share/locale/he/LC_MESSAGES
|
||||
@dirrm share/locale/he
|
||||
@dirrm share/locale/fr/LC_MESSAGES
|
||||
@dirrm share/locale/fr
|
||||
@dirrm share/locale/fi/LC_MESSAGES
|
||||
@dirrm share/locale/fi
|
||||
@dirrm share/locale/es/LC_MESSAGES
|
||||
@dirrm share/locale/es
|
||||
@dirrm share/locale/en_GB/LC_MESSAGES
|
||||
@dirrm share/locale/en_GB
|
||||
@dirrm share/locale/de/LC_MESSAGES
|
||||
@dirrm share/locale/de
|
||||
@dirrm share/locale/da/LC_MESSAGES
|
||||
@dirrm share/locale/da
|
||||
@dirrm share/locale/cs/LC_MESSAGES
|
||||
@dirrm share/locale/cs
|
||||
@dirrm share/locale/ca/LC_MESSAGES
|
||||
@dirrm share/locale/ca
|
||||
@dirrm share/locale/bg/LC_MESSAGES
|
||||
@dirrm share/locale/bg
|
||||
@dirrm share/locale/am/LC_MESSAGES
|
||||
@dirrm share/locale/am
|
||||
@dirrm share/locale
|
||||
@dirrm share/applications
|
||||
@dirrm include/gaim-remote
|
||||
|
Loading…
x
Reference in New Issue
Block a user