upgrade to gaim 0.82.1
This commit is contained in:
brad
parent
b797254efb
commit
78f515cd16
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.64 2004/09/15 18:17:40 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.65 2004/09/17 02:07:35 brad Exp $
|
||||
|
||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
|
||||
|
||||
DISTNAME= gaim-0.79
|
||||
DISTNAME= gaim-0.82.1
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://gaim.sourceforge.net/
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (gaim-0.79.tar.gz) = a17b20635dab80a7aec862ce69a22a0b
|
||||
RMD160 (gaim-0.79.tar.gz) = d69e0ab9309533ebee83eac23dff77b4cb02d4cc
|
||||
SHA1 (gaim-0.79.tar.gz) = 63fd254df68b9589eb23da69fe8bd96070023a76
|
||||
MD5 (gaim-0.82.1.tar.gz) = 16cfc29a95543fbc6825e648868b9761
|
||||
RMD160 (gaim-0.82.1.tar.gz) = c8a3f627551286120ad0e5d402b3452699da98da
|
||||
SHA1 (gaim-0.82.1.tar.gz) = bfc6607bf0ce4fa030e38bf85eefbaef0465d53f
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.2 2004/06/02 19:16:26 brad Exp $
|
||||
--- config.h.in.orig 2004-05-30 13:19:23.000000000 -0400
|
||||
+++ config.h.in 2004-05-31 23:59:17.000000000 -0400
|
||||
@@ -119,6 +119,9 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.3 2004/09/17 02:07:35 brad Exp $
|
||||
--- config.h.in.orig Fri Jul 16 07:34:01 2004
|
||||
+++ config.h.in Wed Jul 21 11:01:16 2004
|
||||
@@ -136,6 +136,9 @@
|
||||
/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
|
||||
#undef HAVE_GNUTLS_GNUTLS_H
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
--- configure.orig Thu Jun 24 20:51:28 2004
|
||||
+++ configure Sat Aug 28 20:24:03 2004
|
||||
@@ -463,7 +463,7 @@ ac_includes_default="\
|
||||
$OpenBSD: patch-configure,v 1.16 2004/09/17 02:07:35 brad Exp $
|
||||
--- configure.orig Fri Aug 27 00:11:36 2004
|
||||
+++ configure Sat Aug 28 19:46:54 2004
|
||||
@@ -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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot 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 ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB SILC_INCLUDES LIBOBJS 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 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 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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot 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 ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB SILC_INCLUDES LIBOBJS 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 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_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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot 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 ALLOCA GLIBC21 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 SILC_INCLUDES LIBOBJS 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 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 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 AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot 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 ALLOCA GLIBC21 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 SILC_INCLUDES LIBOBJS 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 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.
|
||||
@@ -1058,6 +1058,7 @@ Optional Features:
|
||||
@@ -1059,6 +1059,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
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
--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
|
||||
@@ -1089,6 +1090,8 @@ Optional Packages:
|
||||
@@ -1090,6 +1091,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.15 2004/08/29 12:53:57 espie 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.
|
||||
@@ -3569,12 +3572,10 @@ nto-qnx)
|
||||
@@ -3679,12 +3682,10 @@ nto-qnx*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -5330,6 +5331,19 @@ else
|
||||
@@ -5534,6 +5535,19 @@ else
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
@ -62,7 +62,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -7160,6 +7174,7 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
@@ -7391,6 +7405,7 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
@ -70,7 +70,16 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
@@ -10109,6 +10124,23 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
@@ -8087,7 +8102,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -10498,6 +10513,23 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
@ -94,7 +103,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -24125,7 +24157,7 @@ SILC_LIBS=""
|
||||
@@ -27709,7 +27741,7 @@ SILC_LIBS=""
|
||||
if test "$ac_silc_libs" != "no"; then
|
||||
SILC_LIBS="-L$ac_silc_libs"
|
||||
fi
|
||||
@ -103,7 +112,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
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
|
||||
@@ -27930,6 +27962,14 @@ fi
|
||||
@@ -31852,6 +31884,14 @@ fi
|
||||
|
||||
|
||||
|
||||
@ -118,7 +127,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
# Check whether --enable-gnutls or --disable-gnutls was given.
|
||||
if test "${enable_gnutls+set}" = set; then
|
||||
enableval="$enable_gnutls"
|
||||
@@ -27948,6 +27988,299 @@ fi;
|
||||
@@ -31870,6 +31910,299 @@ fi;
|
||||
|
||||
msg_ssl="None"
|
||||
|
||||
@ -418,7 +427,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
if test "x$enable_gnutls" != "xno"; then
|
||||
enable_gnutls="no"
|
||||
prefix=`eval echo $prefix`
|
||||
@@ -29063,12 +29396,20 @@ else
|
||||
@@ -33049,12 +33382,20 @@ else
|
||||
fi
|
||||
|
||||
|
||||
@ -440,7 +449,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie Exp $
|
||||
fi
|
||||
|
||||
if test "$enable_tcl" = yes; then
|
||||
@@ -32506,6 +32847,13 @@ echo "$as_me: error: conditional \"USE_P
|
||||
@@ -36820,6 +37161,13 @@ echo "$as_me: error: conditional \"USE_P
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
@ -454,7 +463,7 @@ $OpenBSD: patch-configure,v 1.15 2004/08/29 12:53:57 espie 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
|
||||
@@ -33349,6 +33697,10 @@ s,@PERL_LIBS@,$PERL_LIBS,;t t
|
||||
@@ -37669,6 +38017,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-ltmain_sh,v 1.5 2004/08/29 12:53:57 espie Exp $
|
||||
--- ltmain.sh.orig Thu Jun 24 20:50:52 2004
|
||||
+++ ltmain.sh Sat Aug 28 20:32:44 2004
|
||||
@@ -2089,10 +2089,17 @@ EOF
|
||||
$OpenBSD: patch-ltmain_sh,v 1.6 2004/09/17 02:07:35 brad Exp $
|
||||
--- ltmain.sh.orig Fri Aug 27 00:32:24 2004
|
||||
+++ ltmain.sh Thu Sep 16 21:59:34 2004
|
||||
@@ -2154,10 +2154,17 @@ EOF
|
||||
absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
@ -23,7 +23,7 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/29 12:53:57 espie Exp $
|
||||
fi # $installed = yes
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
@@ -2403,7 +2410,7 @@ EOF
|
||||
@@ -2471,7 +2478,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -32,9 +32,9 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/29 12:53:57 espie Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5705,40 +5712,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5827,40 +5834,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
- $echo "Libraries have been installed in:"
|
||||
@ -70,6 +70,6 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2004/08/29 12:53:57 espie Exp $
|
||||
- $echo "See any operating system documentation about shared libraries for"
|
||||
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
|
||||
@ -1,7 +1,36 @@
|
||||
$OpenBSD: patch-plugins_ssl_Makefile_in,v 1.3 2004/06/02 19:16:26 brad Exp $
|
||||
--- plugins/ssl/Makefile.in.orig 2004-05-30 13:18:41.000000000 -0400
|
||||
+++ plugins/ssl/Makefile.in 2004-06-01 00:11:18.000000000 -0400
|
||||
@@ -158,6 +158,8 @@ MSGMERGE = @MSGMERGE@
|
||||
$OpenBSD: patch-plugins_ssl_Makefile_in,v 1.4 2004/09/17 02:07:35 brad Exp $
|
||||
--- plugins/ssl/Makefile.in.orig Thu Aug 5 23:25:50 2004
|
||||
+++ plugins/ssl/Makefile.in Sat Aug 21 00:24:39 2004
|
||||
@@ -53,6 +53,10 @@ am__installdirs = "$(DESTDIR)$(plugindir
|
||||
pluginLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(plugin_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(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)
|
||||
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
|
||||
@PLUGINS_TRUE@am_ssl_gnutls_la_OBJECTS = ssl-gnutls.lo
|
||||
@@ -68,7 +72,7 @@ ssl_la_OBJECTS = $(am_ssl_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ssl-gnutls.Plo \
|
||||
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ssl-openssl.Plo ./$(DEPDIR)/ssl-gnutls.Plo \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/ssl-nss.Plo ./$(DEPDIR)/ssl.Plo
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
@@ -80,7 +84,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
|
||||
$(ssl_la_SOURCES)
|
||||
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
|
||||
+DIST_SOURCES = $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_gnutls_la_SOURCES_DIST) \
|
||||
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
@@ -209,6 +213,8 @@ MSGMERGE = @MSGMERGE@
|
||||
NSS_CFLAGS = @NSS_CFLAGS@
|
||||
NSS_LIBS = @NSS_LIBS@
|
||||
OBJEXT = @OBJEXT@
|
||||
@ -10,31 +39,28 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.3 2004/06/02 19:16:26 brad Exp $
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
@@ -292,19 +294,23 @@ EXTRA_DIST = \
|
||||
plugindir = $(libdir)/gaim
|
||||
@@ -342,16 +348,20 @@ 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
|
||||
|
||||
@PLUGINS_TRUE@plugin_LTLIBRARIES = \
|
||||
@PLUGINS_TRUE@ ssl.la \
|
||||
+@PLUGINS_TRUE@ ssl-openssl.la \
|
||||
+@PLUGINS_TRUE@ ssl-openssl.la \
|
||||
@PLUGINS_TRUE@ ssl-gnutls.la \
|
||||
@PLUGINS_TRUE@ ssl-nss.la
|
||||
|
||||
|
||||
@PLUGINS_TRUE@ssl_la_SOURCES = ssl.c
|
||||
+@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)
|
||||
|
||||
@@ -315,6 +321,7 @@ AM_CPPFLAGS = \
|
||||
AM_CPPFLAGS = \
|
||||
@@ -361,6 +371,7 @@ AM_CPPFLAGS = \
|
||||
$(DEBUG_CFLAGS) \
|
||||
$(GTK_CFLAGS) \
|
||||
$(PLUGIN_CFLAGS) \
|
||||
@ -42,37 +68,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.3 2004/06/02 19:16:26 brad Exp $
|
||||
$(NSS_CFLAGS) \
|
||||
$(GNUTLS_CFLAGS)
|
||||
|
||||
@@ -325,6 +332,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
LTLIBRARIES = $(plugin_LTLIBRARIES)
|
||||
|
||||
+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES =
|
||||
+@PLUGINS_FALSE@ssl_openssl_la_DEPENDENCIES =
|
||||
+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 =
|
||||
@PLUGINS_FALSE@ssl_gnutls_la_DEPENDENCIES =
|
||||
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
|
||||
@@ -344,7 +356,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ssl-gnutls.Plo \
|
||||
-@AMDEP_TRUE@ ./$(DEPDIR)/ssl-nss.Plo ./$(DEPDIR)/ssl.Plo
|
||||
+@AMDEP_TRUE@ ./$(DEPDIR)/ssl-nss.Plo ./$(DEPDIR)/ssl.Plo ./$(DEPDIR)/ssl-openssl.Plo
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
|
||||
@@ -353,7 +365,7 @@ CCLD = $(CC)
|
||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
|
||||
- $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
|
||||
+ $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST) $(am__ssl_openssl_la_SOURCES_DIST)
|
||||
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
|
||||
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) $(ssl_la_SOURCES)
|
||||
|
||||
@@ -394,6 +406,8 @@ clean-pluginLTLIBRARIES:
|
||||
@@ -424,6 +435,8 @@ clean-pluginLTLIBRARIES:
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
@ -81,7 +77,7 @@ $OpenBSD: patch-plugins_ssl_Makefile_in,v 1.3 2004/06/02 19:16:26 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)
|
||||
@@ -407,6 +421,7 @@ mostlyclean-compile:
|
||||
@@ -437,6 +450,7 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.5 2004/06/25 20:52:10 brad Exp $
|
||||
--- src/Makefile.in.orig 2004-06-24 18:51:32.000000000 -0600
|
||||
+++ src/Makefile.in 2004-06-25 13:20:20.000000000 -0600
|
||||
@@ -620,7 +620,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)
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.6 2004/09/17 02:07:35 brad Exp $
|
||||
--- src/Makefile.in.orig Thu Aug 26 18:29:27 2004
|
||||
+++ src/Makefile.in Fri Aug 27 22:12:38 2004
|
||||
@@ -132,7 +132,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
|
||||
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||
$(AM_CFLAGS) $(CFLAGS)
|
||||
-CCLD = $(CC)
|
||||
+CCLD = $(CXX)
|
||||
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_SOURCES = $(gaim_SOURCES) $(gaim_remote_SOURCES)
|
||||
SOURCES = $(gaim_SOURCES) $(gaim_remote_SOURCES)
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-src_protocols_msn_slp_c,v 1.1 2004/08/14 00:27:06 robert Exp $
|
||||
--- src/protocols/msn/slp.c.orig Tue Jun 15 04:37:25 2004
|
||||
+++ src/protocols/msn/slp.c Fri Aug 13 00:04:47 2004
|
||||
@@ -645,8 +645,12 @@
|
||||
if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
|
||||
(c = strchr(status, '\0')))
|
||||
{
|
||||
- strncpy(temp, status, c - status);
|
||||
- temp[c - status] = '\0';
|
||||
+ size_t offset = c - status;
|
||||
+ if (offset >= sizeof(temp))
|
||||
+ offset = sizeof(temp) - 1;
|
||||
+
|
||||
+ strncpy(temp, status, offset);
|
||||
+ temp[offset] = '\0';
|
||||
}
|
||||
|
||||
gaim_debug_error("msn", "Received non-OK result: %s\n", temp);
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_proxy_c,v 1.6 2004/06/25 20:52:10 brad Exp $
|
||||
--- src/proxy.c.orig 2004-06-06 22:00:57.000000000 -0600
|
||||
+++ src/proxy.c 2004-06-25 13:20:21.000000000 -0600
|
||||
$OpenBSD: patch-src_proxy_c,v 1.7 2004/09/17 02:07:35 brad Exp $
|
||||
--- src/proxy.c.orig Tue Aug 3 21:51:22 2004
|
||||
+++ src/proxy.c Fri Aug 20 23:57:04 2004
|
||||
@@ -318,7 +318,7 @@ static void host_resolved(gpointer data,
|
||||
int rc, err;
|
||||
GSList *hosts = NULL;
|
||||
@ -19,22 +19,22 @@ $OpenBSD: patch-src_proxy_c,v 1.6 2004/06/25 20:52:10 brad Exp $
|
||||
_exit(1);
|
||||
}
|
||||
|
||||
@@ -480,7 +480,7 @@ int gaim_gethostbyname_async(const char
|
||||
char servname[20];
|
||||
@@ -427,7 +427,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);
|
||||
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;
|
||||
}
|
||||
@@ -493,8 +493,7 @@ gaim_dns_childthread(int child_out, int
|
||||
write(child_out, &zero, sizeof(zero));
|
||||
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;
|
||||
}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.25 2004/09/15 18:17:40 espie Exp $
|
||||
lib/gaim/
|
||||
lib/gaim/autorecon.so
|
||||
lib/gaim/docklet.so
|
||||
lib/gaim/extplacement.so
|
||||
lib/gaim/gaim-remote.so
|
||||
lib/gaim/gestures.so
|
||||
lib/gaim/history.so
|
||||
lib/gaim/iconaway.so
|
||||
lib/gaim/idle.so
|
||||
lib/gaim/libgg.so
|
||||
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/libsilcgaim.so
|
||||
lib/gaim/libyahoo.so
|
||||
lib/gaim/libzephyr.so
|
||||
lib/gaim/notify.so
|
||||
lib/gaim/relnot.so
|
||||
lib/gaim/spellchk.so
|
||||
lib/gaim/ssl-gnutls.so
|
||||
lib/gaim/ssl-nss.so
|
||||
lib/gaim/ssl-openssl.so
|
||||
lib/gaim/ssl.so
|
||||
lib/gaim/statenotify.so
|
||||
lib/gaim/ticker.so
|
||||
lib/gaim/timestamp.so
|
||||
@lib lib/libgaim-remote.so.0.0
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.34 2004/09/15 18:17:40 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.35 2004/09/17 02:07:35 brad Exp $
|
||||
bin/gaim
|
||||
bin/gaim-remote
|
||||
include/gaim/
|
||||
@ -24,11 +24,12 @@ include/gaim/gtkcellrendererprogress.h
|
||||
include/gaim/gtkconn.h
|
||||
include/gaim/gtkconv.h
|
||||
include/gaim/gtkdebug.h
|
||||
include/gaim/gtkdialogs.h
|
||||
include/gaim/gtkeventloop.h
|
||||
include/gaim/gtkft.h
|
||||
include/gaim/gtkgaim.h
|
||||
include/gaim/gtkimhtml.h
|
||||
include/gaim/gtkimhtmltoolbar.h
|
||||
include/gaim/gtkinternal.h
|
||||
include/gaim/gtklog.h
|
||||
include/gaim/gtknotify.h
|
||||
include/gaim/gtkplugin.h
|
||||
@ -45,7 +46,6 @@ include/gaim/imgstore.h
|
||||
include/gaim/internal.h
|
||||
include/gaim/log.h
|
||||
include/gaim/md5.h
|
||||
include/gaim/multi.h
|
||||
include/gaim/network.h
|
||||
include/gaim/notify.h
|
||||
include/gaim/plugin.h
|
||||
@ -67,40 +67,68 @@ include/gaim/sslconn.h
|
||||
include/gaim/status.h
|
||||
include/gaim/stock.h
|
||||
include/gaim/stringref.h
|
||||
include/gaim/ui.h
|
||||
include/gaim/util.h
|
||||
include/gaim/value.h
|
||||
include/gaim/xmlnode.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/gestures.la
|
||||
lib/gaim/gestures.so
|
||||
@comment lib/gaim/history.la
|
||||
lib/gaim/history.so
|
||||
@comment lib/gaim/iconaway.la
|
||||
lib/gaim/iconaway.so
|
||||
@comment lib/gaim/idle.la
|
||||
lib/gaim/idle.so
|
||||
@comment lib/gaim/libgg.la
|
||||
lib/gaim/libgg.so
|
||||
@comment lib/gaim/libirc.la
|
||||
lib/gaim/libirc.so
|
||||
@comment lib/gaim/libjabber.la
|
||||
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/libsilcgaim.la
|
||||
lib/gaim/libsilcgaim.so
|
||||
@comment lib/gaim/libyahoo.la
|
||||
lib/gaim/libyahoo.so
|
||||
@comment lib/gaim/libzephyr.la
|
||||
lib/gaim/libzephyr.so
|
||||
@comment lib/gaim/notify.la
|
||||
lib/gaim/notify.so
|
||||
@comment lib/gaim/relnot.la
|
||||
lib/gaim/relnot.so
|
||||
@comment lib/gaim/spellchk.la
|
||||
lib/gaim/spellchk.so
|
||||
@comment lib/gaim/ssl-gnutls.la
|
||||
lib/gaim/ssl-gnutls.so
|
||||
@comment lib/gaim/ssl-nss.la
|
||||
lib/gaim/ssl-nss.so
|
||||
@comment lib/gaim/ssl-openssl.la
|
||||
lib/gaim/ssl-openssl.so
|
||||
@comment lib/gaim/ssl.la
|
||||
lib/gaim/ssl.so
|
||||
@comment lib/gaim/statenotify.la
|
||||
lib/gaim/statenotify.so
|
||||
@comment lib/gaim/ticker.la
|
||||
lib/gaim/ticker.so
|
||||
@comment lib/gaim/timestamp.la
|
||||
@comment lib/libgaim-remote.la
|
||||
lib/pkgconfig/
|
||||
lib/gaim/timestamp.so
|
||||
lib/libgaim-remote.la
|
||||
@lib lib/libgaim-remote.so.0.0
|
||||
lib/pkgconfig/gaim.pc
|
||||
@man man/man1/gaim-remote.1
|
||||
@man man/man1/gaim.1
|
||||
@ -109,6 +137,8 @@ share/applications/gaim.desktop
|
||||
share/locale/am/
|
||||
share/locale/am/LC_MESSAGES/
|
||||
share/locale/am/LC_MESSAGES/gaim.mo
|
||||
share/locale/bg/
|
||||
share/locale/bg/LC_MESSAGES/
|
||||
share/locale/bg/LC_MESSAGES/gaim.mo
|
||||
share/locale/ca/
|
||||
share/locale/ca/LC_MESSAGES/
|
||||
@ -123,16 +153,25 @@ share/locale/en_GB/
|
||||
share/locale/en_GB/LC_MESSAGES/
|
||||
share/locale/en_GB/LC_MESSAGES/gaim.mo
|
||||
share/locale/es/LC_MESSAGES/gaim.mo
|
||||
share/locale/fi/
|
||||
share/locale/fi/LC_MESSAGES/
|
||||
share/locale/fi/LC_MESSAGES/gaim.mo
|
||||
share/locale/fr/LC_MESSAGES/gaim.mo
|
||||
share/locale/he/
|
||||
share/locale/he/LC_MESSAGES/
|
||||
share/locale/he/LC_MESSAGES/gaim.mo
|
||||
share/locale/hi/
|
||||
share/locale/hi/LC_MESSAGES/
|
||||
share/locale/hi/LC_MESSAGES/gaim.mo
|
||||
share/locale/hu/
|
||||
share/locale/hu/LC_MESSAGES/
|
||||
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/lt/
|
||||
share/locale/lt/LC_MESSAGES/
|
||||
share/locale/lt/LC_MESSAGES/gaim.mo
|
||||
share/locale/mk/
|
||||
share/locale/mk/LC_MESSAGES/
|
||||
share/locale/mk/LC_MESSAGES/gaim.mo
|
||||
@ -141,8 +180,12 @@ share/locale/no/LC_MESSAGES/gaim.mo
|
||||
share/locale/pl/LC_MESSAGES/gaim.mo
|
||||
share/locale/pt/LC_MESSAGES/gaim.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/gaim.mo
|
||||
share/locale/ro/
|
||||
share/locale/ro/LC_MESSAGES/
|
||||
share/locale/ro/LC_MESSAGES/gaim.mo
|
||||
share/locale/ru/LC_MESSAGES/gaim.mo
|
||||
share/locale/sk/
|
||||
share/locale/sk/LC_MESSAGES/
|
||||
share/locale/sk/LC_MESSAGES/gaim.mo
|
||||
share/locale/sl/LC_MESSAGES/gaim.mo
|
||||
share/locale/sr/
|
||||
@ -155,7 +198,11 @@ share/locale/sv/LC_MESSAGES/gaim.mo
|
||||
share/locale/vi/
|
||||
share/locale/vi/LC_MESSAGES/
|
||||
share/locale/vi/LC_MESSAGES/gaim.mo
|
||||
share/locale/zh_CN/
|
||||
share/locale/zh_CN/LC_MESSAGES/
|
||||
share/locale/zh_CN/LC_MESSAGES/gaim.mo
|
||||
share/locale/zh_TW/
|
||||
share/locale/zh_TW/LC_MESSAGES/
|
||||
share/locale/zh_TW/LC_MESSAGES/gaim.mo
|
||||
share/pixmaps/
|
||||
share/pixmaps/gaim/
|
||||
@ -389,11 +436,14 @@ share/pixmaps/gaim/status/default/away.png
|
||||
share/pixmaps/gaim/status/default/dnd.png
|
||||
share/pixmaps/gaim/status/default/extendedaway.png
|
||||
share/pixmaps/gaim/status/default/female.png
|
||||
share/pixmaps/gaim/status/default/founder.png
|
||||
share/pixmaps/gaim/status/default/freeforchat.png
|
||||
share/pixmaps/gaim/status/default/gadu-gadu.png
|
||||
share/pixmaps/gaim/status/default/game.png
|
||||
share/pixmaps/gaim/status/default/halfop.png
|
||||
share/pixmaps/gaim/status/default/hiptop.png
|
||||
share/pixmaps/gaim/status/default/icq.png
|
||||
share/pixmaps/gaim/status/default/ignored.png
|
||||
share/pixmaps/gaim/status/default/invisible.png
|
||||
share/pixmaps/gaim/status/default/irc.png
|
||||
share/pixmaps/gaim/status/default/jabber.png
|
||||
@ -407,10 +457,12 @@ 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/op.png
|
||||
share/pixmaps/gaim/status/default/rendezvous.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/voice.png
|
||||
share/pixmaps/gaim/status/default/wireless.png
|
||||
share/pixmaps/gaim/status/default/yahoo.png
|
||||
share/pixmaps/gaim/status/default/zephyr.png
|
||||
@ -427,4 +479,3 @@ share/sounds/gaim/leave.wav
|
||||
share/sounds/gaim/receive.wav
|
||||
share/sounds/gaim/redalert.wav
|
||||
share/sounds/gaim/send.wav
|
||||
%%SHARED%%
|
||||
|
||||
Loading…
Reference in New Issue
Block a user