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

upgrade to gaim 1.1.4

Browse Source 
fixes 3 security issues

CAN-2005-0472, CAN-2005-0473, CAN-2005-0208
This commit is contained in:
brad 2005-02-27 06:52:22 +00:00
parent 99f206e6b3
commit c5d2bde511
6 changed files with 87 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/gaim/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.73 2005/01/28 16:33:28 fgsch Exp $
# $OpenBSD: Makefile,v 1.74 2005/02/27 06:52:22 brad Exp $
SHARED_ONLY= Yes
COMMENT= "Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
DISTNAME= gaim-1.1.2
DISTNAME= gaim-1.1.4
CATEGORIES= net
HOMEPAGE= http://gaim.sourceforge.net/

8
net/gaim/distinfo
View File

@ -1,4 +1,4 @@
MD5 (gaim-1.1.2.tar.gz) = 5f11704ca01a86835a895f3f9459655b
RMD160 (gaim-1.1.2.tar.gz) = 99183a614daebed6d34baf7fcd4ba7aef2daac83
SHA1 (gaim-1.1.2.tar.gz) = a0ad0930ce823136a3748d0e852a4978e146ced0
SIZE (gaim-1.1.2.tar.gz) = 7642560
MD5 (gaim-1.1.4.tar.gz) = a10b894aad20d5d95ac20d1d2ed0e253
RMD160 (gaim-1.1.4.tar.gz) = ccbe4c41828e3fe4c46829fa9844c3e7564d1cf8
SHA1 (gaim-1.1.4.tar.gz) = 74fa88e4425bdd06d3329d166b8fe608c68b08fa
SIZE (gaim-1.1.4.tar.gz) = 7669920

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

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.4 2004/12/10 20:57:08 fgsch Exp $
--- config.h.in.orig Fri Dec 3 01:24:22 2004
+++ config.h.in Fri Dec 10 02:11:39 2004
@@ -139,6 +139,9 @@
$OpenBSD: patch-config_h_in,v 1.5 2005/02/27 06:52:22 brad Exp $
--- config.h.in.orig Thu Feb 24 21:43:40 2005
+++ config.h.in Sat Feb 26 23:01:07 2005
@@ -142,6 +142,9 @@
/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
#undef HAVE_GNUTLS_GNUTLS_H

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
--- configure.orig Fri Dec 3 01:24:48 2004
+++ configure Fri Dec 10 02:22:25 2004
$OpenBSD: patch-configure,v 1.19 2005/02/27 06:52:22 brad Exp $
--- configure.orig Thu Feb 24 21:44:01 2005
+++ configure Sat Feb 26 23:01:07 2005
@@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
ac_subst_files=''
# Initialize some variables set by options.
@@ -1059,6 +1059,7 @@ Optional Features:
@@ -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
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch 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
@@ -1092,6 +1093,8 @@ Optional Packages:
@@ -1093,6 +1094,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.18 2004/12/10 20:57:08 fgsch 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.
@@ -3698,12 +3701,10 @@ nto-qnx*)
@@ -3699,12 +3702,10 @@ nto-qnx*)
;;
openbsd*)
@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
fi
;;
@@ -5558,6 +5559,19 @@ else
@@ -5559,6 +5560,19 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
@ -62,7 +62,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch 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
@@ -7415,6 +7429,7 @@ if test -z "$aix_libpath"; then aix_libp
@@ -7416,6 +7430,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,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -8111,7 +8126,7 @@ nto-qnx*)
@@ -8112,7 +8127,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
@ -79,7 +79,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
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
@@ -10522,6 +10537,23 @@ if test -z "$aix_libpath"; then aix_libp
@@ -10523,6 +10538,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::"'
;;
@ -103,7 +103,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
osf3*)
case $cc_basename in
KCC)
@@ -27839,7 +27871,7 @@ fi
@@ -28205,7 +28237,7 @@ fi
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -112,7 +112,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch 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
@@ -31984,6 +32016,14 @@ fi
@@ -32569,6 +32601,14 @@ fi
@ -127,7 +127,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
# Check whether --enable-gnutls or --disable-gnutls was given.
if test "${enable_gnutls+set}" = set; then
enableval="$enable_gnutls"
@@ -32002,6 +32042,299 @@ fi;
@@ -32587,6 +32627,299 @@ fi;
msg_ssl="None"
@ -427,7 +427,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
prefix=`eval echo $prefix`
@@ -33181,12 +33514,20 @@ else
@@ -33766,12 +34099,20 @@ else
fi
@ -449,7 +449,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch Exp $
fi
if test "$enable_tcl" = yes; then
@@ -37014,6 +37355,13 @@ echo "$as_me: error: conditional \"USE_P
@@ -37604,6 +37945,13 @@ echo "$as_me: error: conditional \"USE_P
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@ -463,7 +463,7 @@ $OpenBSD: patch-configure,v 1.18 2004/12/10 20:57:08 fgsch 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
@@ -37866,6 +38214,10 @@ s,@PERL_LIBS@,$PERL_LIBS,;t t
@@ -38456,6 +38804,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

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

@ -1,7 +1,7 @@
$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,
$OpenBSD: patch-src_proxy_c,v 1.8 2005/02/27 06:52:22 brad Exp $
--- src/proxy.c.orig Sun Feb 20 15:16:54 2005
+++ src/proxy.c Sat Feb 26 23:01:08 2005
@@ -319,7 +319,7 @@ static void host_resolved(gpointer data,
int rc, err;
GSList *hosts = NULL;
struct sockaddr *addr = NULL;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_proxy_c,v 1.7 2004/09/17 02:07:35 brad Exp $
gaim_debug(GAIM_DEBUG_INFO, "dns", "Host '%s' resolved\n", req->host);
gaim_input_remove(req->inpa);
@@ -386,7 +386,7 @@ static void trap_gdb_bug()
@@ -387,7 +387,7 @@ static void trap_gdb_bug()
fputs("\n* * *\n",stderr);
fputs(message,stderr);
fputs("* * *\n\n",stderr);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_proxy_c,v 1.7 2004/09/17 02:07:35 brad Exp $
_exit(1);
}
@@ -427,7 +427,7 @@ gaim_dns_childthread(int child_out, int
@@ -428,7 +428,7 @@ gaim_dns_childthread(int child_out, int
char servname[20];
#else
struct sockaddr_in sin;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_proxy_c,v 1.7 2004/09/17 02:07:35 brad Exp $
#endif
#ifdef HAVE_SIGNAL_H
@@ -493,8 +493,7 @@ gaim_dns_childthread(int child_out, int
@@ -494,8 +494,7 @@ gaim_dns_childthread(int child_out, int
write(child_out, &zero, sizeof(zero));
tmp = res;
while(res) {

55
net/gaim/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.38 2005/01/05 17:07:44 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.39 2005/02/27 06:52:22 brad Exp $
bin/gaim
bin/gaim-remote
include/gaim/
@ -136,48 +136,101 @@ lib/pkgconfig/gaim.pc
@man man/man1/gaim.1
share/applications/
share/applications/gaim.desktop
share/locale/
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/LC_MESSAGES/gaim.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/gaim.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/gaim.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/gaim.mo
share/locale/en_AU/
share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/gaim.mo
share/locale/en_CA/LC_MESSAGES/gaim.mo
share/locale/en_GB/LC_MESSAGES/gaim.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
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/
share/locale/fr/LC_MESSAGES/
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/LC_MESSAGES/gaim.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/gaim.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/gaim.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/gaim.mo
share/locale/ko/
share/locale/ko/LC_MESSAGES/
share/locale/ko/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/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/gaim.mo
share/locale/no/
share/locale/no/LC_MESSAGES/
share/locale/no/LC_MESSAGES/gaim.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/gaim.mo
share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/gaim.mo
share/locale/pt_BR/
share/locale/pt_BR/LC_MESSAGES/
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/
share/locale/ru/LC_MESSAGES/
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/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/gaim.mo
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/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/tr/
share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/gaim.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/gaim.mo
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/