summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-01-26 19:52:37 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-01-26 19:52:37 +0000
commite49d5bb4a62a55c706f4fecc0b7a5d5476d8699d (patch)
treeb1f4c4d30d78be3b69cc1144e0e60dc064f3a6a4 /net-im
parentrepoman: Fix leading whitespace (diff)
downloadhistorical-e49d5bb4a62a55c706f4fecc0b7a5d5476d8699d.tar.gz
historical-e49d5bb4a62a55c706f4fecc0b7a5d5476d8699d.tar.bz2
historical-e49d5bb4a62a55c706f4fecc0b7a5d5476d8699d.zip
Version bumped along with the relevant patch; please see bug #39470 for more details.
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog11
-rw-r--r--net-im/gaim/Manifest37
-rw-r--r--net-im/gaim/files/digest-gaim-0.75-r71
-rw-r--r--net-im/gaim/files/gaim-0.75-yahoo-security.diff147
-rw-r--r--net-im/gaim/gaim-0.75-r7.ebuild107
5 files changed, 284 insertions, 19 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index e2121de5145e..b43521d2329f 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,13 +1,20 @@
# ChangeLog for net-im/gaim
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.123 2004/01/26 02:00:30 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.124 2004/01/26 19:52:24 plasmaroo Exp $
+
+*gaim-0.75-r7 (26 Jan 2004)
+
+ 26 Jan 2004; <plasmaroo@gentoo.org> gaim-0.75-r7.ebuild,
+ files/gaim-0.75-yahoo-security.diff:
+ Updated and patched for the recent security vulnerabilities; please see bug
+ #39470 for more details.
*gaim-0.75-r6 (25 Jan 2004)
25 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r6.ebuild,
files/gaim-0.76cvs-yahoo-login-fix.diff:
Revision bump to add patch to fix yahoo login. Thanks to Patrick McLean for
- getting diff out of gaim cvs. From bug 39380
+ getting diff out of gaim cvs. From bug #39380.
19 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r5.ebuild,
files/gaim-0.76cvs-signals-varargs.diff, files/gaim-0.76cvs-varargs.diff:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 01341cb24cd3..03ebbe19fbb6 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,26 +1,29 @@
-MD5 5fe791bbf70387b44fd2d1d5e857d5cc gaim-0.67.ebuild 2183
-MD5 b3e470f59582b9b3379db2326e647e77 gaim-0.72-r2.ebuild 3331
-MD5 670e0f5acb82e1065d1055f6d407cdb9 gaim-0.75-r5.ebuild 3309
-MD5 78be5b331aa107c0ef01b5252eb8c87e gaim-0.72-r1.ebuild 2890
-MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
-MD5 9b0c0eb504517576c7d18406c8c52324 gaim-0.74-r2.ebuild 3858
-MD5 c67abf03c49a8e44985b9d7380f7389a gaim-0.75-r6.ebuild 3363
-MD5 44ceec91b8c21f979eb709f71275924c ChangeLog 20917
+MD5 f5ab1a528be886cbd6138384eb07aa1f ChangeLog 21156
+MD5 698eb728b644c7a3cccc26c8f5ba4257 gaim-0.75-r5.ebuild 3317
+MD5 80abd46018d862034a68e35f529b24a7 gaim-0.72-r2.ebuild 3348
+MD5 44dae26df92312a61f4c67abcf8ec157 gaim-0.74-r2.ebuild 3875
+MD5 a471d34b5f3f474be96603e753adc756 gaim-0.75-r7.ebuild 3424
MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
+MD5 6dd218f20477b66873a258f2eca07afc gaim-0.72-r1.ebuild 2907
+MD5 3f7bea9735a86a7e6c6a4e13b4cd4eec gaim-0.67.ebuild 2200
+MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
+MD5 cd00ece1fa15bea82f97bae010288aa0 gaim-0.75-r6.ebuild 3371
MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
-MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
+MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
MD5 fd4cd0957e11c11fc6e0c72e10714e07 files/gaim-0.74-log_free.patch 1492
-MD5 4dbb9d0f8bf30e40f8b73215e14442ae files/gaim-0.74-scs-msg-yahoo.patch 776
+MD5 92a277b982fdceac85ee76228176660c files/gaim-0.76cvs-yahoo-login-fix.diff 4611
+MD5 24bfb2bbc9bef27fcc0f46639504b1c5 files/digest-gaim-0.74-r2 135
MD5 1ade161b6a07868398812aa91ac7115d files/gaim_cjk_gtkconv.patch 1126
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r7 63
+MD5 8f10c80828d074e32b033b80ca6c9c88 files/gaim-encryption-2.18-moz1.6.patch 3498
+MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
+MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
-MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
-MD5 24bfb2bbc9bef27fcc0f46639504b1c5 files/digest-gaim-0.74-r2 135
+MD5 4dbb9d0f8bf30e40f8b73215e14442ae files/gaim-0.74-scs-msg-yahoo.patch 776
MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r5 63
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r6 63
-MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
MD5 3eb868476154d28a1123ee91e41fef95 files/gaim-0.72-msn-fixes.patch 1671
MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
-MD5 92a277b982fdceac85ee76228176660c files/gaim-0.76cvs-yahoo-login-fix.diff 4611
+MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r6 63
MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
-MD5 8f10c80828d074e32b033b80ca6c9c88 files/gaim-encryption-2.18-moz1.6.patch 3498
+MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
diff --git a/net-im/gaim/files/digest-gaim-0.75-r7 b/net-im/gaim/files/digest-gaim-0.75-r7
new file mode 100644
index 000000000000..63510235452c
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.75-r7
@@ -0,0 +1 @@
+MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/gaim-0.75-yahoo-security.diff b/net-im/gaim/files/gaim-0.75-yahoo-security.diff
new file mode 100644
index 000000000000..7aa4ca70ff1e
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.75-yahoo-security.diff
@@ -0,0 +1,147 @@
+diff -ur gaim-0.75/src/proxy.c gaim-0.76-preSecurity.plasmaroo/src/proxy.c
+--- gaim-0.75/src/proxy.c 2004-01-10 04:04:56.000000000 +0000
++++ gaim-0.76-preSecurity.plasmaroo/src/proxy.c 2004-01-26 19:05:59.000000000 +0000
+@@ -974,7 +974,7 @@
+
+ gaim_input_remove(phb->inpa);
+
+- while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
++ while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
+ if (inputline[pos - 1] == '\n')
+ nlc++;
+ else if (inputline[pos - 1] != '\r')
+diff -ur gaim-0.75/src/util.c gaim-0.76-preSecurity.plasmaroo/src/util.c
+--- gaim-0.75/src/util.c 2004-01-10 04:04:56.000000000 +0000
++++ gaim-0.76-preSecurity.plasmaroo/src/util.c 2004-01-26 19:05:59.000000000 +0000
+@@ -247,24 +247,71 @@
+ /**************************************************************************
+ * Quoted Printable Functions
+ **************************************************************************/
+-void
+-gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
++static void hex(const char **p, const char *end, unsigned char *n)
+ {
+- char *p, *n, *new;
++ int i, c;
+
+- n = new = g_malloc(strlen (str) + 1);
++ for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
++ c <<= 4;
++ switch (**p) {
++ case '0': break;
++ case '1': c += 1; break;
++ case '2': c += 2; break;
++ case '3': c += 3; break;
++ case '4': c += 4; break;
++ case '5': c += 5; break;
++ case '6': c += 6; break;
++ case '7': c += 7; break;
++ case '8': c += 8; break;
++ case '9': c += 9; break;
++ case 'a': c += 10; break;
++ case 'b': c += 11; break;
++ case 'c': c += 12; break;
++ case 'd': c += 13; break;
++ case 'e': c += 14; break;
++ case 'f': c += 15; break;
++ case 'A': c += 10; break;
++ case 'B': c += 11; break;
++ case 'C': c += 12; break;
++ case 'D': c += 13; break;
++ case 'E': c += 14; break;
++ case 'F': c += 15; break;
++ default:
++ if (i == 0) {
++ *n = **p;
++ ++*p;
++ return;
++ }
++ c >>= 4;
++ goto done;
++ }
++ }
++done:
++ *n = (c > UCHAR_MAX) ? '?' : c;
++ return;
++}
+
+- for (p = (char *)str; *p; p++, n++) {
++void
++gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
++{
++ const char *p, *end;
++ unsigned char *n, *new;
++ size_t len;
++
++ len = strlen (str);
++ n = new = g_malloc(len + 1);
++ p = str;
++ end = &p[len];
++ while (p < end) {
+ if (*p == '=') {
+- sscanf(p + 1, "%2x\n", (int *)n);
+- p += 2;
+- }
+- else if (*p == '_')
++ ++p;
++ hex(&p, end, n);
++ } else if (*p == '_')
+ *n = ' ';
+ else
+ *n = *p;
++ ++n;
+ }
+-
+ *n = '\0';
+
+ if (ret_len)
+@@ -1962,7 +2009,7 @@
+ char **ret_path)
+ {
+ char scan_info[255];
+- char port_str[5];
++ char port_str[6];
+ int f;
+ const char *turl;
+ char host[256], path[256];
+@@ -1982,16 +2029,21 @@
+ }
+
+ g_snprintf(scan_info, sizeof(scan_info),
+- "%%[%s]:%%[%s]/%%[%s]", addr_ctrl, port_ctrl, page_ctrl);
++ "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
++ addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
++ port_ctrl[sizeof(port_ctrl)-1] = '\0';
++ page_ctrl[sizeof(page_ctrl)-1] = '\0';
+
+ f = sscanf(url, scan_info, host, port_str, path);
+
+ if (f == 1)
+ {
+ g_snprintf(scan_info, sizeof(scan_info),
+- "%%[%s]/%%[%s]",
++ "%%255[%s]/%%255[%s]",
+ addr_ctrl, page_ctrl);
+ f = sscanf(url, scan_info, host, path);
++ addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
++ page_ctrl[sizeof(page_ctrl)-1] = '\0';
+ g_snprintf(port_str, sizeof(port_str), "80");
+ }
+
+@@ -2081,9 +2133,14 @@
+ static size_t
+ parse_content_len(const char *data, size_t data_len)
+ {
+- size_t content_len = 0;
++ int content_len = 0;
++ char *tmp;
+
+- sscanf(data, "Content-Length: %d", (int *)&content_len);
++ tmp = g_malloc(data_len + 1);
++ memcpy(tmp, data, data_len);
++ tmp[data_len] = '\0';
++ sscanf(tmp, "Content-Length: %d", &content_len);
++ g_free(tmp);
+
+ return content_len;
+ }
diff --git a/net-im/gaim/gaim-0.75-r7.ebuild b/net-im/gaim/gaim-0.75-r7.ebuild
new file mode 100644
index 000000000000..2bfc6174a819
--- /dev/null
+++ b/net-im/gaim/gaim-0.75-r7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r7.ebuild,v 1.1 2004/01/26 19:52:24 plasmaroo Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="nls perl spell nas mozilla cjk debug ssl"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+
+DEPEND="=sys-libs/db-1*
+ >=x11-libs/gtk+-2.0
+ >=dev-libs/glib-2.0
+ nas? ( >=media-libs/nas-1.4.1-r1 )
+ sys-devel/gettext
+ media-libs/libao
+ >=media-libs/audiofile-0.2.0
+ perl? ( >=dev-lang/perl-5.6.1
+ >=sys-apps/sed-4.0.0 )
+ mozilla? ( net-www/mozilla )
+ !mozilla? ( dev-libs/nss )
+ spell? ( >=app-text/gtkspell-2.0.2 )"
+PDEPEND="ssl? ( net-im/gaim-encryption )"
+
+src_unpack() {
+ unpack ${P}.tar.bz2 || die
+ cd ${S}
+ epatch ${FILESDIR}/gaim-0.75-static-prpls.patch
+ epatch ${FILESDIR}/gaim-0.76cvs-signals-varargs.diff
+ epatch ${FILESDIR}/gaim-0.76cvs-yahoo-login-fix.diff
+ epatch ${FILESDIR}/gaim-0.75-yahoo-security.diff
+ use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+}
+
+src_compile() {
+ einfo "Replacing -Os CFLAG with -O2"
+ replace-flags -Os -O2
+ einfo "Filtering -fstack-protector"
+ filter-flags -fstack-protector
+
+ local myconf
+ use perl || myconf="${myconf} --disable-perl"
+ use spell || myconf="${myconf} --disable-gtkspell"
+ use nls || myconf="${myconf} --disable-nls"
+ use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+ use debug && myconf="${myconf} --enable-debug"
+
+ NSS_LIB=/usr/lib
+ NSS_INC=/usr/include
+ use mozilla || {
+ # Only need to specify this if no pkgconfig from mozilla
+ myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+ myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+ myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+ myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+ }
+
+ econf ${myconf} || die "Configuration failed"
+ use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
+
+ emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+ einstall || die "Install failed"
+ dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+
+ # Copy header files for gaim plugin use
+ dodir /usr/include/gaim/src
+ cp config.h ${D}/usr/include/gaim/
+ cd ${S}/src
+ #tar cf - `find . -name \*.h` | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+ tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+ assert "Failed to install header files to /usr/include/gaim"
+}
+
+pkg_postinst() {
+ if [ `use cjk` ]; then
+ ewarn
+ ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
+ ewarn "a patch for CJK support. Please be aware that this patch"
+ ewarn "causes problems with skkinput. kinput2 works fine. Details"
+ ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
+ ewarn
+ fi
+
+ if [ `use ssl` ]; then
+ einfo
+ einfo "The gaim-encryption package is now it's own package in portage"
+ einfo "To install it run:"
+ einfo
+ einfo "emerge gaim-encryption"
+ einfo
+ einfo "All of your existing gaim-encryption settings are still"
+ einfo "in place and will be recognized when gaim-encryption is"
+ einfo "installed. You may need to re-enable gaim-encryption in"
+ einfo "your gaim preferences."
+ einfo
+ fi
+}