cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to gaim 2.0.0beta4

Browse Source 
the audio flavor has been removed for now
as 2.x now requires gstreamer and the gstreamer
version we have in-tree is not new enough.

tested by ckuethe@ alek@ brad@ and a few others.

ok alek@
This commit is contained in:
brad 2006-10-31 19:32:50 +00:00
parent 1237cedca7
commit 32ca6c6b08
27 changed files with 844 additions and 751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
net/gaim/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.92 2006/09/18 11:59:59 espie Exp $
# $OpenBSD: Makefile,v 1.93 2006/10/31 19:32:50 brad Exp $
SHARED_ONLY= Yes
COMMENT= "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
DISTNAME= gaim-1.5.0
PKGNAME= ${DISTNAME}p6
SHARED_LIBS= gaim-remote 0.0
DISTNAME= gaim-2.0.0beta4
SHARED_LIBS= gaim 0.0 \
gnt 0.0
CATEGORIES= net
HOMEPAGE= http://gaim.sourceforge.net/
@ -20,9 +20,9 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= glib-2.0 ICE SM X11 Xext Xrender Xss \
atk-1.0 c crypto fontconfig freetype \
gmodule-2.0 gobject-2.0 m pango-1.0 \
ssl stdc++ pangocairo-1.0 cairo glitz png \
pangoft2-1.0 z
gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \
ssl pangocairo-1.0 cairo glitz png \
pangoft2-1.0 z pthread m ncurses panel stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
@ -30,38 +30,44 @@ MODULES= devel/gettext
LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
startup-notification-1::devel/startup-notification \
silc,silcclient::devel/silc-toolkit
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig
silc,silcclient::devel/silc-toolkit \
meanwhile::net/meanwhile \
gadu::net/libgadu \
xml2::textproc/libxml
BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig \
:p5-XML-Parser-*:textproc/p5-XML-Parser
USE_X11= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
SEPARATE_BUILD= simple
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= --disable-gevolution \
--disable-gnutls \
--disable-gstreamer \
--disable-nas \
--disable-nss \
--disable-perl \
--disable-tcl \
--disable-tk \
--enable-openssl
--disable-dbus \
--disable-cap \
--disable-schemas-install \
--disable-audio \
--enable-openssl \
--enable-consoleui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FLAVORS= audio debug gtkspell
FLAVORS= debug gtkspell
FLAVOR?=
.if ${FLAVOR:L:Maudio}
LIB_DEPENDS+= audiofile::devel/libaudiofile \
ao.>=3::audio/libao
WANTLIB+= pthread
.else
CONFIGURE_ARGS+= --disable-audio
.endif
.if ${FLAVOR:L:Mdebug}
CFLAGS= -O0
CFLAGS= -O0
CONFIGURE_ARGS+=--enable-debug
INSTALL_STRIP=
@ -69,12 +75,12 @@ INSTALL_STRIP=
.if ${FLAVOR:L:Mgtkspell}
LIB_DEPENDS+= gtkspell::textproc/gtkspell
WANTLIB+= iconv intl aspell
WANTLIB+= aspell
.else
CONFIGURE_ARGS+=--disable-gtkspell
.endif
post-extract:
@cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/plugins/ssl
@cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libgaim/plugins/ssl
.include <bsd.port.mk>

8
net/gaim/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gaim-1.5.0.tar.gz) = dd984bd3116d8146545a492d314b0dae
RMD160 (gaim-1.5.0.tar.gz) = e49e1aa323fa70b9b0ed0792e5d16a5d68b183f8
SHA1 (gaim-1.5.0.tar.gz) = 35b30a5a804c15d06b24a92ad555282d0caadcc9
SIZE (gaim-1.5.0.tar.gz) = 8660250
MD5 (gaim-2.0.0beta4.tar.gz) = 9bd1d2a9191d4083ff8161b5683cc8a7
RMD160 (gaim-2.0.0beta4.tar.gz) = 1dc6f639ea76e2057bc6b14b99251d54cfd0812b
SHA1 (gaim-2.0.0beta4.tar.gz) = 1cdddf376450f21a329514ef1c24914964191833
SIZE (gaim-2.0.0beta4.tar.gz) = 8780692

117
net/gaim/files/ssl-openssl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssl-openssl.c,v 1.9 2006/05/22 06:14:51 brad Exp $ */
/* $OpenBSD: ssl-openssl.c,v 1.10 2006/10/31 19:32:51 brad Exp $ */
/*
* OpenSSL SSL-plugin for gaim
@ -35,6 +35,7 @@ typedef struct
{
SSL *ssl;
SSL_CTX *ssl_ctx;
guint handshake_handler;
} GaimSslOpensslData;
#define GAIM_SSL_OPENSSL_DATA(gsc) ((GaimSslOpensslData *)gsc->private_data)
@ -84,29 +85,57 @@ ssl_openssl_uninit(void)
}
/*
* ssl_openssl_connect_cb
*
* given a socket, put an openssl connection around it.
* ssl_openssl_handshake_cb
*/
static void
ssl_openssl_connect_cb(gpointer data, gint source, GaimInputCondition cond)
ssl_openssl_handshake_cb(gpointer data, gint source, GaimInputCondition cond)
{
GaimSslConnection *gsc = (GaimSslConnection *)data;
GaimSslOpensslData *openssl_data;
GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc);
int ret, ret2;
gaim_debug_info("openssl", "Connecting\n");
/*
* we need a valid file descriptor to associate the SSL connection with.
* do the negotiation that sets up the SSL connection between
* here and there.
*/
if (source < 0) {
ret = SSL_connect(openssl_data->ssl);
if (ret <= 0) {
gaim_debug_info("openssl", "SSL_get_error\n");
ret2 = SSL_get_error(openssl_data->ssl, ret);
if (ret2 == SSL_ERROR_WANT_READ || ret2 == SSL_ERROR_WANT_WRITE)
return;
gaim_debug_error("openssl", "SSL_connect failed\n");
if (gsc->error_cb != NULL)
gsc->error_cb(gsc, GAIM_SSL_CONNECT_FAILED,
gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED,
gsc->connect_cb_data);
gaim_ssl_close(gsc);
return;
}
gsc->fd = source;
gaim_input_remove(openssl_data->handshake_handler);
openssl_data->handshake_handler = 0;
gaim_debug_info("openssl", "SSL_connect complete\n");
/* SSL connected now */
gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
}
/*
* ssl_openssl_connect
*
* given a socket, put an openssl connection around it.
*/
static void
ssl_openssl_connect(GaimSslConnection *gsc)
{
GaimSslOpensslData *openssl_data;
/*
* allocate some memory to store variables for the openssl connection.
@ -134,7 +163,7 @@ ssl_openssl_connect_cb(gpointer data, gint source, GaimInputCondition cond)
* allocate a new SSL object
*/
openssl_data->ssl = SSL_new(openssl_data->ssl_ctx);
if(openssl_data->ssl == NULL) {
if (openssl_data->ssl == NULL) {
gaim_debug_error("openssl", "SSL_new failed\n");
if (gsc->error_cb != NULL)
gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED,
@ -147,7 +176,7 @@ ssl_openssl_connect_cb(gpointer data, gint source, GaimInputCondition cond)
/*
* now we associate the file descriptor we have with the SSL connection
*/
if (SSL_set_fd(openssl_data->ssl, source) == 0) {
if (SSL_set_fd(openssl_data->ssl, gsc->fd) == 0) {
gaim_debug_error("openssl", "SSL_set_fd failed\n");
if (gsc->error_cb != NULL)
gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED,
@ -157,22 +186,10 @@ ssl_openssl_connect_cb(gpointer data, gint source, GaimInputCondition cond)
return;
}
/*
* finally, do the negotiation that sets up the SSL connection between
* here and there.
*/
if (SSL_connect(openssl_data->ssl) <= 0) {
gaim_debug_error("openssl", "SSL_connect failed\n");
if (gsc->error_cb != NULL)
gsc->error_cb(gsc, GAIM_SSL_HANDSHAKE_FAILED,
gsc->connect_cb_data);
openssl_data->handshake_handler = gaim_input_add(gsc->fd,
GAIM_INPUT_READ, ssl_openssl_handshake_cb, gsc);
gaim_ssl_close(gsc);
return;
}
/* SSL connected now */
gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
ssl_openssl_handshake_cb(gsc, gsc->fd, GAIM_INPUT_READ);
}
static void
@ -184,6 +201,9 @@ ssl_openssl_close(GaimSslConnection *gsc)
if (openssl_data == NULL)
return;
if (openssl_data->handshake_handler)
gaim_input_remove(openssl_data->handshake_handler);
if (openssl_data->ssl != NULL) {
i = SSL_shutdown(openssl_data->ssl);
if (i == 0)
@ -195,32 +215,53 @@ ssl_openssl_close(GaimSslConnection *gsc)
SSL_CTX_free(openssl_data->ssl_ctx);
g_free(openssl_data);
gsc->private_data = NULL;
}
static size_t
ssl_openssl_read(GaimSslConnection *gsc, void *data, size_t len)
{
GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc);
int i;
ssize_t s;
int ret;
i = SSL_read(openssl_data->ssl, data, len);
if (i < 0)
i = 0;
s = SSL_read(openssl_data->ssl, data, len);
if (s <= 0) {
ret = SSL_get_error(openssl_data->ssl, s);
return (i);
if (ret == SSL_ERROR_WANT_READ || ret == SSL_ERROR_WANT_WRITE) {
errno = EAGAIN;
return (-1);
}
gaim_debug_error("openssl", "receive failed: %d\n", s);
s = 0;
}
return (s);
}
static size_t
ssl_openssl_write(GaimSslConnection *gsc, const void *data, size_t len)
{
GaimSslOpensslData *openssl_data = GAIM_SSL_OPENSSL_DATA(gsc);
int s = 0;
ssize_t s = 0;
int ret;
if (openssl_data != NULL)
s = SSL_write(openssl_data->ssl, data, len);
s = SSL_write(openssl_data->ssl, data, len);
if (s < 0)
if (s <= 0) {
ret = SSL_get_error(openssl_data->ssl, s);
if (ret == SSL_ERROR_WANT_READ || ret == SSL_ERROR_WANT_WRITE) {
errno = EAGAIN;
return (-1);
}
gaim_debug_error("openssl", "send failed: %d\n", s);
s = 0;
}
return (s);
}
@ -228,7 +269,7 @@ ssl_openssl_write(GaimSslConnection *gsc, const void *data, size_t len)
static GaimSslOps ssl_ops = {
ssl_openssl_init,
ssl_openssl_uninit,
ssl_openssl_connect_cb,
ssl_openssl_connect,
ssl_openssl_close,
ssl_openssl_read,
ssl_openssl_write
@ -287,7 +328,9 @@ static GaimPluginInfo info = {
NULL, /* destroy */
NULL, /* ui_info */
NULL /* extra_info */
NULL, /* extra_info */
NULL, /* prefs_info */
NULL /* actions */
};
static void

19
net/gaim/patches/patch-config_h_in
View File

@ -1,13 +1,16 @@
$OpenBSD: patch-config_h_in,v 1.7 2005/07/23 20:57:02 brad Exp $
--- config.h.in.orig Thu Jul 7 21:56:35 2005
+++ config.h.in Sat Jul 23 14:49:20 2005
@@ -156,6 +156,9 @@
/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
#undef HAVE_GNUTLS_GNUTLS_H
$OpenBSD: patch-config_h_in,v 1.8 2006/10/31 19:32:51 brad Exp $
--- config.h.in.orig Wed Oct 18 15:59:47 2006
+++ config.h.in Sat Oct 21 00:08:06 2006
@@ -159,6 +159,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H
+/* Define if you have OpenSSL */
+#undef HAVE_OPENSSL
+
/* Define if you have the iconv() function. */
#undef HAVE_ICONV
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
/* Define to 1 if you have the <paths.h> header file. */
#undef HAVE_PATHS_H

424
net/gaim/patches/patch-configure
View File

@ -1,424 +0,0 @@
$OpenBSD: patch-configure,v 1.22 2005/07/23 20:57:02 brad Exp $
--- configure.orig Thu Jul 7 21:56:58 2005
+++ configure Sat Jul 23 15:03:32 2005
@@ -464,7 +464,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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS PKG_CONFIG SILC_CFLAGS SILC_LIBS 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_SILC_TRUE STATIC_SILC_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_SILC_TRUE DYNAMIC_SILC_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 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 BINRELOC_CFLAGS BINRELOC_LIBS DOXYGEN DOT HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE enable_doxygen enable_dot 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar sedpath CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 ALLOCA GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS PKG_CONFIG SILC_CFLAGS SILC_LIBS 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_SILC_TRUE STATIC_SILC_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_SILC_TRUE DYNAMIC_SILC_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 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 BINRELOC_CFLAGS BINRELOC_LIBS DOXYGEN DOT HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE enable_doxygen enable_dot LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1060,6 +1060,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
@@ -1095,6 +1096,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.
+ --with-openssl-includes=PREFIX Location of OpenSSL includes.
+ --with-openssl-libs=PREFIX Location of OpenSSL libraries.
--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.
@@ -10730,6 +10733,23 @@ if test -z "$aix_libpath"; then aix_libp
fi
output_verbose_link_cmd='echo'
;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ ld_shlibs_CXX=no
+ ;;
+ openbsd*)
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-fil
+e,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
KCC*)
@@ -29156,7 +29176,7 @@ fi
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread -ldl"
+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread"
echo "$as_me:$LINENO: checking for silc_client_init in -lsilcclient" >&5
echo $ECHO_N "checking for silc_client_init in -lsilcclient... $ECHO_C" >&6
if test "${ac_cv_lib_silcclient_silc_client_init+set}" = set; then
@@ -33595,6 +33615,14 @@ fi
+# Check whether --enable-openssl or --disable-openssl was given.
+if test "${enable_openssl+set}" = set; then
+ enableval="$enable_openssl"
+ enable_openssl="$enableval"
+else
+ enable_openssl="yes"
+fi;
+
# Check whether --enable-gnutls or --disable-gnutls was given.
if test "${enable_gnutls+set}" = set; then
enableval="$enable_gnutls"
@@ -33613,6 +33641,299 @@ fi;
msg_ssl="None"
+if test "x$enable_openssl" != "xno"; then
+ enable_openssl="no"
+ prefix=`eval echo $prefix`
+
+
+# Check whether --with-openssl-includes or --without-openssl-includes was given.
+if test "${with_openssl_includes+set}" = set; then
+ withval="$with_openssl_includes"
+ with_openssl_includes="$withval"
+else
+ with_openssl_includes="$prefix/include"
+fi;
+
+ have_openssl_includes="no"
+
+ if test "x$with_openssl_includes" != "xno"; then
+ CPPFLAGS_save="$CPPFLAGS"
+
+ echo "$as_me:$LINENO: checking for OpenSSL includes" >&5
+echo $ECHO_N "checking for OpenSSL includes... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: \"\"" >&5
+echo "${ECHO_T}\"\"" >&6
+
+ CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"
+
+for ac_header in openssl/ssl.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ openssl_includes="yes"
+fi
+
+done
+
+ CPPFLAGS="$CPPFLAGS_save"
+
+ if test "x$openssl_includes" != "xno" -a \
+ "x$openssl_includes" != "x"; then
+ have_openssl_includes="yes"
+
+ OPENSSL_CFLAGS="-I$with_openssl_includes"
+ else
+ OPENSSL_CFLAGS=""
+ fi
+ else
+ echo "$as_me:$LINENO: checking for OpenSSL includes" >&5
+echo $ECHO_N "checking for OpenSSL includes... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
+# Check whether --with-openssl-libs or --without-openssl-libs was given.
+if test "${with_openssl_libs+set}" = set; then
+ withval="$with_openssl_libs"
+ with_openssl_libs="$withval"
+fi;
+
+ if test "x$with_openssl_libs" != "xno" -a \
+ "x$have_openssl_includes" != "xno"; then
+
+ LDFLAGS_save="$LDFLAGS"
+
+ case $with_openssl_libs in
+ ""|-L*) ;;
+ *) with_openssl_libs="-L$with_openssl_libs" ;;
+ esac
+
+ echo "$as_me:$LINENO: checking for OpenSSL libraries" >&5
+echo $ECHO_N "checking for OpenSSL libraries... $ECHO_C" >&6
+if test "${openssl_libs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto"
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char SSL_library_init ();
+int
+main ()
+{
+SSL_library_init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ openssl_libs="yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+openssl_libs="no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$LDFLAGS_save"
+
+fi
+echo "$as_me:$LINENO: result: $openssl_libs" >&5
+echo "${ECHO_T}$openssl_libs" >&6
+
+ if test "x$openssl_libs" != "xno"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_OPENSSL 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SSL 1
+_ACEOF
+
+ msg_openssl="OpenSSL"
+ OPENSSL_LIBS="$with_openssl_libs -lssl -lcrypto"
+
+ enable_openssl="yes"
+ else
+ OPENSSL_CFLAGS=""
+ OPENSSL_LIBS=""
+ fi
+ else
+ echo "$as_me:$LINENO: checking for OpenSSL libraries" >&5
+echo $ECHO_N "checking for OpenSSL libraries... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+else
+ OPENSSL_CFLAGS=""
+ OPENSSL_LIBS=""
+fi
+
+if test "x$enable_openssl" = "xyes"; then
+ USE_OPENSSL_TRUE=
+ USE_OPENSSL_FALSE='#'
+else
+ USE_OPENSSL_TRUE='#'
+ USE_OPENSSL_FALSE=
+fi
+
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
prefix=`eval echo $prefix`
@@ -34792,12 +35113,20 @@ else
fi
-if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
+if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_nss, $msg_gnutls, and $msg_openssl"
+elif test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
msg_ssl="$msg_nss and $msg_gnutls"
+elif test "x$msg_nss" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_nss and $msg_openssl"
+elif test "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_gnutls and $msg_openssl"
elif test "x$msg_nss" != "x"; then
msg_ssl=$msg_nss
elif test "x$msg_gnutls" != "x"; then
msg_ssl=$msg_gnutls
+elif test "x$msg_openssl" != "x"; then
+ msg_ssl=$msg_openssl
fi
if test "$enable_tcl" = yes; then
@@ -38778,6 +39107,13 @@ echo "$as_me: error: conditional \"USE_P
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${USE_OPENSSL_TRUE}" && test -z "${USE_OPENSSL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"USE_OPENSSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_OPENSSL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
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
@@ -39646,6 +39982,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
+s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
+s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
+s,@USE_OPENSSL_TRUE@,$USE_OPENSSL_TRUE,;t t
+s,@USE_OPENSSL_FALSE@,$USE_OPENSSL_FALSE,;t t
s,@GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
s,@GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
s,@USE_GNUTLS_TRUE@,$USE_GNUTLS_TRUE,;t t

172
net/gaim/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,172 @@
$OpenBSD: patch-configure_ac,v 1.1 2006/10/31 19:32:51 brad Exp $
--- configure.ac.orig Wed Oct 18 19:38:16 2006
+++ configure.ac Sat Oct 28 23:35:23 2006
@@ -415,6 +415,7 @@ if test "x$enable_consoleui" = "xyes"; t
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
+ LIBS="${LIBS} -lncurses"
AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
fi
@@ -456,14 +457,16 @@ dnl ####################################
AC_ARG_ENABLE(gstreamer,
[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
enable_gst="no", enable_gst="yes")
-PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [
- AC_MSG_RESULT(no)
- enable_gst="no"
-])
if test "x$enable_gst" != "xno"; then
- AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
- AC_SUBST(GSTREAMER_CFLAGS)
- AC_SUBST(GSTREAMER_LIBS)
+ PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10],
+ AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
+ AC_SUBST(GSTREAMER_CFLAGS)
+ AC_SUBST(GSTREAMER_LIBS)
+ enable_gst="yes"
+ ], [
+ AC_MSG_RESULT(no)
+ enable_gst="no"
+ ])
fi
dnl #######################################################################
@@ -570,7 +573,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread $LIBDL"
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
fi
AC_SUBST(SILC_LIBS)
@@ -1187,8 +1190,13 @@ dnl ####################################
dnl These two are inverses of each other <-- stolen from evolution!
+AC_ARG_ENABLE(openssl,
+ [ --enable-openssl=[yes,no] attempt to use OpenSSL for SSL support (preferred) [default=yes]],
+ [enable_openssl="$enableval"],
+ [enable_openssl="yes"])
+
AC_ARG_ENABLE(gnutls,
- [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support (preferred) [default=yes]],
+ [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
@@ -1200,6 +1208,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None (MSN will not work without SSL!)"
dnl #
+dnl # Check for OpenSSL if it's specified.
+dnl #
+if test "x$enable_openssl" != "xno"; then
+ enale_openssl="no"
+ prefix=`eval echo $prefix`
+
+ AC_ARG_WITH(openssl-includes,
+ [ --with-openssl-includes=PREFIX location of OpenSSL includes.],
+ [ with_openssl_includes="$withval" ],
+ [ with_openssl_includes="$prefix/include" ])
+
+ have_openssl_includes="no"
+
+ if test "x$with_openssl_includes" != "xno"; then
+ CPPFLAGS_save="$CPPFLAGS"
+
+ AC_MSG_CHECKING(for OpenSSL includes)
+ AC_MSG_RESULT("")
+
+ CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"
+ AC_CHECK_HEADERS(openssl/ssl.h, [ openssl_includes="yes" ])
+ CPPFLAGS="$CPPFLAGS_save"
+
+ if test "x$openssl_includes" != "xno" -a \
+ "x$openssl_includes" != "x"; then
+ have_openssl_includes="yes"
+
+ OPENSSL_CFLAGS="-I$with_openssl_includes"
+ else
+ OPENSSL_CFLAGS=""
+ fi
+ else
+ AC_MSG_CHECKING(for OpenSSL includes)
+ AC_MSG_RESULT(no)
+ fi
+
+ AC_ARG_WITH(openssl-libs,
+ [AC_HELP_STRING([--with-openssl-libs=PREFIX], [location of OpenSSL libraries.])],
+ [ with_openssl_libs="$withval" ])
+
+ if test "x$with_openssl_libs" != "xno" -a \
+ "x$have_openssl_includes" != "xno"; then
+
+ LIBS_save="$LIBS"
+
+ case $with_openssl_libs in
+ ""|-L*) ;;
+ *) with_openssl_libs="-L$with_openssl_libs" ;;
+ esac
+
+ AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
+ [
+ LIBS="$LIBS $with_openssl_libs -lssl -lcrypto"
+ AC_TRY_LINK_FUNC(SSL_library_init, openssl_libs="yes", openssl_libs="no")
+ LIBS="$LIBS_save"
+ ])
+
+ if test "x$openssl_libs" != "xno"; then
+ AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have OpenSSL])
+ AC_DEFINE(HAVE_SSL)
+ msg_openssl="OpenSSL"
+ OPENSSL_LIBS="$with_openssl_libs -lssl -lcrypto"
+
+ enable_openssl="yes"
+ else
+ OPENSSL_CFLAGS=""
+ OPENSSL_LIBS=""
+ fi
+ else
+ AC_MSG_CHECKING(for OpenSSL libraries)
+ AC_MSG_RESULT(no)
+ fi
+else
+ OPENSSL_CFLAGS=""
+ OPENSSL_LIBS=""
+fi
+
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)
+
+AM_CONDITIONAL(USE_OPENSSL, test "x$enable_openssl" = "xyes")
+
+
+dnl #
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
@@ -1552,12 +1644,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
-if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
+if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_nss, $msg_gnutls, and $msg_openssl"
+elif test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
msg_ssl="$msg_nss and $msg_gnutls"
+elif test "x$msg_nss" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_nss and $msg_openssl"
+elif test "x$msg_gnutls" != "x" -a "x$msg_openssl" != "x"; then
+ msg_ssl="$msg_gnutls and $msg_openssl"
elif test "x$msg_nss" != "x"; then
msg_ssl=$msg_nss
elif test "x$msg_gnutls" != "x"; then
msg_ssl=$msg_gnutls
+elif test "x$msg_openssl" != "x"; then
+ msg_ssl=$msg_openssl
fi
dnl #######################################################################

12
net/gaim/patches/patch-console_gntdebug_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_gntdebug_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/gntdebug.c.orig Sun Oct 29 02:50:41 2006
+++ console/gntdebug.c Sun Oct 29 02:50:44 2006
@@ -193,7 +193,7 @@ gaim_glib_log_handler(const gchar *domai
void gg_debug_window_show()
{
- debug.paused = false;
+ debug.paused = FALSE;
debug.timestamps = gaim_prefs_get_bool("/core/debug/timestamps");
if (debug.window == NULL)
{

9
net/gaim/patches/patch-console_libgnt_Makefile_am Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-console_libgnt_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/libgnt/Makefile.am.orig Sun Oct 29 14:25:09 2006
+++ console/libgnt/Makefile.am Sun Oct 29 14:25:29 2006
@@ -1,4 +1,4 @@
-SUBDIRS = . wms
+SUBDIRS = .
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnt.pc

12
net/gaim/patches/patch-console_libgnt_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_libgnt_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/libgnt/Makefile.in.orig Sun Oct 29 16:14:11 2006
+++ console/libgnt/Makefile.in Sun Oct 29 16:14:12 2006
@@ -414,7 +414,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-SUBDIRS = . wms
+SUBDIRS = .
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnt.pc
lib_LTLIBRARIES = libgnt.la

12
net/gaim/patches/patch-console_plugins_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_plugins_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/plugins/Makefile.am.orig Sun Oct 29 14:25:42 2006
+++ console/plugins/Makefile.am Sun Oct 29 14:27:04 2006
@@ -17,7 +17,7 @@ gntlastlog_la_SOURCES = lastlog.c
gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la
gnthistory_la_LIBADD = $(GLIB_LIBS)
-gntlastlog_la_LIBADD = $(GLIB_LIBS)
+gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/console/libgnt/libgnt.la
endif # PLUGINS

12
net/gaim/patches/patch-console_plugins_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-console_plugins_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- console/plugins/Makefile.in.orig Sun Oct 29 02:39:35 2006
+++ console/plugins/Makefile.in Sun Oct 29 02:40:00 2006
@@ -426,7 +426,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-v
@PLUGINS_TRUE@gntlastlog_la_SOURCES = lastlog.c
@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la
@PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)
-@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/console/libgnt/libgnt.la
EXTRA_DIST =
AM_CPPFLAGS = \
-DDATADIR=\"$(datadir)\" \

10
net/gaim/patches/patch-src_Makefile_in → net/gaim/patches/patch-gtk_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.9 2005/07/23 20:57:02 brad Exp $
--- src/Makefile.in.orig Thu Jul 7 21:57:05 2005
+++ src/Makefile.in Sat Jul 23 14:51:33 2005
@@ -92,7 +92,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
$OpenBSD: patch-gtk_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- gtk/Makefile.in.orig Sun Oct 29 02:33:23 2006
+++ gtk/Makefile.in Sun Oct 29 02:33:34 2006
@@ -100,7 +100,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
@ -9,4 +9,4 @@ $OpenBSD: patch-src_Makefile_in,v 1.9 2005/07/23 20:57:02 brad Exp $
+CCLD = $(CXX)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(gaim_SOURCES) $(gaim_remote_SOURCES)
SOURCES = $(gaim_SOURCES)

16
net/gaim/patches/patch-gtk_gtkdialogs_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-gtk_gtkdialogs_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- gtk/gtkdialogs.c.orig Fri Oct 20 21:54:24 2006
+++ gtk/gtkdialogs.c Fri Oct 20 21:55:26 2006
@@ -513,6 +513,12 @@ g_string_append(str, "<br/> <b>Library
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif
+#ifdef HAVE_OPENSSL
+ g_string_append(str, " <b>OpenSSL:</b> Enabled<br/>");
+#else
+ g_string_append(str, " <b>OpenSSL:</b> Disabled<br/>");
+#endif
+
#ifdef HAVE_GNUTLS
g_string_append(str, " <b>GnuTLS:</b> Enabled<br/>");
#else

20
net/gaim/patches/patch-gtk_gtkmain_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-gtk_gtkmain_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- gtk/gtkmain.c.orig Sat Oct 28 13:05:48 2006
+++ gtk/gtkmain.c Sat Oct 28 13:07:47 2006
@@ -86,6 +86,7 @@ static SnDisplay *sn_display = NULL;
#endif
#ifdef HAVE_SIGNAL_H
+int real_status;
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -181,6 +182,8 @@ clean_pid()
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);
+
+ real_status = status;
if ((pid == (pid_t) - 1) && (errno != ECHILD)) {
char errmsg[BUFSIZ];

20
net/gaim/patches/patch-gtk_gtknotify_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-gtk_gtknotify_c,v 1.1 2006/10/31 19:32:51 brad Exp $
--- gtk/gtknotify.c.orig Sat Oct 28 13:08:03 2006
+++ gtk/gtknotify.c Sat Oct 28 13:09:43 2006
@@ -906,7 +906,16 @@ uri_command(const char *command, gboolea
g_error_free(error);
}
else
+#if HAVE_SIGNAL_H
+ {
+ extern int real_status;
+
+ if (WIFEXITED(real_status))
+ ret = WEXITSTATUS(real_status);
+ }
+#else
ret = status;
+#endif
}
else
{

31
net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_am Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-libgaim_plugins_ssl_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/plugins/ssl/Makefile.am.orig Fri Oct 20 21:45:25 2006
+++ libgaim/plugins/ssl/Makefile.am Fri Oct 20 21:47:49 2006
@@ -4,6 +4,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/gaim
ssl_la_LDFLAGS = -module -avoid-version
+ssl_openssl_la_LDFLAGS = -module -avoid-version
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@@ -15,10 +16,12 @@ plugin_LTLIBRARIES = \
ssl-nss.la
ssl_la_SOURCES = ssl.c
+ssl_openssl_la_SOURCES = ssl-openssl.c
ssl_gnutls_la_SOURCES = ssl-gnutls.c
ssl_nss_la_SOURCES = ssl-nss.c
ssl_la_LIBADD = $(GLIB_LIBS)
+ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
@@ -32,4 +35,5 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS) \
$(NSS_CFLAGS) \
- $(GNUTLS_CFLAGS)
+ $(GNUTLS_CFLAGS) \
+ $(OPENSSL_CFLAGS)

72
net/gaim/patches/patch-plugins_ssl_Makefile_in → net/gaim/patches/patch-libgaim_plugins_ssl_Makefile_in
View File

@ -1,18 +1,20 @@
$OpenBSD: patch-plugins_ssl_Makefile_in,v 1.8 2005/07/23 20:57:02 brad Exp $
--- plugins/ssl/Makefile.in.orig Thu Jul 7 21:57:03 2005
+++ plugins/ssl/Makefile.in Sat Jul 23 14:49:21 2005
@@ -59,6 +59,10 @@ am__installdirs = "$(DESTDIR)$(plugindir
$OpenBSD: patch-libgaim_plugins_ssl_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/plugins/ssl/Makefile.in.orig Wed Oct 18 16:00:20 2006
+++ libgaim/plugins/ssl/Makefile.in Sat Oct 21 01:39:44 2006
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
+am__ssl_openssl_la_SOURCES_DIST = ssl-openssl.c
+@PLUGINS_TRUE@am_ssl_openssl_la_OBJECTS = ssl-openssl.lo
+ssl_openssl_la_OBJECTS = $(am_ssl_openssl_la_OBJECTS)
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@PLUGINS_TRUE@am_ssl_openssl_la_rpath = -rpath $(plugindir)
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
@PLUGINS_TRUE@am_ssl_gnutls_la_OBJECTS = ssl-gnutls.lo
@@ -87,7 +91,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $
@@ -87,7 +93,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
@ -21,22 +23,31 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.8 2005/07/23 20:57:02 brad Exp $
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -224,6 +228,8 @@ MSGMERGE = @MSGMERGE@
NSS_CFLAGS = @NSS_CFLAGS@
NSS_LIBS = @NSS_LIBS@
OBJEXT = @OBJEXT@
@@ -193,6 +199,8 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNT_CFLAGS = @GNT_CFLAGS@
GNT_LIBS = @GNT_LIBS@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -361,16 +367,20 @@ EXTRA_DIST = \
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
@@ -330,6 +338,8 @@ TCL_LIBS = @TCL_LIBS@
TK_LIBS = @TK_LIBS@
USE_GCONFTOOL_FALSE = @USE_GCONFTOOL_FALSE@
USE_GCONFTOOL_TRUE = @USE_GCONFTOOL_TRUE@
+USE_OPENSSL_FALSE = @USE_OPENSSL_FALSE@
+USE_OPENSSL_TRUE = @USE_OPENSSL_TRUE@
USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@
@@ -416,17 +426,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/gaim
ssl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+ssl_openssl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
ssl_gnutls_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
ssl_nss_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
ssl_la_LDFLAGS = -module -avoid-version
+ssl_openssl_la_LDFLAGS = -module -avoid-version
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@plugin_LTLIBRARIES = \
@PLUGINS_TRUE@ ssl.la \
+@PLUGINS_TRUE@ ssl-openssl.la \
@ -47,28 +58,21 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.8 2005/07/23 20:57:02 brad Exp $
+@PLUGINS_TRUE@ssl_openssl_la_SOURCES = ssl-openssl.c
@PLUGINS_TRUE@ssl_gnutls_la_SOURCES = ssl-gnutls.c
@PLUGINS_TRUE@ssl_nss_la_SOURCES = ssl-nss.c
+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(OPENSSL_LIBS)
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(NSS_LIBS)
@PLUGINS_TRUE@ssl_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -380,6 +390,7 @@ AM_CPPFLAGS = \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
$(PLUGIN_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
$(NSS_CFLAGS) \
$(GNUTLS_CFLAGS)
@@ -443,6 +454,8 @@ clean-pluginLTLIBRARIES:
@@ -499,6 +513,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
+ $(LINK) -rpath $(plugindir) $(ssl_openssl_la_LDFLAGS) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
+ $(LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_LDFLAGS) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -456,6 +469,7 @@ mostlyclean-compile:
@@ -512,6 +528,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c

12
net/gaim/patches/patch-libgaim_protocols_gg_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libgaim_protocols_gg_Makefile_am,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/protocols/gg/Makefile.am.orig Sat Oct 28 12:49:22 2006
+++ libgaim/protocols/gg/Makefile.am Sat Oct 28 12:50:21 2006
@@ -66,7 +66,7 @@ pkg_LTLIBRARIES = libgg.la
noinst_LIBRARIES =
libgg_la_SOURCES = $(GGSOURCES)
-libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS)
+libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS)
endif

12
net/gaim/patches/patch-libgaim_protocols_gg_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libgaim_protocols_gg_Makefile_in,v 1.1 2006/10/31 19:32:51 brad Exp $
--- libgaim/protocols/gg/Makefile.in.orig Sat Oct 28 13:52:42 2006
+++ libgaim/protocols/gg/Makefile.in Sat Oct 28 13:52:45 2006
@@ -486,7 +486,7 @@ libgg_la_LDFLAGS = -module -avoid-versio
@STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS)
@STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS)
@STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)
-@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS)
+@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS)
AM_CPPFLAGS = \
-I$(top_srcdir)/libgaim \
$(INTGG_CFLAGS) \

34
net/gaim/patches/patch-plugins_ssl_Makefile_am
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-plugins_ssl_Makefile_am,v 1.2 2005/05/13 20:49:16 brad Exp $
--- plugins/ssl/Makefile.am.orig Fri Apr 29 13:02:03 2005
+++ plugins/ssl/Makefile.am Thu May 12 21:48:07 2005
@@ -4,6 +4,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/gaim
ssl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+ssl_openssl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
ssl_gnutls_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
ssl_nss_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
@@ -11,13 +12,16 @@ if PLUGINS
plugin_LTLIBRARIES = \
ssl.la \
+ ssl-openssl.la \
ssl-gnutls.la \
ssl-nss.la
ssl_la_SOURCES = ssl.c
+ssl_openssl_la_SOURCES = ssl-openssl.c
ssl_gnutls_la_SOURCES = ssl-gnutls.c
ssl_nss_la_SOURCES = ssl-nss.c
+ssl_openssl_la_LIBADD = $(OPENSSL_LIBS)
ssl_gnutls_la_LIBADD = $(GNUTLS_LIBS)
ssl_nss_la_LIBADD = $(NSS_LIBS)
@@ -31,4 +35,5 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(PLUGIN_CFLAGS) \
$(NSS_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
$(GNUTLS_CFLAGS)

20
net/gaim/patches/patch-src_gtknotify_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_gtknotify_c,v 1.1 2006/06/27 17:32:26 fgsch Exp $
--- src/gtknotify.c.orig Thu Jun 15 17:21:28 2006
+++ src/gtknotify.c Thu Jun 15 18:12:17 2006
@@ -446,7 +446,16 @@ uri_command(const char *command, gboolea
g_error_free(error);
}
else
+#if HAVE_SIGNAL_H
+ {
+ extern int real_status;
+
+ if (WIFEXITED(real_status))
+ ret = WEXITSTATUS(real_status);
+ }
+#else
ret = status;
+#endif
}
else
{

21
net/gaim/patches/patch-src_main_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_main_c,v 1.3 2006/06/27 17:32:26 fgsch Exp $
--- src/main.c.orig Thu Jun 15 17:21:21 2006
+++ src/main.c Thu Jun 15 17:21:47 2006
@@ -86,6 +86,8 @@ char *opt_away_arg = NULL;
int opt_debug = 0;
#if HAVE_SIGNAL_H
+int real_status;
+
/*
* Lists of signals we wish to catch and those we wish to ignore.
* Each list terminated with -1
@@ -325,6 +327,8 @@ clean_pid(void)
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);
+
+ real_status = status;
if ((pid == (pid_t) - 1) && (errno != ECHILD)) {
char errmsg[BUFSIZ];

44
net/gaim/patches/patch-src_privacy_c
View File

@ -1,44 +0,0 @@
Avoid a crash by saving a pointer before calling g_slist_remove() that
will leave l unreachable.
$OpenBSD: patch-src_privacy_c,v 1.1 2006/06/14 01:58:17 fgsch Exp $
--- src/privacy.c.orig Tue Jun 13 16:56:56 2006
+++ src/privacy.c Tue Jun 13 16:57:33 2006
@@ -68,6 +68,7 @@ gaim_privacy_permit_remove(GaimAccount *
gboolean local_only)
{
GSList *l;
+ gpointer data;
char *name;
g_return_val_if_fail(account != NULL, FALSE);
@@ -85,8 +86,9 @@ gaim_privacy_permit_remove(GaimAccount *
if (l == NULL)
return FALSE;
+ data = l->data;
account->permit = g_slist_remove(account->permit, l->data);
- g_free(l->data);
+ g_free(data);
if (!local_only && gaim_account_is_connected(account))
serv_rem_permit(gaim_account_get_connection(account), who);
@@ -139,6 +141,7 @@ gaim_privacy_deny_remove(GaimAccount *ac
gboolean local_only)
{
GSList *l;
+ gpointer data;
char *name;
g_return_val_if_fail(account != NULL, FALSE);
@@ -156,8 +159,9 @@ gaim_privacy_deny_remove(GaimAccount *ac
if (l == NULL)
return FALSE;
+ data = l->data;
account->deny = g_slist_remove(account->deny, l->data);
- g_free(l->data);
+ g_free(data);
if (!local_only && gaim_account_is_connected(account))
serv_rem_deny(gaim_account_get_connection(account), who);

40
net/gaim/patches/patch-src_proxy_c
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-src_proxy_c,v 1.9 2005/04/07 18:04:34 brad Exp $
--- src/proxy.c.orig Sun Mar 20 13:01:57 2005
+++ src/proxy.c Wed Apr 6 12:54:18 2005
@@ -319,7 +319,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);
@@ -387,7 +387,7 @@ static void trap_gdb_bug()
fputs("\n* * *\n",stderr);
fputs(message,stderr);
fputs("* * *\n\n",stderr);
- execlp("xmessage","xmessage","-center", message, NULL);
+ execlp("xmessage","xmessage","-center", message, (void *)NULL);
_exit(1);
}
@@ -428,7 +428,7 @@ gaim_dns_childthread(int child_out, int
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
@@ -493,8 +493,7 @@ gaim_dns_childthread(int child_out, int
}
tmp = res;
while(res) {
- size_t ai_addrlen = res->ai_addrlen;
- write(child_out, &ai_addrlen, sizeof(ai_addrlen));
+ write(child_out, &(res->ai_addrlen), sizeof(res->ai_addrlen));
write(child_out, res->ai_addr, res->ai_addrlen);
res = res->ai_next;
}

22
net/gaim/patches/patch-src_util_c
View File

@ -1,22 +0,0 @@
Avoid a crash by leaving enough space for nul.
$OpenBSD: patch-src_util_c,v 1.4 2006/06/14 02:01:08 fgsch Exp $
--- src/util.c.orig Thu Aug 4 16:46:10 2005
+++ src/util.c Thu Aug 4 16:49:20 2005
@@ -2745,7 +2745,7 @@ url_fetched_cb(gpointer url_data, gint s
gfud->len++;
- if (gfud->len == gfud->data_len + 1)
+ if (gfud->len == gfud->data_len)
{
gfud->data_len += (gfud->data_len) / 2;
@@ -2753,6 +2753,7 @@ url_fetched_cb(gpointer url_data, gint s
}
gfud->webdata[gfud->len - 1] = data;
+ gfud->webdata[gfud->len] = '\0';
if (!gfud->startsaving)
{

1
net/gaim/pkg/DESCR
View File

@ -18,5 +18,4 @@ be up at all times.
Gaim is under constant development, and releases are usually frequent.
Flavors:
audio - Build with audio support
gtkspell - Build with spell checking support

371
net/gaim/pkg/PLIST
View File

@ -1,36 +1,65 @@
@comment $OpenBSD: PLIST,v 1.45 2006/01/18 22:01:18 steven Exp $
@comment $OpenBSD: PLIST,v 1.46 2006/10/31 19:32:51 brad Exp $
bin/gaim
bin/gaim-remote
bin/gaim-text
include/gaim/
include/gaim/account.h
include/gaim/accountopt.h
include/gaim/away.h
include/gaim/blist.h
include/gaim/buddyicon.h
include/gaim/cipher.h
include/gaim/circbuffer.h
include/gaim/cmds.h
include/gaim/config.h
include/gaim/connection.h
include/gaim/conversation.h
include/gaim/core.h
include/gaim/dbus-maybe.h
include/gaim/debug.h
include/gaim/dnd-hints.h
include/gaim/desktopitem.h
include/gaim/dnsquery.h
include/gaim/dnssrv.h
include/gaim/eggtrayicon.h
include/gaim/eventloop.h
include/gaim/ft.h
include/gaim/gaim-disclosure.h
include/gaim/gaim.h
include/gaim/gaimcombobox.h
include/gaim/gaimstock.h
include/gaim/gnt/
include/gaim/gnt/gntaccount.h
include/gaim/gnt/gntblist.h
include/gaim/gnt/gntconn.h
include/gaim/gnt/gntconv.h
include/gaim/gnt/gntdebug.h
include/gaim/gnt/gntgaim.h
include/gaim/gnt/gntnotify.h
include/gaim/gnt/gntplugin.h
include/gaim/gnt/gntprefs.h
include/gaim/gnt/gntrequest.h
include/gaim/gnt/gntstatus.h
include/gaim/gnt/gntui.h
include/gaim/gtkaccount.h
include/gaim/gtkblist.h
include/gaim/gtkcelllayout.h
include/gaim/gtkcellrendererexpander.h
include/gaim/gtkcellrendererprogress.h
include/gaim/gtkcellview.h
include/gaim/gtkcellviewmenuitem.h
include/gaim/gtkconn.h
include/gaim/gtkconv.h
include/gaim/gtkconvwin.h
include/gaim/gtkdebug.h
include/gaim/gtkdialogs.h
include/gaim/gtkdnd-hints.h
include/gaim/gtkdocklet.h
include/gaim/gtkeventloop.h
include/gaim/gtkexpander.h
include/gaim/gtkft.h
include/gaim/gtkgaim.h
include/gaim/gtkidle.h
include/gaim/gtkimhtml.h
include/gaim/gtkimhtmltoolbar.h
include/gaim/gtklog.h
include/gaim/gtkmenutray.h
include/gaim/gtknickcolors.h
include/gaim/gtknotify.h
include/gaim/gtkplugin.h
include/gaim/gtkpluginpref.h
@ -39,50 +68,80 @@ include/gaim/gtkprefs.h
include/gaim/gtkprivacy.h
include/gaim/gtkrequest.h
include/gaim/gtkroomlist.h
include/gaim/gtksavedstatuses.h
include/gaim/gtksession.h
include/gaim/gtksound.h
include/gaim/gtksourceiter.h
include/gaim/gtkstatusbox.h
include/gaim/gtkthemes.h
include/gaim/gtkutils.h
include/gaim/gtkwhiteboard.h
include/gaim/idle.h
include/gaim/imgstore.h
include/gaim/internal.h
include/gaim/log.h
include/gaim/md5.h
include/gaim/mime.h
include/gaim/network.h
include/gaim/notify.h
include/gaim/ntlm.h
include/gaim/plugin.h
include/gaim/pluginpref.h
include/gaim/pounce.h
include/gaim/prefix.h
include/gaim/prefs.h
include/gaim/privacy.h
include/gaim/proxy.h
include/gaim/prpl.h
include/gaim/remote-socket.h
include/gaim/remote.h
include/gaim/request.h
include/gaim/roomlist.h
include/gaim/savedstatuses.h
include/gaim/server.h
include/gaim/sha.h
include/gaim/signals.h
include/gaim/sound.h
include/gaim/sslconn.h
include/gaim/status.h
include/gaim/stock.h
include/gaim/stringref.h
include/gaim/stun.h
include/gaim/upnp.h
include/gaim/util.h
include/gaim/value.h
include/gaim/version.h
include/gaim/whiteboard.h
include/gaim/xmlnode.h
include/gnt/
include/gnt/gnt.h
include/gnt/gntbox.h
include/gnt/gntbutton.h
include/gnt/gntcheckbox.h
include/gnt/gntcolors.h
include/gnt/gntcombobox.h
include/gnt/gntentry.h
include/gnt/gntkeys.h
include/gnt/gntlabel.h
include/gnt/gntline.h
include/gnt/gntmarshal.h
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
include/gnt/gnttree.h
include/gnt/gntutils.h
include/gnt/gntwidget.h
include/gnt/gntwindow.h
include/gnt/gntwm.h
lib/gaim/
@comment lib/gaim/autorecon.la
lib/gaim/autorecon.so
@comment lib/gaim/docklet.la
lib/gaim/docklet.so
@comment lib/gaim/extplacement.la
lib/gaim/extplacement.so
@comment lib/gaim/gaim-remote.la
lib/gaim/gaim-remote.so
@comment lib/gaim/gaimrc.la
lib/gaim/gaimrc.so
@comment lib/gaim/gestures.la
lib/gaim/gestures.so
@comment lib/gaim/gntgf.la
lib/gaim/gntgf.so
@comment lib/gaim/gnthistory.la
lib/gaim/gnthistory.so
@comment lib/gaim/gntlastlog.la
lib/gaim/gntlastlog.so
@comment lib/gaim/history.la
lib/gaim/history.so
@comment lib/gaim/iconaway.la
@ -97,20 +156,28 @@ lib/gaim/libirc.so
lib/gaim/libjabber.so
@comment lib/gaim/libmsn.la
lib/gaim/libmsn.so
@comment lib/gaim/libnapster.la
lib/gaim/libnapster.so
@comment lib/gaim/libnovell.la
lib/gaim/libnovell.so
@comment lib/gaim/liboscar.la
lib/gaim/liboscar.so
@comment lib/gaim/libqq.la
lib/gaim/libqq.so
@comment lib/gaim/libsametime.la
lib/gaim/libsametime.so
@comment lib/gaim/libsilcgaim.la
lib/gaim/libsilcgaim.so
@comment lib/gaim/libsimple.la
lib/gaim/libsimple.so
@comment lib/gaim/libyahoo.la
lib/gaim/libyahoo.so
@comment lib/gaim/libzephyr.la
lib/gaim/libzephyr.so
@comment lib/gaim/log_reader.la
lib/gaim/log_reader.so
@comment lib/gaim/notify.la
lib/gaim/notify.so
@comment lib/gaim/psychic.la
lib/gaim/psychic.so
@comment lib/gaim/relnot.la
lib/gaim/relnot.so
@comment lib/gaim/spellchk.la
@ -129,20 +196,33 @@ lib/gaim/statenotify.so
lib/gaim/ticker.so
@comment lib/gaim/timestamp.la
lib/gaim/timestamp.so
lib/libgaim-remote.la
@lib lib/libgaim-remote.so.${LIBgaim-remote_VERSION}
@comment lib/gaim/timestamp_format.la
lib/gaim/timestamp_format.so
lib/libgaim.la
@lib lib/libgaim.so.${LIBgaim_VERSION}
lib/libgnt.la
@lib lib/libgnt.so.${LIBgnt_VERSION}
lib/pkgconfig/gaim.pc
@man man/man1/gaim-remote.1
lib/pkgconfig/gnt.pc
@man man/man1/gaim-text.1
@man man/man1/gaim.1
share/aclocal/gaim.m4
share/applications/
share/applications/gaim.desktop
share/locale/am/LC_MESSAGES/gaim.mo
share/locale/ar/LC_MESSAGES/gaim.mo
share/locale/az/LC_MESSAGES/gaim.mo
share/locale/bg/LC_MESSAGES/gaim.mo
share/locale/bn/LC_MESSAGES/gaim.mo
share/locale/bs/LC_MESSAGES/gaim.mo
share/locale/ca/LC_MESSAGES/gaim.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/gaim.mo
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/LC_MESSAGES/gaim.mo
share/locale/el/LC_MESSAGES/gaim.mo
share/locale/en_AU/
share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/gaim.mo
@ -150,23 +230,27 @@ share/locale/en_CA/LC_MESSAGES/gaim.mo
share/locale/en_GB/LC_MESSAGES/gaim.mo
share/locale/es/LC_MESSAGES/gaim.mo
share/locale/et/LC_MESSAGES/gaim.mo
share/locale/eu/LC_MESSAGES/gaim.mo
share/locale/fa/LC_MESSAGES/gaim.mo
share/locale/fi/LC_MESSAGES/gaim.mo
share/locale/fr/LC_MESSAGES/gaim.mo
share/locale/gl/LC_MESSAGES/gaim.mo
share/locale/gu/LC_MESSAGES/gaim.mo
share/locale/he/LC_MESSAGES/gaim.mo
share/locale/hi/LC_MESSAGES/gaim.mo
share/locale/hu/LC_MESSAGES/gaim.mo
share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/LC_MESSAGES/gaim.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/gaim.mo
share/locale/ko/LC_MESSAGES/gaim.mo
share/locale/ku/LC_MESSAGES/gaim.mo
share/locale/lt/LC_MESSAGES/gaim.mo
share/locale/mk/LC_MESSAGES/gaim.mo
share/locale/my_MM/
share/locale/my_MM/LC_MESSAGES/
share/locale/my_MM/LC_MESSAGES/gaim.mo
share/locale/nb/LC_MESSAGES/gaim.mo
share/locale/ne/LC_MESSAGES/gaim.mo
share/locale/nl/LC_MESSAGES/gaim.mo
share/locale/nn/LC_MESSAGES/gaim.mo
share/locale/pa/LC_MESSAGES/gaim.mo
@ -181,6 +265,9 @@ share/locale/sq/LC_MESSAGES/gaim.mo
share/locale/sr/LC_MESSAGES/gaim.mo
share/locale/sr@Latn/LC_MESSAGES/gaim.mo
share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/ta/LC_MESSAGES/gaim.mo
share/locale/te/LC_MESSAGES/gaim.mo
share/locale/th/LC_MESSAGES/gaim.mo
share/locale/tr/LC_MESSAGES/gaim.mo
share/locale/uk/LC_MESSAGES/gaim.mo
share/locale/vi/LC_MESSAGES/gaim.mo
@ -190,12 +277,14 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
share/pixmaps/
share/pixmaps/gaim/
share/pixmaps/gaim.png
share/pixmaps/gaim.svg
share/pixmaps/gaim/buttons/
share/pixmaps/gaim/buttons/about_menu.png
share/pixmaps/gaim/buttons/accounts.png
share/pixmaps/gaim/buttons/change-bgcolor-small.png
share/pixmaps/gaim/buttons/change-fgcolor-small.png
share/pixmaps/gaim/buttons/edit.png
share/pixmaps/gaim/buttons/info.png
share/pixmaps/gaim/buttons/insert-image-small.png
share/pixmaps/gaim/buttons/insert-link-small.png
share/pixmaps/gaim/buttons/insert-smiley-small.png
@ -214,12 +303,15 @@ share/pixmaps/gaim/dialogs/gaim_warning.png
share/pixmaps/gaim/icons/
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
share/pixmaps/gaim/icons/online.png
share/pixmaps/gaim/icons/stock_connect_16.png
share/pixmaps/gaim/icons/stock_disconnect_16.png
share/pixmaps/gaim/insert-image.png
share/pixmaps/gaim/logo.png
share/pixmaps/gaim/phone.png
share/pixmaps/gaim/smileys/
share/pixmaps/gaim/smileys/default/
share/pixmaps/gaim/smileys/default/angel.png
@ -320,6 +412,102 @@ share/pixmaps/gaim/smileys/default/msn_weird.png
share/pixmaps/gaim/smileys/default/msn_wink.gif
share/pixmaps/gaim/smileys/default/msn_xbox.png
share/pixmaps/gaim/smileys/default/oneeye.png
share/pixmaps/gaim/smileys/default/qq_smiley_0.gif
share/pixmaps/gaim/smileys/default/qq_smiley_1.gif
share/pixmaps/gaim/smileys/default/qq_smiley_10.gif
share/pixmaps/gaim/smileys/default/qq_smiley_11.gif
share/pixmaps/gaim/smileys/default/qq_smiley_12.gif
share/pixmaps/gaim/smileys/default/qq_smiley_13.gif
share/pixmaps/gaim/smileys/default/qq_smiley_14.gif
share/pixmaps/gaim/smileys/default/qq_smiley_15.gif
share/pixmaps/gaim/smileys/default/qq_smiley_16.gif
share/pixmaps/gaim/smileys/default/qq_smiley_17.gif
share/pixmaps/gaim/smileys/default/qq_smiley_18.gif
share/pixmaps/gaim/smileys/default/qq_smiley_19.gif
share/pixmaps/gaim/smileys/default/qq_smiley_2.gif
share/pixmaps/gaim/smileys/default/qq_smiley_20.gif
share/pixmaps/gaim/smileys/default/qq_smiley_21.gif
share/pixmaps/gaim/smileys/default/qq_smiley_22.gif
share/pixmaps/gaim/smileys/default/qq_smiley_23.gif
share/pixmaps/gaim/smileys/default/qq_smiley_24.gif
share/pixmaps/gaim/smileys/default/qq_smiley_25.gif
share/pixmaps/gaim/smileys/default/qq_smiley_26.gif
share/pixmaps/gaim/smileys/default/qq_smiley_27.gif
share/pixmaps/gaim/smileys/default/qq_smiley_28.gif
share/pixmaps/gaim/smileys/default/qq_smiley_29.gif
share/pixmaps/gaim/smileys/default/qq_smiley_3.gif
share/pixmaps/gaim/smileys/default/qq_smiley_30.gif
share/pixmaps/gaim/smileys/default/qq_smiley_31.gif
share/pixmaps/gaim/smileys/default/qq_smiley_32.gif
share/pixmaps/gaim/smileys/default/qq_smiley_33.gif
share/pixmaps/gaim/smileys/default/qq_smiley_34.gif
share/pixmaps/gaim/smileys/default/qq_smiley_35.gif
share/pixmaps/gaim/smileys/default/qq_smiley_36.gif
share/pixmaps/gaim/smileys/default/qq_smiley_37.gif
share/pixmaps/gaim/smileys/default/qq_smiley_38.gif
share/pixmaps/gaim/smileys/default/qq_smiley_39.gif
share/pixmaps/gaim/smileys/default/qq_smiley_4.gif
share/pixmaps/gaim/smileys/default/qq_smiley_40.gif
share/pixmaps/gaim/smileys/default/qq_smiley_41.gif
share/pixmaps/gaim/smileys/default/qq_smiley_42.gif
share/pixmaps/gaim/smileys/default/qq_smiley_43.gif
share/pixmaps/gaim/smileys/default/qq_smiley_44.gif
share/pixmaps/gaim/smileys/default/qq_smiley_45.gif
share/pixmaps/gaim/smileys/default/qq_smiley_46.gif
share/pixmaps/gaim/smileys/default/qq_smiley_47.gif
share/pixmaps/gaim/smileys/default/qq_smiley_48.gif
share/pixmaps/gaim/smileys/default/qq_smiley_49.gif
share/pixmaps/gaim/smileys/default/qq_smiley_5.gif
share/pixmaps/gaim/smileys/default/qq_smiley_50.gif
share/pixmaps/gaim/smileys/default/qq_smiley_51.gif
share/pixmaps/gaim/smileys/default/qq_smiley_52.gif
share/pixmaps/gaim/smileys/default/qq_smiley_53.gif
share/pixmaps/gaim/smileys/default/qq_smiley_54.gif
share/pixmaps/gaim/smileys/default/qq_smiley_55.gif
share/pixmaps/gaim/smileys/default/qq_smiley_56.gif
share/pixmaps/gaim/smileys/default/qq_smiley_57.gif
share/pixmaps/gaim/smileys/default/qq_smiley_58.gif
share/pixmaps/gaim/smileys/default/qq_smiley_59.gif
share/pixmaps/gaim/smileys/default/qq_smiley_6.gif
share/pixmaps/gaim/smileys/default/qq_smiley_60.gif
share/pixmaps/gaim/smileys/default/qq_smiley_61.gif
share/pixmaps/gaim/smileys/default/qq_smiley_62.gif
share/pixmaps/gaim/smileys/default/qq_smiley_63.gif
share/pixmaps/gaim/smileys/default/qq_smiley_64.gif
share/pixmaps/gaim/smileys/default/qq_smiley_65.gif
share/pixmaps/gaim/smileys/default/qq_smiley_66.gif
share/pixmaps/gaim/smileys/default/qq_smiley_67.gif
share/pixmaps/gaim/smileys/default/qq_smiley_68.gif
share/pixmaps/gaim/smileys/default/qq_smiley_69.gif
share/pixmaps/gaim/smileys/default/qq_smiley_7.gif
share/pixmaps/gaim/smileys/default/qq_smiley_70.gif
share/pixmaps/gaim/smileys/default/qq_smiley_71.gif
share/pixmaps/gaim/smileys/default/qq_smiley_72.gif
share/pixmaps/gaim/smileys/default/qq_smiley_73.gif
share/pixmaps/gaim/smileys/default/qq_smiley_74.gif
share/pixmaps/gaim/smileys/default/qq_smiley_75.gif
share/pixmaps/gaim/smileys/default/qq_smiley_76.gif
share/pixmaps/gaim/smileys/default/qq_smiley_77.gif
share/pixmaps/gaim/smileys/default/qq_smiley_78.gif
share/pixmaps/gaim/smileys/default/qq_smiley_79.gif
share/pixmaps/gaim/smileys/default/qq_smiley_8.gif
share/pixmaps/gaim/smileys/default/qq_smiley_80.gif
share/pixmaps/gaim/smileys/default/qq_smiley_81.gif
share/pixmaps/gaim/smileys/default/qq_smiley_82.gif
share/pixmaps/gaim/smileys/default/qq_smiley_83.gif
share/pixmaps/gaim/smileys/default/qq_smiley_84.gif
share/pixmaps/gaim/smileys/default/qq_smiley_85.gif
share/pixmaps/gaim/smileys/default/qq_smiley_86.gif
share/pixmaps/gaim/smileys/default/qq_smiley_87.gif
share/pixmaps/gaim/smileys/default/qq_smiley_88.gif
share/pixmaps/gaim/smileys/default/qq_smiley_89.gif
share/pixmaps/gaim/smileys/default/qq_smiley_9.gif
share/pixmaps/gaim/smileys/default/qq_smiley_90.gif
share/pixmaps/gaim/smileys/default/qq_smiley_91.gif
share/pixmaps/gaim/smileys/default/qq_smiley_92.gif
share/pixmaps/gaim/smileys/default/qq_smiley_93.gif
share/pixmaps/gaim/smileys/default/qq_smiley_94.gif
share/pixmaps/gaim/smileys/default/qq_smiley_95.gif
share/pixmaps/gaim/smileys/default/sad.png
share/pixmaps/gaim/smileys/default/scream.png
share/pixmaps/gaim/smileys/default/smile.png
@ -410,6 +598,18 @@ share/pixmaps/gaim/smileys/default/yell.png
share/pixmaps/gaim/smileys/none/
share/pixmaps/gaim/smileys/none/theme
share/pixmaps/gaim/status/
share/pixmaps/gaim/status-away.png
share/pixmaps/gaim/status-connect0.png
share/pixmaps/gaim/status-connect1.png
share/pixmaps/gaim/status-connect2.png
share/pixmaps/gaim/status-connect3.png
share/pixmaps/gaim/status-invisible.png
share/pixmaps/gaim/status-offline.png
share/pixmaps/gaim/status-online.png
share/pixmaps/gaim/status-typing0.png
share/pixmaps/gaim/status-typing1.png
share/pixmaps/gaim/status-typing2.png
share/pixmaps/gaim/status-typing3.png
share/pixmaps/gaim/status/default/
share/pixmaps/gaim/status/default/activebuddy.png
share/pixmaps/gaim/status/default/admin.png
@ -417,8 +617,10 @@ share/pixmaps/gaim/status/default/aim.png
share/pixmaps/gaim/status/default/aol.png
share/pixmaps/gaim/status/default/away.png
share/pixmaps/gaim/status/default/blocked.png
share/pixmaps/gaim/status/default/bonjour.png
share/pixmaps/gaim/status/default/dnd.png
share/pixmaps/gaim/status/default/extendedaway.png
share/pixmaps/gaim/status/default/extended_away.png
share/pixmaps/gaim/status/default/external.png
share/pixmaps/gaim/status/default/female.png
share/pixmaps/gaim/status/default/founder.png
share/pixmaps/gaim/status/default/freeforchat.png
@ -434,19 +636,119 @@ share/pixmaps/gaim/status/default/jabber.png
share/pixmaps/gaim/status/default/login.png
share/pixmaps/gaim/status/default/logout.png
share/pixmaps/gaim/status/default/male.png
share/pixmaps/gaim/status/default/meanwhile.png
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/nr.png
share/pixmaps/gaim/status/default/occupied.png
share/pixmaps/gaim/status/default/offline.png
share/pixmaps/gaim/status/default/op.png
share/pixmaps/gaim/status/default/rendezvous.png
share/pixmaps/gaim/status/default/pending.png
share/pixmaps/gaim/status/default/qq.png
share/pixmaps/gaim/status/default/qq_1.png
share/pixmaps/gaim/status/default/qq_10.png
share/pixmaps/gaim/status/default/qq_100.png
share/pixmaps/gaim/status/default/qq_11.png
share/pixmaps/gaim/status/default/qq_12.png
share/pixmaps/gaim/status/default/qq_13.png
share/pixmaps/gaim/status/default/qq_14.png
share/pixmaps/gaim/status/default/qq_15.png
share/pixmaps/gaim/status/default/qq_16.png
share/pixmaps/gaim/status/default/qq_17.png
share/pixmaps/gaim/status/default/qq_18.png
share/pixmaps/gaim/status/default/qq_19.png
share/pixmaps/gaim/status/default/qq_2.png
share/pixmaps/gaim/status/default/qq_20.png
share/pixmaps/gaim/status/default/qq_21.png
share/pixmaps/gaim/status/default/qq_22.png
share/pixmaps/gaim/status/default/qq_23.png
share/pixmaps/gaim/status/default/qq_24.png
share/pixmaps/gaim/status/default/qq_25.png
share/pixmaps/gaim/status/default/qq_26.png
share/pixmaps/gaim/status/default/qq_27.png
share/pixmaps/gaim/status/default/qq_28.png
share/pixmaps/gaim/status/default/qq_29.png
share/pixmaps/gaim/status/default/qq_3.png
share/pixmaps/gaim/status/default/qq_30.png
share/pixmaps/gaim/status/default/qq_31.png
share/pixmaps/gaim/status/default/qq_32.png
share/pixmaps/gaim/status/default/qq_33.png
share/pixmaps/gaim/status/default/qq_34.png
share/pixmaps/gaim/status/default/qq_35.png
share/pixmaps/gaim/status/default/qq_36.png
share/pixmaps/gaim/status/default/qq_37.png
share/pixmaps/gaim/status/default/qq_38.png
share/pixmaps/gaim/status/default/qq_39.png
share/pixmaps/gaim/status/default/qq_4.png
share/pixmaps/gaim/status/default/qq_40.png
share/pixmaps/gaim/status/default/qq_41.png
share/pixmaps/gaim/status/default/qq_42.png
share/pixmaps/gaim/status/default/qq_43.png
share/pixmaps/gaim/status/default/qq_44.png
share/pixmaps/gaim/status/default/qq_45.png
share/pixmaps/gaim/status/default/qq_46.png
share/pixmaps/gaim/status/default/qq_47.png
share/pixmaps/gaim/status/default/qq_48.png
share/pixmaps/gaim/status/default/qq_49.png
share/pixmaps/gaim/status/default/qq_5.png
share/pixmaps/gaim/status/default/qq_50.png
share/pixmaps/gaim/status/default/qq_51.png
share/pixmaps/gaim/status/default/qq_52.png
share/pixmaps/gaim/status/default/qq_53.png
share/pixmaps/gaim/status/default/qq_54.png
share/pixmaps/gaim/status/default/qq_55.png
share/pixmaps/gaim/status/default/qq_56.png
share/pixmaps/gaim/status/default/qq_57.png
share/pixmaps/gaim/status/default/qq_58.png
share/pixmaps/gaim/status/default/qq_59.png
share/pixmaps/gaim/status/default/qq_6.png
share/pixmaps/gaim/status/default/qq_60.png
share/pixmaps/gaim/status/default/qq_61.png
share/pixmaps/gaim/status/default/qq_62.png
share/pixmaps/gaim/status/default/qq_63.png
share/pixmaps/gaim/status/default/qq_64.png
share/pixmaps/gaim/status/default/qq_65.png
share/pixmaps/gaim/status/default/qq_66.png
share/pixmaps/gaim/status/default/qq_67.png
share/pixmaps/gaim/status/default/qq_68.png
share/pixmaps/gaim/status/default/qq_69.png
share/pixmaps/gaim/status/default/qq_7.png
share/pixmaps/gaim/status/default/qq_70.png
share/pixmaps/gaim/status/default/qq_71.png
share/pixmaps/gaim/status/default/qq_72.png
share/pixmaps/gaim/status/default/qq_73.png
share/pixmaps/gaim/status/default/qq_74.png
share/pixmaps/gaim/status/default/qq_75.png
share/pixmaps/gaim/status/default/qq_76.png
share/pixmaps/gaim/status/default/qq_77.png
share/pixmaps/gaim/status/default/qq_78.png
share/pixmaps/gaim/status/default/qq_79.png
share/pixmaps/gaim/status/default/qq_8.png
share/pixmaps/gaim/status/default/qq_80.png
share/pixmaps/gaim/status/default/qq_81.png
share/pixmaps/gaim/status/default/qq_82.png
share/pixmaps/gaim/status/default/qq_83.png
share/pixmaps/gaim/status/default/qq_84.png
share/pixmaps/gaim/status/default/qq_85.png
share/pixmaps/gaim/status/default/qq_86.png
share/pixmaps/gaim/status/default/qq_87.png
share/pixmaps/gaim/status/default/qq_88.png
share/pixmaps/gaim/status/default/qq_89.png
share/pixmaps/gaim/status/default/qq_9.png
share/pixmaps/gaim/status/default/qq_90.png
share/pixmaps/gaim/status/default/qq_91.png
share/pixmaps/gaim/status/default/qq_92.png
share/pixmaps/gaim/status/default/qq_93.png
share/pixmaps/gaim/status/default/qq_94.png
share/pixmaps/gaim/status/default/qq_95.png
share/pixmaps/gaim/status/default/qq_96.png
share/pixmaps/gaim/status/default/qq_97.png
share/pixmaps/gaim/status/default/qq_98.png
share/pixmaps/gaim/status/default/qq_99.png
share/pixmaps/gaim/status/default/secure.png
share/pixmaps/gaim/status/default/silc.png
share/pixmaps/gaim/status/default/trepia.png
share/pixmaps/gaim/status/default/simple.png
share/pixmaps/gaim/status/default/unavailable.png
share/pixmaps/gaim/status/default/voice.png
share/pixmaps/gaim/status/default/wireless.png
share/pixmaps/gaim/status/default/yahoo.png
@ -459,8 +761,9 @@ share/pixmaps/gaim/typed.png
share/pixmaps/gaim/typing.png
share/sounds/
share/sounds/gaim/
share/sounds/gaim/arrive.wav
share/sounds/gaim/leave.wav
@comment share/sounds/gaim/Makefile.mingw
share/sounds/gaim/alert.wav
share/sounds/gaim/login.wav
share/sounds/gaim/logout.wav
share/sounds/gaim/receive.wav
share/sounds/gaim/redalert.wav
share/sounds/gaim/send.wav