Add a fix for bug #203548 by Andrew Church <gentoo@achurch.org>.

Package-Manager: portage-2.1.4_rc11

4 files changed, 147 insertions, 10 deletions

diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog
index a845b167c726..63062310afa2 100644
--- a/x11-misc/xfractint/ChangeLog
+++ b/x11-misc/xfractint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xfractint
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.46 2007/12/27 20:47:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.47 2007/12/28 11:57:35 spock Exp $
+
+  28 Dec 2007; Michał Januszewski <spock@gentoo.org>
+  +files/xfractint-20.04p07-filename-buffer-overflow-fix.patch,
+  xfractint-20.04_p07.ebuild:
+  Add a fix for bug #203548 by Andrew Church <gentoo@achurch.org>.
 
   27 Dec 2007; Samuli Suominen <drac@gentoo.org> xfractint-20.04_p07.ebuild:
   amd64 stable
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 2d3e7418829e..f925a51a18ce 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xfractint-20.04_p07-Makefile.patch 5492 RMD160 9ce83e16cfc4481f79619417c5d5a6b8c19bda54 SHA1 e47470330acd899da28673def83b57ad6d17c77f SHA256 fe0d347d3faa45daa0c64315c71f5351d5b8674f1a0d142c48ac63e910895b8c
 MD5 99b54a293343c8b56ce03df4ae6f7a7d files/xfractint-20.04_p07-Makefile.patch 5492
 RMD160 9ce83e16cfc4481f79619417c5d5a6b8c19bda54 files/xfractint-20.04_p07-Makefile.patch 5492
 SHA256 fe0d347d3faa45daa0c64315c71f5351d5b8674f1a0d142c48ac63e910895b8c files/xfractint-20.04_p07-Makefile.patch 5492
+AUX xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695 RMD160 e3b2a3e4e9f002b9fe55dcf3392ed1b9e8843a80 SHA1 aa693b0d9ecb4628f221fe92105c8fc974b41ad3 SHA256 5cd6dd38f15eb32e6a10743a5043b256647356998fb8b24ff7e4e997026db7be
+MD5 dd8b3b860e282128253062342e08df29 files/xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695
+RMD160 e3b2a3e4e9f002b9fe55dcf3392ed1b9e8843a80 files/xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695
+SHA256 5cd6dd38f15eb32e6a10743a5043b256647356998fb8b24ff7e4e997026db7be files/xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695
 AUX xfractint-20.4.03-makefile.patch 3533 RMD160 1c67423c7d278cc67aa482385a5f82a5a5468700 SHA1 3a1c40730a26cdf50678b755a50ede403d377862 SHA256 a7d31f14a4434667d9ca1a4d11a9c2884916f2ee73edf267c4dceb61d169d7d9
 MD5 01761590ed9dc8421cc395d4937f4317 files/xfractint-20.4.03-makefile.patch 3533
 RMD160 1c67423c7d278cc67aa482385a5f82a5a5468700 files/xfractint-20.4.03-makefile.patch 3533
@@ -16,14 +23,14 @@ EBUILD xfractint-20.04_p03.ebuild 1348 RMD160 ef5d683e00365460a78aed89c2bd02dcf5
 MD5 07a6995d612a68f7568acedae4206554 xfractint-20.04_p03.ebuild 1348
 RMD160 ef5d683e00365460a78aed89c2bd02dcf5e3c257 xfractint-20.04_p03.ebuild 1348
 SHA256 06abe6e9d847a4024d10af2d19450fc8067dc3c626ffb251176159cf11e4dcdb xfractint-20.04_p03.ebuild 1348
-EBUILD xfractint-20.04_p07.ebuild 1162 RMD160 b69f9fdcf15af55dc209349af8917ea552875320 SHA1 1844dda4d16cb453613597ca684eae275f68a800 SHA256 e0fc45b434e9c7cfcef91f0afbc2a4af16cdfacb2c71cf5d50c9b477e7e90752
-MD5 38c245290bbbb8c43331008ba86e3eec xfractint-20.04_p07.ebuild 1162
-RMD160 b69f9fdcf15af55dc209349af8917ea552875320 xfractint-20.04_p07.ebuild 1162
-SHA256 e0fc45b434e9c7cfcef91f0afbc2a4af16cdfacb2c71cf5d50c9b477e7e90752 xfractint-20.04_p07.ebuild 1162
-MISC ChangeLog 6917 RMD160 3a3604d028b81395705bb939bda7517fd5767663 SHA1 e4f0290474d72c703a5e380cc62a61e5f6bee24f SHA256 a67b777c43caf8989af84d5f4877475c2940f5ba2c0955c0466f2238ce4de0c9
-MD5 f4f669e0a99022ba8820f4f3560dc6db ChangeLog 6917
-RMD160 3a3604d028b81395705bb939bda7517fd5767663 ChangeLog 6917
-SHA256 a67b777c43caf8989af84d5f4877475c2940f5ba2c0955c0466f2238ce4de0c9 ChangeLog 6917
+EBUILD xfractint-20.04_p07.ebuild 1239 RMD160 1e1547e0398f7e3264fc5121316d90984de2a22a SHA1 3bf69d779489303bf901c5a3f22eb78dd4e0f4bd SHA256 986476f6f035ea85fccbf584b840fae122f96e34e5c0ea94a288e4bbaf034046
+MD5 ca464d9e900016538bf2c5e019b90026 xfractint-20.04_p07.ebuild 1239
+RMD160 1e1547e0398f7e3264fc5121316d90984de2a22a xfractint-20.04_p07.ebuild 1239
+SHA256 986476f6f035ea85fccbf584b840fae122f96e34e5c0ea94a288e4bbaf034046 xfractint-20.04_p07.ebuild 1239
+MISC ChangeLog 7134 RMD160 eb55b97b89b603bd04ac760184a0f4a2a7834f4a SHA1 f0b15f616d43fc79af5c64af5b47b177f2fa3e17 SHA256 3ccfa25590d81bb05345d0453ac7150f7d6870b812acb944d60e6dbb6cce9dc9
+MD5 737c9fc7e30ba1c9b7133f98178599a6 ChangeLog 7134
+RMD160 eb55b97b89b603bd04ac760184a0f4a2a7834f4a ChangeLog 7134
+SHA256 3ccfa25590d81bb05345d0453ac7150f7d6870b812acb944d60e6dbb6cce9dc9 ChangeLog 7134
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -34,3 +41,10 @@ SHA256 54b9075e121e05cd23fdd66c8cb69ba329c7285df46ca1a4f0249c4ea2458d45 files/di
 MD5 3346c5b319a2a6decb115470c336ec4f files/digest-xfractint-20.04_p07 259
 RMD160 4c3b418e50cd318d69ca24f697b7b73480d5c380 files/digest-xfractint-20.04_p07 259
 SHA256 5c1656db2245c5dec8a8930738c9f3ffe6648c647ba08492faa078e50cbba2d9 files/digest-xfractint-20.04_p07 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd05MQACgkQchej4aZK9/dn5ACgg1c+CkALbU+pFsCEIxyVQIf0
+3AYAnRgcp6JeJZzMmOHoW75VcMRyd8j+
+=ldrf
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch b/x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch
new file mode 100644
index 000000000000..7f9a2ecbc503
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch
@@ -0,0 +1,117 @@
+diff -urN ../xfractint-20.04p07-orig/dos_help/hc.c ../xfractint-20.04p07/dos_help/hc.c
+--- ../xfractint-20.04p07-orig/dos_help/hc.c	2006-03-15 10:30:47 +0900
++++ ../xfractint-20.04p07/dos_help/hc.c	2007-12-28 16:05:53 +0900
+@@ -72,8 +72,8 @@
+ #   include <dir.h>
+ #   define FNSPLIT fnsplit
+ #else
+-#   define MAXFILE _MAX_FNAME
+-#   define MAXEXT  _MAX_EXT
++#   define MAXFILE FILE_MAX_FNAME
++#   define MAXEXT  FILE_MAX_EXT
+ #   define FNSPLIT _splitpath
+ #endif
+ 
+diff -urN ../xfractint-20.04p07-orig/headers/fractint.h ../xfractint-20.04p07/headers/fractint.h
+--- ../xfractint-20.04p07-orig/headers/fractint.h	2006-11-26 04:43:07 +0900
++++ ../xfractint-20.04p07/headers/fractint.h	2007-12-28 16:07:02 +0900
+@@ -47,31 +47,6 @@
+ #define RESTORESTART      3
+ #define CONTINUE          4
+ 
+-/* these are used to declare arrays for file names */
+-#ifdef XFRACT
+-#define FILE_MAX_PATH  256       /* max length of path+filename  */
+-#define FILE_MAX_DIR   256       /* max length of directory name */
+-#else
+-#define FILE_MAX_PATH  80       /* max length of path+filename  */
+-#define FILE_MAX_DIR   80       /* max length of directory name */
+-#endif
+-#define FILE_MAX_DRIVE  3       /* max length of drive letter   */
+-
+-#if 1
+-#define FILE_MAX_FNAME  9       /* max length of filename       */
+-#define FILE_MAX_EXT    5       /* max length of extension      */
+-#else
+-/*
+-The filename limits were increased in Xfract 3.02. But alas,
+-in this poor program that was originally developed on the
+-nearly-brain-dead DOS operating system, quite a few things
+-in the UI would break if file names were bigger than DOS 8-3
+-names. So for now humor us and let's keep the names short.
+-*/
+-#define FILE_MAX_FNAME  64       /* max length of filename       */
+-#define FILE_MAX_EXT    64       /* max length of extension      */
+-#endif
+-
+ #define MAXMAXLINELENGTH  128   /* upper limit for maxlinelength for PARs */
+ #define MINMAXLINELENGTH  40    /* lower limit for maxlinelength for PARs */
+ 
+diff -urN ../xfractint-20.04p07-orig/headers/port.h ../xfractint-20.04p07/headers/port.h
+--- ../xfractint-20.04p07-orig/headers/port.h	2006-11-26 04:43:07 +0900
++++ ../xfractint-20.04p07/headers/port.h	2007-12-28 16:11:15 +0900
+@@ -260,6 +260,36 @@
+ #endif
+ #endif
+ 
++
++/* The following FILE_* #defines were moved here from fractint.h to
++ * avoid inconsistent declarations in dos_help/hc.c and unix/unix.c. */
++
++/* these are used to declare arrays for file names */
++#ifdef XFRACT
++#define FILE_MAX_PATH  256       /* max length of path+filename  */
++#define FILE_MAX_DIR   256       /* max length of directory name */
++#else
++#define FILE_MAX_PATH  80       /* max length of path+filename  */
++#define FILE_MAX_DIR   80       /* max length of directory name */
++#endif
++#define FILE_MAX_DRIVE  3       /* max length of drive letter   */
++
++#if 1
++#define FILE_MAX_FNAME  9       /* max length of filename       */
++#define FILE_MAX_EXT    5       /* max length of extension      */
++#else
++/*
++The filename limits were increased in Xfract 3.02. But alas,
++in this poor program that was originally developed on the
++nearly-brain-dead DOS operating system, quite a few things
++in the UI would break if file names were bigger than DOS 8-3
++names. So for now humor us and let's keep the names short.
++*/
++#define FILE_MAX_FNAME  64       /* max length of filename       */
++#define FILE_MAX_EXT    64       /* max length of extension      */
++#endif
++
++
+ /* Uses big_access32(), big_set32(),... functions instead of macros. */
+ /* Some little endian machines may require this as well. */
+ #if BYTE_ORDER == BIG_ENDIAN
+diff -urN ../xfractint-20.04p07-orig/headers/unix.h ../xfractint-20.04p07/headers/unix.h
+--- ../xfractint-20.04p07-orig/headers/unix.h	2006-11-26 04:43:07 +0900
++++ ../xfractint-20.04p07/headers/unix.h	2007-12-28 15:52:47 +0900
+@@ -28,8 +28,6 @@
+ #define max(a,b) ((a)>(b)?(a):(b))
+ #define min(a,b) ((a)<(b)?(a):(b))
+ #define remove(x) unlink(x)
+-#define _MAX_FNAME 20
+-#define _MAX_EXT 4
+ #define chsize(fd,len) ftruncate(fd,len)
+ 
+ #define inp(x) 0
+diff -urN ../xfractint-20.04p07-orig/unix/unix.c ../xfractint-20.04p07/unix/unix.c
+--- ../xfractint-20.04p07-orig/unix/unix.c	2005-07-28 09:55:02 +0900
++++ ../xfractint-20.04p07/unix/unix.c	2007-12-28 16:05:56 +0900
+@@ -15,12 +15,6 @@
+ #include <ctype.h>
+ #include "port.h"
+ 
+-#define FILE_MAX_PATH  256       /* max length of path+filename  */
+-#define FILE_MAX_DIR   256       /* max length of directory name */
+-#define FILE_MAX_DRIVE  3       /* max length of drive letter   */
+-#define FILE_MAX_FNAME  9       /* max length of filename       */
+-#define FILE_MAX_EXT    5       /* max length of extension      */
+-
+ int iocount;
+ 
+ /*
diff --git a/x11-misc/xfractint/xfractint-20.04_p07.ebuild b/x11-misc/xfractint/xfractint-20.04_p07.ebuild
index 397737c272fa..c907eaf2edad 100644
--- a/x11-misc/xfractint/xfractint-20.04_p07.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p07.ebuild,v 1.2 2007/12/27 20:47:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p07.ebuild,v 1.3 2007/12/28 11:57:35 spock Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/xfractint-20.04p07-filename-buffer-overflow-fix.patch
 }
 
 src_compile() {