From beb7f3b2aeba2fbc46a493cf8e9d63cf9fda151319b4019bd6757d18a01fc155 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Feb 2010 14:11:48 +0000 Subject: [PATCH] Accepting request 32582 from Publishing Copy from Publishing/htmldoc based on submit request 32582 from user coolo OBS-URL: https://build.opensuse.org/request/show/32582 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/htmldoc?expand=0&rev=6 --- htmldoc-fortify.diff | 11 +++++++++++ htmldoc.changes | 5 +++++ htmldoc.spec | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 htmldoc-fortify.diff diff --git a/htmldoc-fortify.diff b/htmldoc-fortify.diff new file mode 100644 index 0000000..8a59a23 --- /dev/null +++ b/htmldoc-fortify.diff @@ -0,0 +1,11 @@ +--- ./htmldoc/ps-pdf.cxx.orig 2010-02-15 11:13:11.000000000 +0100 ++++ ./htmldoc/ps-pdf.cxx 2010-02-15 11:17:02.000000000 +0100 +@@ -8615,7 +8615,7 @@ + return (NULL); + } + // Safe because buffer is allocated... +- strcpy((char *)r->data.text.buffer, (char *)data); ++ memcpy((char *)r->data.text.buffer, data, strlen ((char *)data) + 1); + get_color(_htmlTextColor, r->data.text.rgb); + break; + case RENDER_IMAGE : diff --git a/htmldoc.changes b/htmldoc.changes index 4cf6867..f017f9e 100644 --- a/htmldoc.changes +++ b/htmldoc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 15 11:18:57 CET 2010 - rguenther@suse.de + +- Fix stricter fortification fallout with GCC 4.5. + ------------------------------------------------------------------- Fri Dec 11 15:27:38 CET 2009 - lmuelle@suse.de diff --git a/htmldoc.spec b/htmldoc.spec index 50873e4..2bea08b 100644 --- a/htmldoc.spec +++ b/htmldoc.spec @@ -25,11 +25,12 @@ Group: Productivity/Publishing/HTML/Tools Url: http://htmldoc.org/ AutoReqProv: on Version: 1.8.27 -Release: 172 +Release: 173 Summary: HTML Processor that Generates HTML, PostScript, and PDF Files Source: %{name}-%{version}-source.tar.bz2 Patch: %{name}-docpath.diff Patch1: htmldoc_CVE-2009-3050_535943.diff +Patch2: htmldoc-fortify.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define DOCDIR %{_datadir}/doc/packages/%{name} @@ -48,6 +49,7 @@ Authors: %setup %patch %patch1 -p1 +%patch2 %build %{?suse_update_config:%{suse_update_config -f}}