buffer overflow fix

5 files changed, 71 insertions, 3 deletions

diff --git a/app-misc/xtrlock/ChangeLog b/app-misc/xtrlock/ChangeLog
index 6e29bb3a5c70..fe6d5dae2ab5 100644
--- a/app-misc/xtrlock/ChangeLog
+++ b/app-misc/xtrlock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/xtrlock
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xtrlock/ChangeLog,v 1.3 2003/02/12 05:12:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xtrlock/ChangeLog,v 1.4 2003/04/24 10:15:51 liquidx Exp $
+
+*xtrlock-2.0-r1 (24 Apr 2003)
+
+  24 Apr 2003; Alastair Tse <liquidx@gentoo.org> xtrlock-2.0-r1.ebuild,
+  files/xtrlock-2.0-overflow.patch:
+  buffer overflow fix contributed by Srakyi <srakyi@centrum.cz>. (#18992)
+  this source seems to be unmaintained.
 
 *xtrlock-2.0 (1 Feb 2002)
 
diff --git a/app-misc/xtrlock/Manifest b/app-misc/xtrlock/Manifest
index e108e267def3..af2fd8b49299 100644
--- a/app-misc/xtrlock/Manifest
+++ b/app-misc/xtrlock/Manifest
@@ -1,6 +1,6 @@
-MD5 12e4203eba22e8750ff39f29507d4120 ChangeLog 1004
+MD5 ca1c9c7fcba88abbfa4801b3a5a1bb80 ChangeLog 1005
 MD5 00f5961de4d78a1ea1dd8463bc190fa3 xtrlock-2.0.ebuild 762
-MD5 dedfc08721fa2bc657d97ff40607b944 xtrlock-2.0-r1.ebuild 912
+MD5 f3f036c44519dc1bd022d86f57e96df3 xtrlock-2.0-r1.ebuild 916
 MD5 9c5d390720d5c846a174088a8214c7c8 files/digest-xtrlock-2.0 63
 MD5 9c5d390720d5c846a174088a8214c7c8 files/digest-xtrlock-2.0-r1 63
 MD5 4bbac4dd2e60384f0e40af9e37159cd2 files/xtrlock-2.0-overflow.patch 712
diff --git a/app-misc/xtrlock/files/digest-xtrlock-2.0-r1 b/app-misc/xtrlock/files/digest-xtrlock-2.0-r1
new file mode 100644
index 000000000000..169595f840ee
--- /dev/null
+++ b/app-misc/xtrlock/files/digest-xtrlock-2.0-r1
@@ -0,0 +1 @@
+MD5 9e967df7e3675f045b6349ff8cb9fdf1 xtrlock_2.0-6.tar.gz 6801
diff --git a/app-misc/xtrlock/files/xtrlock-2.0-overflow.patch b/app-misc/xtrlock/files/xtrlock-2.0-overflow.patch
new file mode 100644
index 000000000000..0242247e4fe8
--- /dev/null
+++ b/app-misc/xtrlock/files/xtrlock-2.0-overflow.patch
@@ -0,0 +1,25 @@
+--- xtrlock.c       1997-10-22 12:32:28.000000000 +0200
++++ xtrlock.c   2003-04-08 19:41:12.000000000 +0200
+@@ -14,6 +14,9 @@
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
++ *
++ * .. overflow bug patched by srakyi (http://srakyi.modry.cz) - no warranty
++ *
+  */
+
+ #include <X11/X.h>
+@@ -191,8 +194,10 @@
+         break;
+       default:
+         if (clen != 1) break;
+-        if (rlen < sizeof(rbuf)) rbuf[rlen]= cbuf[0];
+-        rlen++;
++        if (rlen < sizeof(rbuf)) {
++         rbuf[rlen]= cbuf[0];
++          rlen++;
++         }
+         break;
+       }
+       break;
diff --git a/app-misc/xtrlock/xtrlock-2.0-r1.ebuild b/app-misc/xtrlock/xtrlock-2.0-r1.ebuild
new file mode 100644
index 000000000000..0c45d8ffa329
--- /dev/null
+++ b/app-misc/xtrlock/xtrlock-2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xtrlock/xtrlock-2.0-r1.ebuild,v 1.1 2003/04/24 10:15:51 liquidx Exp $
+
+MY_P=${PN}_${PV}-6
+S=${WORKDIR}/${P}
+DESCRIPTION="A simplistic screen locking program for X"
+SRC_URI="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/${MY_P}.tar.gz"
+HOMEPAGE="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc"
+
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	einfo "Applying buffer overflow patch .."
+	patch -p0 < ${FILESDIR}/${P}-overflow.patch || die "patch failed"
+}
+
+src_compile() {
+	xmkmf || die
+	cp Makefile Makefile.orig
+	make CFLAGS="${CFLAGS} -DSHADOW_PWD" xtrlock || die
+}
+
+src_install() {
+	dobin xtrlock
+	chmod u+s ${D}/usr/bin/xtrlock 
+	mv xtrlock.man xtrlock.1
+	doman xtrlock.1
+}