diff options
| author |   Martin Ehmsen <ehmsen@gentoo.org> | 2006-05-23 20:34:03 +0000 |
|---|---|---|
| committer | Martin Ehmsen <ehmsen@gentoo.org> | 2006-05-23 20:34:03 +0000 |
| commit | 088ef07d50d14ff6a2c47d30ea7f606e520bf3a6 (patch) | |
| tree | 55d519b938a461e21d1224be849f6953e9d29a56 /app-text | |
| parent | Remove svyatogor from metadata, bug 131936. (diff) | |
| download | gentoo-2-088ef07d50d14ff6a2c47d30ea7f606e520bf3a6.tar.gz gentoo-2-088ef07d50d14ff6a2c47d30ea7f606e520bf3a6.tar.bz2 gentoo-2-088ef07d50d14ff6a2c47d30ea7f606e520bf3a6.zip | |
Fixed segfault in dvipdfm, bug #94901.
(Portage version: 2.1_rc2)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/tetex/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/tetex/files/tetex-3.0_p1-dvipdfm-timezone.patch | 43 | ||||
| -rw-r--r-- | app-text/tetex/tetex-3.0_p1-r3.ebuild | 5 |
3 files changed, 52 insertions, 2 deletions
diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog index 0151293789a4..97ef06cd8507 100644 --- a/app-text/tetex/ChangeLog +++ b/app-text/tetex/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for app-text/tetex # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.126 2006/05/23 17:48:26 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.127 2006/05/23 20:34:03 ehmsen Exp $ 23 May 2006; Fabian Groffen <grobian@gentoo.org> tetex-2.0.2-r8.ebuild: Marked ppc-macos stable (bug #115775) + 23 May 2006; Martin Ehmsen <ehmsen@gentoo.org> + +files/tetex-3.0_p1-dvipdfm-timezone.patch, tetex-3.0_p1-r3.ebuild: + Fixed buffer overrun in dvipdfm resulting in segfault, bug #94901. + 27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-tetex-2.0.2-r9, files/digest-tetex-3.0-r3, files/digest-tetex-3.0-r4, files/digest-tetex-3.0_p1, Manifest: diff --git a/app-text/tetex/files/tetex-3.0_p1-dvipdfm-timezone.patch b/app-text/tetex/files/tetex-3.0_p1-dvipdfm-timezone.patch new file mode 100644 index 000000000000..f134206ebb81 --- /dev/null +++ b/app-text/tetex/files/tetex-3.0_p1-dvipdfm-timezone.patch @@ -0,0 +1,43 @@ +diff -urN tetex-src-3.0.orig/texk/dvipdfm/pdfdoc.c tetex-src-3.0/texk/dvipdfm/pdfdoc.c +--- tetex-src-3.0.orig/texk/dvipdfm/pdfdoc.c 2005-12-06 16:03:23.000000000 +0100 ++++ tetex-src-3.0/texk/dvipdfm/pdfdoc.c 2006-05-23 17:25:49.000000000 +0200 +@@ -234,7 +234,7 @@ + { + #ifndef HAVE_TIMEZONE + #ifdef TM_GM_TOFF +- #define timezone (bdtime->gm_toff) ++ #define timezone (bd_time->tm_gmtoff) + #else + #define timezone 0l + #endif /* TM_GM_TOFF */ +@@ -242,15 +242,26 @@ + static char date_string[24]; + time_t current_time; + struct tm *bd_time; ++ long hh, mm; + if (debug) { + fprintf (stderr, "(asn_date)"); + } + time(¤t_time); + bd_time = localtime(¤t_time); +- sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'", +- bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday, +- bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec, +- -timezone/3600, timezone%3600); ++ if (timezone == 0l) { ++ sprintf (date_string, "D:%04d%02d%02d%02d%02d%02dZ00'00'", ++ bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday, ++ bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec); ++ } else { ++ hh = timezone/3600; ++ mm = (timezone%3600)/60; ++ if (timezone < 0) ++ mm = -mm; ++ sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'", ++ bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday, ++ bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec, ++ hh, mm); ++ } + return date_string; + } + diff --git a/app-text/tetex/tetex-3.0_p1-r3.ebuild b/app-text/tetex/tetex-3.0_p1-r3.ebuild index 89861ce4e44b..508cd1a49845 100644 --- a/app-text/tetex/tetex-3.0_p1-r3.ebuild +++ b/app-text/tetex/tetex-3.0_p1-r3.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/app-text/tetex/tetex-3.0_p1-r3.ebuild,v 1.3 2006/04/14 20:08:55 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0_p1-r3.ebuild,v 1.4 2006/05/23 20:34:03 ehmsen Exp $ inherit tetex-3 flag-o-matic versionator virtualx @@ -50,6 +50,9 @@ src_unpack() { # bug 126918 epatch ${FILESDIR}/${P}-create-empty-files.patch + # bug 94901 + epatch ${FILESDIR}/${P}-dvipdfm-timezone.patch + # Construct a Gentoo site texmf directory # that overlays the upstream supplied epatch ${FILESDIR}/${P}-texmf-site.patch |