add patch for #76665

9 files changed, 176 insertions, 26 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index e8f41ab17ec7..2423fb0fcff6 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/dillo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.9 2004/12/27 14:55:02 gustavoz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.10 2005/01/06 16:24:50 taviso Exp $
+
+*dillo-0.8.3-r4 (06 Jan 2005)
+
+  06 Jan 2005; Tavis Ormandy <taviso@gentoo.org>
+  +files/dillo-format-string-vulnerability.diff, +dillo-0.8.3-r4.ebuild:
+  add patch for #76665
 
   27 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> dillo-0.8.3-r3.ebuild:
   Stable on sparc
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 7e2fcf5ccdc1..7ad715fde39b 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 de111f40fdf899d8898acc7072eada79 ChangeLog 9172
-MD5 7f2bb92ac717537bf6e4bf64e0d14243 dillo-0.7.3-r7.ebuild 3071
-MD5 619fe4d656815f4dfd82e327b3185135 dillo-0.8.0-r5.ebuild 3407
-MD5 558d10e8224da11b0cc6faf9b08ff1f2 dillo-0.8.3.ebuild 3475
+MD5 f21b4ddabc98e88e9a1417336531a37e dillo-0.8.0-r5.ebuild 3407
+MD5 8eb7501c8f2f337145845593faeba930 dillo-0.8.3-r3.ebuild 3580
+MD5 18a9f26be711130a947219f4432fe069 dillo-0.8.3.ebuild 3475
+MD5 2e853f9207a33d2fd352132561c48e6a dillo-0.7.3-r7.ebuild 3072
+MD5 4fc1e2923e0c7813f33a1346dfbdfbde ChangeLog 9348
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 36a2d37d218831027a2cc5ec972638d1 dillo-0.8.3-r3.ebuild 3582
+MD5 9cd1c85eb212177f59519b6b68303af3 dillo-0.8.3-r4.ebuild 3640
+MD5 ba28c8a3ac90eda9150e386ab318bbcd files/digest-dillo-0.8.3 220
+MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
 MD5 e257387d2c71e79a44b93b59e5240db3 files/digest-dillo-0.7.3-r7 226
 MD5 95d879f408936b0b61006a6a55a3f68d files/digest-dillo-0.8.0-r5 226
-MD5 ba28c8a3ac90eda9150e386ab318bbcd files/digest-dillo-0.8.3 220
 MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r3 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0CJKKRy60XGEcJIRAsllAKCIjlLuYR0PtcFnHAP6jjwEsapCbwCgmX/r
-IXIyUTIiiYINaUwcqPtWMQc=
-=4w/c
------END PGP SIGNATURE-----
+MD5 e5d887ebabc4b20dc1ba0d268bb90291 files/digest-dillo-0.8.3-r4 226
diff --git a/www-client/dillo/dillo-0.7.3-r7.ebuild b/www-client/dillo/dillo-0.7.3-r7.ebuild
index e714d6c165ee..3c0d43b75f11 100644
--- a/www-client/dillo/dillo-0.7.3-r7.ebuild
+++ b/www-client/dillo/dillo-0.7.3-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.7.3-r7.ebuild,v 1.1 2004/09/08 13:53:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.7.3-r7.ebuild,v 1.2 2005/01/06 16:24:50 taviso Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/www-client/dillo/dillo-0.8.0-r5.ebuild b/www-client/dillo/dillo-0.8.0-r5.ebuild
index c24d793a27b2..5ffc50411bd9 100644
--- a/www-client/dillo/dillo-0.8.0-r5.ebuild
+++ b/www-client/dillo/dillo-0.8.0-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.0-r5.ebuild,v 1.2 2004/11/08 15:23:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.0-r5.ebuild,v 1.3 2005/01/06 16:24:50 taviso Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/www-client/dillo/dillo-0.8.3-r3.ebuild b/www-client/dillo/dillo-0.8.3-r3.ebuild
index 8ed9488de423..48821b1a3ae1 100644
--- a/www-client/dillo/dillo-0.8.3-r3.ebuild
+++ b/www-client/dillo/dillo-0.8.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3-r3.ebuild,v 1.4 2004/12/27 14:55:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3-r3.ebuild,v 1.5 2005/01/06 16:24:50 taviso Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/www-client/dillo/dillo-0.8.3-r4.ebuild b/www-client/dillo/dillo-0.8.3-r4.ebuild
new file mode 100644
index 000000000000..89e17f305138
--- /dev/null
+++ b/www-client/dillo/dillo-0.8.3-r4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3-r4.ebuild,v 1.1 2005/01/06 16:24:50 taviso Exp $
+
+inherit flag-o-matic eutils
+
+S2=${WORKDIR}/dillo-gentoo-extras-patch4
+DILLO_I18N_P="${P}-i18n-misc-20041206"
+
+DESCRIPTION="Lean GTK+-based web browser"
+HOMEPAGE="http://www.dillo.org/"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/dillo-gentoo-extras-patch4.tar.bz2
+	http://teki.jpn.ph/pc/software/${DILLO_I18N_P}.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64 ~mips ~arm ~ppc64"
+MISC_IUSE="nls truetype"
+IUSE="${MISC_IUSE} ipv6 ssl"
+
+RDEPEND="=x11-libs/gtk+-1.2*
+	>=media-libs/jpeg-6b
+	>=sys-libs/zlib-1.1.3
+	>=media-libs/libpng-1.2.1
+	ssl? ( dev-libs/openssl )"
+DEPEND="sys-devel/autoconf
+	sys-devel/automake
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ../${DILLO_I18N_P}.diff
+	epatch ${FILESDIR}/dillo-format-string-vulnerability.diff
+
+	if [ "${DILLO_ICONSET}" = "kde" ]
+	then
+		einfo "Using Konqueror style icon set"
+		cp ${S2}/pixmaps.konq.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "gnome" ]
+	then
+		einfo "Using Ximian style icon set"
+		cp ${S2}/pixmaps.ximian.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "mozilla" ]
+	then
+		einfo "Using Netscape style icon set"
+		cp ${S2}/pixmaps.netscape.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "cobalt" ]
+	then
+		einfo "Using Cobalt style icon set"
+		cp ${S2}/pixmaps.cobalt.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "bold" ]
+	then
+		einfo "Using bold style icon set"
+		cp ${S2}/pixmaps.bold.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trans" ]
+	then
+		einfo "Using transparent style icon set"
+		cp ${S2}/pixmaps.trans.h ${S}/src/pixmaps.h
+	elif [ "${DILLO_ICONSET}" = "trad" ]
+	then
+		einfo "Using the traditional icon set"
+		cp ${S2}/pixmaps.trad.h ${S}/src/pixmaps.h
+	else
+		einfo "Using default Dillo icon set"
+	fi
+
+	cd ${S}; sh autogen.sh || die
+}
+
+src_compile() {
+	replace-flags "-O2 -mcpu=k6" "-O2 -mcpu=pentium"
+
+	local myconf
+
+	myconf="$(use_enable nls)
+		$(use_enable truetype anti-alias)
+		--enable-tabs
+		--enable-meta-refresh"
+
+	myconf="${myconf}
+		$(use_enable ipv6)
+		$(use_enable ssl)"
+
+	econf ${myconf} || die
+	emake || make || die
+}
+
+src_install() {
+	dodir /etc  /usr/share/icons/${PN}
+	make DESTDIR=${D} install || die
+
+	dosed /etc/dpidrc
+
+	dodoc AUTHORS COPYING ChangeLog* INSTALL README NEWS
+	docinto doc
+	dodoc doc/*.txt doc/README
+
+	cp ${S2}/icons/*.png ${D}/usr/share/icons/${PN}
+}
+
+pkg_postinst() {
+	einfo "This ebuild for dillo comes with different toolbar icons"
+	einfo "If you want mozilla style icons then try"
+	einfo "	DILLO_ICONSET=\"mozilla\" emerge dillo"
+	einfo
+	einfo "If you prefer konqueror style icons then try"
+	einfo "	DILLO_ICONSET=\"kde\" emerge dillo"
+	einfo
+	einfo "If you prefer ximian gnome style icons then try"
+	einfo "	DILLO_ICONSET=\"gnome\" emerge dillo"
+	einfo
+	einfo "If you prefer cobalt style icons then try"
+	einfo "	DILLO_ICONSET=\"cobalt\" emerge dillo"
+	einfo
+	einfo "If you prefer bold style icons then try"
+	einfo "	DILLO_ICONSET=\"bold\" emerge dillo"
+	einfo
+	einfo "If you prefer transparent style icons then try"
+	einfo "	DILLO_ICONSET=\"trans\" emerge dillo"
+	einfo
+	einfo "If you prefer the traditional icons then try"
+	einfo "	DILLO_ICONSET=\"trad\" emerge dillo"
+	einfo
+	einfo "If the DILLO_ICONSET variable is not set, you will get the"
+	einfo "default iconset"
+	einfo
+	einfo "To see what the icons look like, please point your browser to:"
+	einfo "http://dillo.auriga.wearlab.de/Icons/"
+	einfo
+}
diff --git a/www-client/dillo/dillo-0.8.3.ebuild b/www-client/dillo/dillo-0.8.3.ebuild
index d83393698d2a..f03ea81d2893 100644
--- a/www-client/dillo/dillo-0.8.3.ebuild
+++ b/www-client/dillo/dillo-0.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3.ebuild,v 1.2 2004/11/08 15:23:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.3.ebuild,v 1.3 2005/01/06 16:24:50 taviso Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/www-client/dillo/files/digest-dillo-0.8.3-r4 b/www-client/dillo/files/digest-dillo-0.8.3-r4
new file mode 100644
index 000000000000..ec9bf532eb21
--- /dev/null
+++ b/www-client/dillo/files/digest-dillo-0.8.3-r4
@@ -0,0 +1,3 @@
+MD5 be772ec9361bcc01515ae0da61de9bda dillo-0.8.3.tar.bz2 418714
+MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
+MD5 0eca06ae9a11b6ffa3c506591c1f4497 dillo-0.8.3-i18n-misc-20041206.diff.bz2 216604
diff --git a/www-client/dillo/files/dillo-format-string-vulnerability.diff b/www-client/dillo/files/dillo-format-string-vulnerability.diff
new file mode 100644
index 000000000000..f36473b1eaa4
--- /dev/null
+++ b/www-client/dillo/files/dillo-format-string-vulnerability.diff
@@ -0,0 +1,16 @@
+--- src/capi.c.orig	2005-01-04 21:59:52.239250240 +0000
++++ src/capi.c	2005-01-04 22:00:34.828775648 +0000
+@@ -497,11 +497,11 @@
+ 
+             } else if (strcmp(Data2, "send_status_message") == 0) {
+ 			   gchar *Data1_enc = a_I18n_locale_to_DILLO_CHARSET(Data1);
+-               a_Interface_msg(conn->dd->bw, Data1_enc);
++               a_Interface_msg(conn->dd->bw, "%s", Data1_enc);
+ 			   g_free(Data1_enc);
+             } else if (strcmp(Data2, "chat") == 0) {
+ 			   gchar *Data1_enc = a_I18n_locale_to_DILLO_CHARSET(Data1);
+-               a_Interface_msg(conn->dd->bw, Data1);
++               a_Interface_msg(conn->dd->bw, "%s", Data1);
+                  a_Bookmarks_chat_add(NULL, NULL, Data1);
+ 			   g_free(Data1_enc);
+             } else if (strcmp(Data2, "dialog") == 0) {