Fix for _FORTIFY_SOURCE indicates presence of overflow, #363543

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

5 files changed, 74 insertions, 12 deletions

diff --git a/x11-misc/touchcal/ChangeLog b/x11-misc/touchcal/ChangeLog
index f525e356c063..b97146f658e7 100644
--- a/x11-misc/touchcal/ChangeLog
+++ b/x11-misc/touchcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/touchcal
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/ChangeLog,v 1.6 2008/12/04 21:25:44 dsd Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/ChangeLog,v 1.7 2011/04/14 06:56:52 jlec Exp $
+
+*touchcal-0.31-r1 (14 Apr 2011)
+
+  14 Apr 2011; Justin Lecher <jlec@gentoo.org> touchcal-0.31.ebuild,
+  +touchcal-0.31-r1.ebuild, +files/touchcal-0.31-buff-overflow.patch:
+  Fix for _FORTIFY_SOURCE indicates presence of overflow, #363543
 
   04 Dec 2008; Daniel Drake <dsd@gentoo.org> metadata.xml:
   Drop maintainership. I'll still help on bugs, but probably not on a timely
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index 01c0c04938db..38f3865bdee6 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX touchcal-0.31-buff-overflow.patch 478 RMD160 14eb8f5495eab7868b3ca2a2e8086e47c9b488c1 SHA1 60db182a68625c335ffa44cdc97bad747f065e4a SHA256 7995ef82f8edf8abffa5ae38807d6a2bf8b24585b7b2762eb9ff7069fa81b524
 DIST touchcal-0.31.tar.gz 85201 RMD160 6e49be8a16d96ab0fe4dcc9df5c69d9ec53c245e SHA1 fb71f685d037b9946702542326c85d16dfd4d5af SHA256 10f639c7a4f806eb793b219e0420c85f2c423033097ce59b0c3e1aa9dbce221f
-EBUILD touchcal-0.31.ebuild 550 RMD160 ea6cbabd639ca8088254b5a62c3d704af62f5a59 SHA1 493cd278c639cd62470c21ec307244ba038a9e86 SHA256 71c87697915f5f6bee994f3f0e082a8bf59f2e118e2e6b893cad550484e6a2d8
-MISC ChangeLog 953 RMD160 c0a0c88239bfa40a21245057ac1875c51668f70b SHA1 2bdb67fd604a7e76d1dbbcf9b61908c58c4ec3b0 SHA256 ad59c872ee3b9a78ff398ba8b5f67df49dfecbc648a23e993adb435d65faba5f
+EBUILD touchcal-0.31-r1.ebuild 557 RMD160 c3b9b0eb0300c1bc6ec53ac4a03f74d25ed08bce SHA1 10ff9be08c8b9574dbbac23fe53b24ec0275cbde SHA256 b3df0f26a14ef1a73c87640f9533dacf88e511c37387c087f400b4ae3e07307e
+EBUILD touchcal-0.31.ebuild 553 RMD160 835dfc7be0d638198100e69e2b420913385b6b15 SHA1 0c11ec262f3d1e50844ff8e5470f291681feaac0 SHA256 374fdb68e3ae97d1d1cf4b16f85b400ee7cc6f256df8d3979510eede92b7ddb1
+MISC ChangeLog 1193 RMD160 3eb303da5dc0e5755d190cbb42f6fb5bbb3bf5cd SHA1 ed768ba65d1942d9f6d8eba988ccb89662d5e686 SHA256 d3bbd5545aa1eaf5f9f261079b387b47ffc69f66e2113297fe3bce24e860d661
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2mmrkACgkQgAnW8HDreRYpVwCeKnKW0WkzgFhesl74EU2O4p16
+NMAAn0kueOzXvxSobU0KZGx9Uv/2fUSw
+=+a7W
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch b/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
new file mode 100644
index 000000000000..7c64d5c4c7ee
--- /dev/null
+++ b/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
@@ -0,0 +1,16 @@
+ touchcal.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/touchcal.c b/touchcal.c
+index 7341fd7..22bd978 100644
+--- a/touchcal.c
++++ b/touchcal.c
+@@ -96,7 +96,7 @@ static void init_mu(char dev[])
+ 	char buf[255],dummy[255];
+ 	char format_tablet[4],get_page[5],set_page[5],mode_stream[4];
+ 	char reset_controler[3],identify[4];
+-	char data[16];
++	char data[26];
+ 
+ 	/*Open serial device for reading and writing*/
+ 	fd = open(dev, O_RDWR | O_NOCTTY );
diff --git a/x11-misc/touchcal/touchcal-0.31-r1.ebuild b/x11-misc/touchcal/touchcal-0.31-r1.ebuild
new file mode 100644
index 000000000000..ed32b1f2f163
--- /dev/null
+++ b/x11-misc/touchcal/touchcal-0.31-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.31-r1.ebuild,v 1.1 2011/04/14 06:56:52 jlec Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Touchscreen calibration utility"
+HOMEPAGE="http://touchcal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buff-overflow.patch
+}
diff --git a/x11-misc/touchcal/touchcal-0.31.ebuild b/x11-misc/touchcal/touchcal-0.31.ebuild
index ed80275da1cd..6687eda67ed3 100644
--- a/x11-misc/touchcal/touchcal-0.31.ebuild
+++ b/x11-misc/touchcal/touchcal-0.31.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.31.ebuild,v 1.5 2008/10/05 10:13:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/touchcal-0.31.ebuild,v 1.6 2011/04/14 06:56:52 jlec Exp $
+
+EAPI="4"
+
+inherit eutils
 
 DESCRIPTION="Touchscreen calibration utility"
-HOMEPAGE="http://touchcal.sourceforge.net"
+HOMEPAGE="http://touchcal.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-DEPEND="sys-libs/ncurses"
 IUSE=""
 
-src_install() {
-	emake install DESTDIR="${D}" || die "failed to emake install"
-	dodoc README ChangeLog
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buff-overflow.patch
 }