Add patch to fix bug #146416, thanks to ed@catmur.co.uk.

(Portage version: 2.1.2_pre2)

7 files changed, 43 insertions, 4 deletions

diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 88f6641de02c..a44f5c78f7d0 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/dillo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.46 2006/09/10 23:08:04 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.47 2006/10/01 21:24:07 exg Exp $
+
+  01 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/dillo-build-fix.patch,
+  -files/dillo-format-string-vulnerability.diff, dillo-0.8.5-r1.ebuild,
+  dillo-0.8.6.ebuild:
+  Add patch to fix bug #146416, thanks to ed@catmur.co.uk.
 
 *dillo-0.8.6 (10 Sep 2006)
 
diff --git a/www-client/dillo/dillo-0.8.5-r1.ebuild b/www-client/dillo/dillo-0.8.5-r1.ebuild
index ffabcc20aa14..4344e17e243c 100644
--- a/www-client/dillo/dillo-0.8.5-r1.ebuild
+++ b/www-client/dillo/dillo-0.8.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.5-r1.ebuild,v 1.11 2005/08/13 23:28:49 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.5-r1.ebuild,v 1.12 2006/10/01 21:24:07 exg Exp $
 
 inherit flag-o-matic eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ../${DILLO_I18N_P}.diff || die
+	epatch "${FILESDIR}"/${PN}-build-fix.patch
 	sh autogen.sh || die
 
 	if [ "${DILLO_ICONSET}" = "kde" ]
diff --git a/www-client/dillo/dillo-0.8.6.ebuild b/www-client/dillo/dillo-0.8.6.ebuild
index 242d5c28938f..ac6bd682b4d6 100644
--- a/www-client/dillo/dillo-0.8.6.ebuild
+++ b/www-client/dillo/dillo-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6.ebuild,v 1.1 2006/09/10 23:08:04 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-0.8.6.ebuild,v 1.2 2006/10/01 21:24:07 exg Exp $
 
 inherit flag-o-matic eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ../${DILLO_I18N_P}.diff || die
+	epatch "${FILESDIR}"/${PN}-build-fix.patch
 	epatch "${FILESDIR}"/${PN}-asneeded.patch
 	sh autogen.sh || die
 
diff --git a/www-client/dillo/files/digest-dillo-0.8.5-r1 b/www-client/dillo/files/digest-dillo-0.8.5-r1
index 5eae53a9ab74..e66631ef7a13 100644
--- a/www-client/dillo/files/digest-dillo-0.8.5-r1
+++ b/www-client/dillo/files/digest-dillo-0.8.5-r1
@@ -1,5 +1,9 @@
 MD5 dfe4b882f2424d5eb4f9bc526df7019c dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152
+RMD160 b52c919d5515f133f4d8ceeb81d005f2df6807c5 dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152
+SHA256 31c70acda93f7da8755e5e860c1f640154ba172c5557ca93573b7a29597189f4 dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152
 MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
+RMD160 9d8b99a25b00542aa11afa4652f4766c2f91653f dillo-0.8.5.tar.bz2 424795
+SHA256 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a dillo-0.8.5.tar.bz2 424795
 MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 dillo-gentoo-extras-patch4.tar.bz2 98800
 SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05 dillo-gentoo-extras-patch4.tar.bz2 98800
diff --git a/www-client/dillo/files/digest-dillo-0.8.5-r2 b/www-client/dillo/files/digest-dillo-0.8.5-r2
index 74f1f4cc6bc6..e805250f18e4 100644
--- a/www-client/dillo/files/digest-dillo-0.8.5-r2
+++ b/www-client/dillo/files/digest-dillo-0.8.5-r2
@@ -1,5 +1,7 @@
 MD5 b4191226e7e3e5f1a6bf7e43004e26da dillo-0.8.5-i18n-misc-20051010.diff.bz2 247058
 MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
+RMD160 9d8b99a25b00542aa11afa4652f4766c2f91653f dillo-0.8.5.tar.bz2 424795
+SHA256 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a dillo-0.8.5.tar.bz2 424795
 MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 dillo-gentoo-extras-patch4.tar.bz2 98800
 SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05 dillo-gentoo-extras-patch4.tar.bz2 98800
diff --git a/www-client/dillo/files/digest-dillo-0.8.5-r3 b/www-client/dillo/files/digest-dillo-0.8.5-r3
index dcb761aee813..bfc3cbbc948f 100644
--- a/www-client/dillo/files/digest-dillo-0.8.5-r3
+++ b/www-client/dillo/files/digest-dillo-0.8.5-r3
@@ -1,5 +1,7 @@
 MD5 fabc2fa5a657701a23930c510d001a95 dillo-0.8.5-i18n-misc-20060104.diff.bz2 248425
 MD5 d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 424795
+RMD160 9d8b99a25b00542aa11afa4652f4766c2f91653f dillo-0.8.5.tar.bz2 424795
+SHA256 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a dillo-0.8.5.tar.bz2 424795
 MD5 0d0bc7cdd39dc66b80280f73d74bfeaf dillo-gentoo-extras-patch4.tar.bz2 98800
 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 dillo-gentoo-extras-patch4.tar.bz2 98800
 SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05 dillo-gentoo-extras-patch4.tar.bz2 98800
diff --git a/www-client/dillo/files/dillo-build-fix.patch b/www-client/dillo/files/dillo-build-fix.patch
new file mode 100644
index 000000000000..a46c4f6ae204
--- /dev/null
+++ b/www-client/dillo/files/dillo-build-fix.patch
@@ -0,0 +1,23 @@
+--- m4/gettext.m4.old	2006-10-01 22:57:42.650976377 +0200
++++ m4/gettext.m4	2006-10-01 23:00:44.691609818 +0200
+@@ -567,20 +567,6 @@
+ ])
+ 
+ 
+-AC_DEFUN([AM_MKINSTALLDIRS],
+-[
+-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+-  dnl Try to locate is.
+-  MKINSTALLDIRS=
+-  if test -n "$ac_aux_dir"; then
+-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+-  fi
+-  if test -z "$MKINSTALLDIRS"; then
+-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+-  fi
+-  AC_SUBST(MKINSTALLDIRS)
+-])
+ 
+ 
+ dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])