Fix limitation of -D_FORTIFY_SOURCE=2 wrt #321407 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 92 insertions, 2 deletions

diff --git a/app-text/htmldoc/ChangeLog b/app-text/htmldoc/ChangeLog
index 0503cbd6e051..1ec48e1e5b26 100644
--- a/app-text/htmldoc/ChangeLog
+++ b/app-text/htmldoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/htmldoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.56 2010/11/07 21:15:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/ChangeLog,v 1.57 2010/11/14 09:56:48 ssuominen Exp $
+
+*htmldoc-1.8.27-r2 (14 Nov 2010)
+
+  14 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +htmldoc-1.8.27-r2.ebuild, +files/htmldoc-fortify-fail.patch:
+  Fix limitation of -D_FORTIFY_SOURCE=2 wrt #321407 by Diego Elio Pettenò.
 
   07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   htmldoc-1.8.27-r1.ebuild:
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index f9936eaf0d3b..edf58c79accb 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,5 +1,7 @@
+AUX htmldoc-fortify-fail.patch 815 RMD160 589216f06e7ed5c780e5dffb3d96f8bd84fbf6ea SHA1 6f20f691683b13cb506820c78bae75896a546c96 SHA256 d8d5a5d9ebf5225a32b4f00d80e89a5576122d8c70c5ef60f36c3717c3770746
 AUX htmldoc-sscanf-overflows.patch 1351 RMD160 37ed892d0ebaaca6be134e43568333073536de0b SHA1 9ba341c585f6666f3cd78e4e6934a3ce7aa150c1 SHA256 b6c20cf21b781787f9e2663859646daa8b07c34e96cf39221f68dd2ce1a7f7a7
 DIST htmldoc-1.8.27-source.tar.bz2 3960271 RMD160 9605a5894675439f5fae405fb060972e19f33c7e SHA1 472908e0aafed1cedfbacd8ed3168734aebdec4b SHA256 89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613
 EBUILD htmldoc-1.8.27-r1.ebuild 1814 RMD160 62382e735b7db87c899b8c238e808fe4e8f5de59 SHA1 f5a712868c06d1d83bbd982e20e0b49311bfd0c2 SHA256 614151f3b0efec316e24892c49f8b119fdadbb8049f6360e7740cdca127d7ea5
-MISC ChangeLog 6830 RMD160 110f628093e2d0b3d1be1ac810f9ed2ec7e59b4b SHA1 1938499ab394421e39394608a8eb8194e324fddb SHA256 6009148eadaaf9792ad676e4bfd319356b031b6cc4924d120c2006a0e2c5d2b7
+EBUILD htmldoc-1.8.27-r2.ebuild 1864 RMD160 ba13cd035557cbd09e851ba55fa4420c65f75cba SHA1 6fca1169dad0445ec85019d8fa327658562e635d SHA256 bb3e7086886c001783e15ea658ece9edb63b59462bde5352f8613551f31041ad
+MISC ChangeLog 7059 RMD160 58e9c234c14764ea4f22573a5d81878e6bb15bdb SHA1 6fdb9eccdba934e5c019ba9942fe20de330f8223 SHA256 5579ebe30634214a98d9de888b8c6e1e7d962ad35fbe10f3c6cf659f41bcb58c
 MISC metadata.xml 251 RMD160 f62b7fdfc94b049ff5d8c1898bd9816f09fa5f7c SHA1 a427a7f873d1f0a3be2e4ffe3c46cfd1e7405432 SHA256 1bb399941c480f3c388bba23fc61399818897b9a232fd1171750675a01353a8d
diff --git a/app-text/htmldoc/files/htmldoc-fortify-fail.patch b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
new file mode 100644
index 000000000000..32ec8873567f
--- /dev/null
+++ b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
@@ -0,0 +1,21 @@
+diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
+--- htmldoc-1.8.27~/htmldoc/ps-pdf.cxx	2009-08-13 19:32:21.846860508 -0400
++++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2009-08-13 19:40:29.185857503 -0400
+@@ -8619,7 +8619,7 @@
+           return (NULL);
+         }
+ 	// Safe because buffer is allocated...
+-        strcpy((char *)r->data.text.buffer, (char *)data);
++        memcpy((char *)r->data.text.buffer, (char *)data, strlen((char *)data));
+         get_color(_htmlTextColor, r->data.text.rgb);
+         break;
+     case RENDER_IMAGE :
+@@ -8640,7 +8640,7 @@
+           return (NULL);
+         }
+ 	// Safe because buffer is allocated...
+-        strcpy((char *)r->data.link, (char *)data);
++        memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
+         break;
+   }
+ 
diff --git a/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild b/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
new file mode 100644
index 000000000000..8902c4086894
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmldoc/htmldoc-1.8.27-r2.ebuild,v 1.1 2010/11/14 09:56:48 ssuominen Exp $
+
+inherit eutils
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+SRC_URI="mirror://easysw/htmldoc/${PV}/${P}-source.tar.bz2"
+HOMEPAGE="http://www.easysw.com/htmldoc/"
+
+IUSE="fltk ssl"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/jpeg
+	>=media-libs/libpng-1.4
+	fltk? ( >=x11-libs/fltk-1.0.11 )
+	ssl? ( >=dev-libs/openssl-0.9.6e )"
+RDEPEND="${DEPEND}"
+
+# this needs to be figured out, since htmldoc looks for all three libs
+# right now there's no virtual/ssl
+#
+#   --enable-openssl        use OpenSSL for SSL/TLS support, default=yes
+#   --enable-gnutls         use GNU TLS for SSL/TLS support, default=yes
+#   --enable-cdsassl        use CDSA for SSL/TLS support, default=yes
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# make sure not to use the libs htmldoc ships with
+	mkdir foo ; mv jpeg foo/ ; mv png foo/ ; mv zlib foo/
+
+	epatch "${FILESDIR}"/${PN}-sscanf-overflows.patch \
+		"${FILESDIR}"/${PN}-fortify-fail.patch
+
+	sed -i "s:^#define DOCUMENTATION \"\$prefix/share/doc/htmldoc\":#define DOCUMENTATION \"\$prefix/share/doc/${PF}/html\":" \
+		configure
+}
+
+src_compile() {
+	local myconf="$(use_enable ssl openssl) $(use_with fltk gui)"
+
+	econf ${myconf} || die "econf failed"
+
+	# Add missing -lfltk_images to LIBS
+	use fltk && sed -i 's:-lfltk :-lfltk -lfltk_images :g' Makedefs
+
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall bindir="${D}/usr/bin" || die "einstall failed"
+
+	# Minor cleanups
+	mv "${D}/usr/share/doc/htmldoc" "${D}/usr/share/doc/${PF}"
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/doc/${PF}/*.html "${D}/usr/share/doc/${PF}/html"
+}