Version Bump, backport change for bufferoverflow

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

4 files changed, 44 insertions, 17 deletions

diff --git a/x11-misc/touchcal/ChangeLog b/x11-misc/touchcal/ChangeLog
index b97146f658e7..c186c39d78d5 100644
--- a/x11-misc/touchcal/ChangeLog
+++ b/x11-misc/touchcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/touchcal
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/touchcal/ChangeLog,v 1.8 2011/04/14 06:59:59 jlec Exp $
+
+*touchcal-0.40 (14 Apr 2011)
+
+  14 Apr 2011; Justin Lecher <jlec@gentoo.org>
+  files/touchcal-0.31-buff-overflow.patch, +touchcal-0.40.ebuild:
+  Version Bump, backport change for bufferoverflow
 
 *touchcal-0.31-r1 (14 Apr 2011)
 
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index 38f3865bdee6..faf0c5982583 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX touchcal-0.31-buff-overflow.patch 478 RMD160 14eb8f5495eab7868b3ca2a2e8086e47c9b488c1 SHA1 60db182a68625c335ffa44cdc97bad747f065e4a SHA256 7995ef82f8edf8abffa5ae38807d6a2bf8b24585b7b2762eb9ff7069fa81b524
+AUX touchcal-0.31-buff-overflow.patch 482 RMD160 51e5ebe478dec0b7c5986c82dee707350fb8aa59 SHA1 6135dcaefccb2d5a6aa99d766809607f3d0eaef9 SHA256 060c1336e7a594d523e99d26f7c0fc9a7990eb0878924cdb121e08e7943ec259
 DIST touchcal-0.31.tar.gz 85201 RMD160 6e49be8a16d96ab0fe4dcc9df5c69d9ec53c245e SHA1 fb71f685d037b9946702542326c85d16dfd4d5af SHA256 10f639c7a4f806eb793b219e0420c85f2c423033097ce59b0c3e1aa9dbce221f
+DIST touchcal-0.40.tar.gz 88004 RMD160 8f4ece68aa485664657a1586c526c0f732ff7fa8 SHA1 2c9638e7a73d153d0e4c5569a3e18241de4900bb SHA256 f95af1c868862c267774333d2e7fa1ef3b285ef220da5d80773bcd02b0a0a147
 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
+EBUILD touchcal-0.40.ebuild 472 RMD160 4b35c28756bf7e4eff748ef18a2dd2c7c87e3373 SHA1 2a2715298e2d7968ef38df1003d34d1fdb19236b SHA256 98a484354b671e6b8c823e888b1f161f12ab93b228a9f2379b3003f80d4bb192
+MISC ChangeLog 1388 RMD160 58391a292c9c6e204981f5fb360cabaa70803924 SHA1 1d4d5f95d5b7a369ee159d0dcf3c11737f965728 SHA256 36f050b98fe801bedfbf1246631c87392b377fbe24cb80afb3d89513ae828808
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2mmrkACgkQgAnW8HDreRYpVwCeKnKW0WkzgFhesl74EU2O4p16
-NMAAn0kueOzXvxSobU0KZGx9Uv/2fUSw
-=+a7W
+iEYEARECAAYFAk2mm3QACgkQgAnW8HDreRaJ/ACgwbA1qVJziBzo8ekZKrLXjQWa
+fi4AnAoGnjUWw/OlwV7go5BI4R5YnV5H
+=CS7h
 -----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
index 7c64d5c4c7ee..a9bea151f8e6 100644
--- a/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
+++ b/x11-misc/touchcal/files/touchcal-0.31-buff-overflow.patch
@@ -1,16 +1,18 @@
- touchcal.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ touchcal.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/touchcal.c b/touchcal.c
-index 7341fd7..22bd978 100644
+index 7341fd7..93b262c 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];
+@@ -138,8 +138,8 @@ static void init_mu(char dev[])
+ 	set_page[3]='1';
+ 	set_page[4]=0x0d;
+ 
+-	/*define data string*/
+-	strcpy(data,"00180769001D0793");
++    /* define data string */
++    strncpy(data, "00180769001D0793", 16);
+ 
+ 	bzero(&newtio, sizeof(newtio)); /* clear struct for new port settings */
  
- 	/*Open serial device for reading and writing*/
- 	fd = open(dev, O_RDWR | O_NOCTTY );
diff --git a/x11-misc/touchcal/touchcal-0.40.ebuild b/x11-misc/touchcal/touchcal-0.40.ebuild
new file mode 100644
index 000000000000..926843edc247
--- /dev/null
+++ b/x11-misc/touchcal/touchcal-0.40.ebuild
@@ -0,0 +1,17 @@
+# 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.40.ebuild,v 1.1 2011/04/14 06:59:59 jlec Exp $
+
+EAPI="4"
+
+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}"