Security update

5 files changed, 188 insertions, 13 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index acd8f09502d2..239e21a24f8f 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.3 2002/11/12 15:40:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.4 2003/01/07 16:58:28 aliz Exp $
+
+*lcdproc-0.4.3-r1 (07 Jan 2003)
+
+  07 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> lcdproc-0.4.3-r1.ebuild :
+  Massive ebuild updates by Rene Wagner <reenoo@gmx.net> in #13291.
+  Unmasked becuse 0.4.1 contains buffer overflows.
 
 *lcdproc-0.4.3 (05 Nov 2002)
 
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.4.3-r1 b/app-misc/lcdproc/files/digest-lcdproc-0.4.3-r1
new file mode 100644
index 000000000000..1f5322b6c793
--- /dev/null
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.4.3-r1
@@ -0,0 +1 @@
+MD5 77228a346a1f4347eb0db7383c76c988 lcdproc-0.4.3.tar.gz 351458
diff --git a/app-misc/lcdproc/files/lcdproc b/app-misc/lcdproc/files/lcdproc
index 781d36d34cfa..ec3a8f5e1e35 100644
--- a/app-misc/lcdproc/files/lcdproc
+++ b/app-misc/lcdproc/files/lcdproc
@@ -1,23 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/lcdproc,v 1.4 2001/12/23 23:25:19 azarah Exp $
-
-# NB: Config is in /etc/conf.d/lcdproc
-
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/lcdproc,v 1.5 2003/01/07 16:58:28 aliz Exp $
 
 start() {
 	ebegin "Starting LCDProc"
-	 ln -s /dev/$port /dev/lcd	
-	 /usr/local/bin/LCDd -d $driver -b on -i off
-	 /usr/local/bin/lcdproc $clients & 
-	eend
+	source /etc/lcdproc.conf
+	ebegin "Starting lcdproc"
+	/usr/bin/lcdproc -d ${SCREENS}
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping LCDProc"
-	 killall lcdproc 
-	 killall LCDd  
-	 rm -f /dev/lcd
-	eend
+	killall lcdproc 
+	eend $?
 }
diff --git a/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff b/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff
new file mode 100644
index 000000000000..5fc8cd72e267
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff
@@ -0,0 +1,99 @@
+===================================================================
+RCS file: /cvsroot/lcdproc/lcdproc/server/main.c,v
+retrieving revision 1.38.2.18
+retrieving revision 1.38.2.18.2.4
+diff -u -r1.38.2.18 -r1.38.2.18.2.4
+--- lcdproc/lcdproc/server/main.c	2002/05/14 11:30:24	1.38.2.18
++++ lcdproc/lcdproc/server/main.c	2002/11/14 03:11:12	1.38.2.18.2.4
+@@ -10,6 +10,7 @@
+  *		 2001, Rene Wagner
+  *		 2002, Mike Patnode
+  *		 2002, Guillaume Filion
++ *		 2002, Bernhard Tittelbach
+  *
+  *
+  * Contains main(), plus signal callback functions and a help screen.
+@@ -273,6 +274,8 @@
+ 	strncpy( user, UNSET_STR, sizeof(user) );
+ 	daemon_mode = UNSET_INT;
+ 	enable_server_screen = UNSET_INT;
++	heartbeat = UNSET_INT;
++	heartbeat_state = UNSET_INT;
+ 	backlight = UNSET_INT;
+ 	backlight_state = UNSET_INT;
+ 
+@@ -304,7 +307,7 @@
+ int
+ process_command_line (int argc, char **argv)
+ {
+-	char  c;
++	int  c;
+ 
+ 	/*report( RPT_INFO, "process_command_line()" );*/
+ 
+@@ -461,6 +464,45 @@
+ 		}
+ 	}
+ 
++	if( heartbeat == UNSET_INT ) {
++		s = config_get_string( "server", "heartbeat", 0, UNSET_STR );
++		if( strcmp( s, "on" ) == 0 ) {
++			heartbeat = HEARTBEAT_ON;
++			heartbeat_state = heartbeat;
++		}
++		else if( strcmp( s, "off" ) == 0 ) {
++			heartbeat = HEARTBEAT_OFF;
++			heartbeat_state = heartbeat;
++		}
++		else if( strcmp( s, "slash" ) == 0 ) {
++			heartbeat = HEARTBEAT_SLASH;
++			heartbeat_state = heartbeat;
++		}
++		else if( strcmp( s, "open" ) == 0 ) {
++			heartbeat = HEARTBEAT_OPEN;
++		}
++		else if( strcmp( s, UNSET_STR ) != 0 ) {
++			report( RPT_ERR, "Backlight should be on, off, slash or open" );
++		}
++	}
++
++	if( heartbeat == HEARTBEAT_OPEN && heartbeat_state == UNSET_INT ) {
++		s = config_get_string( "server", "initialheartbeat", 0, UNSET_STR );
++		if( strcmp( s, "on" ) == 0 ) {
++			heartbeat_state = HEARTBEAT_ON;
++		}
++		else if( strcmp( s, "off" ) == 0 ) {
++			heartbeat_state = HEARTBEAT_OFF;
++		}
++		else if( strcmp( s, "slash" ) == 0 ) {
++			heartbeat = HEARTBEAT_SLASH;
++			heartbeat_state = heartbeat;
++		}
++		else if( strcmp( s, UNSET_STR ) != 0 ) {
++			report( RPT_ERR, "Initial heartbeat should be on, off, or slash" );
++		}
++	}
++
+ 	if( backlight == UNSET_INT ) {
+ 		s = config_get_string( "server", "backlight", 0, UNSET_STR );
+ 		if( strcmp( s, "on" ) == 0 ) {
+@@ -622,6 +664,11 @@
+ 	if (default_duration == UNSET_INT)
+ 		default_duration = DEFAULT_SCREEN_DURATION;
+ 
++	if (heartbeat == UNSET_INT)
++		heartbeat = HEARTBEAT_OPEN;
++	if (backlight_state == UNSET_INT)
++		heartbeat_state = HEARTBEAT_ON;
++
+ 	if (backlight == UNSET_INT)
+ 		backlight = BACKLIGHT_OPEN;
+ 	if (backlight_state == UNSET_INT)
+@@ -913,6 +960,7 @@
+ 			free(message);
+ 		} else {
+ 			report(RPT_DEBUG, "Error: Received NULL pointer");
++			free(message); /*fixes memory leak*/
+ 		}
+ 		if (s && s->timeout != -1) {
+ 
diff --git a/app-misc/lcdproc/lcdproc-0.4.3-r1.ebuild b/app-misc/lcdproc/lcdproc-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..e985455ce9f8
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.4.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.4.3-r1.ebuild,v 1.1 2003/01/07 16:58:28 aliz Exp $
+
+SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.gz"
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE="doc ncurses svga"
+S=${WORKDIR}/${P}
+
+DEPEND=">=sys-apps/baselayout-1.6.4
+	doc? ( >=app-text/docbook-sgml-utils-0.6.11-r2 )
+	ncurses? ( >=sys-libs/ncurses-5.3 )
+	svga? ( >=media-libs/svgalib-1.4.3 )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	sed -i "889s:-O3:${CFLAGS}:" configure
+
+	# fix a few bugs ;)
+	patch -p2 < ${FILESDIR}/${P}-gentoo.diff || die \
+		"Patch #1 failed."
+}
+
+src_compile() {
+	local myconf
+	
+	myconf="--enable-stat-nfs --enable-drivers=mtxorb,cfontz,text,lb216,hd44780,joy,irman,lircin,"
+	myconf="${myconf}bayrad,glk,stv5730,sed1330,sed1520,lcdm001,t6963"
+
+	use ncurses && myconf="${myconf},curses"
+	use svga && myconf="${myconf},svgalib"
+	use samba && myconf="$myconf --enable-stat-smbfs"
+
+	econf ${myconf} || die
+	emake || die
+
+	if [ `use doc` ]; then
+		cd ${S}/docs/lcdproc-user
+		docbook2html lcdproc-user.docbook
+	fi
+}
+
+src_install() {
+ 	dosbin server/LCDd
+ 	dobin clients/lcdproc/lcdproc
+
+ 	doman docs/lcdproc.1 docs/LCDd.8
+
+ 	dodoc README ChangeLog COPYING INSTALL 
+
+	use doc && dohtml docs/lcdproc-user/*.html
+
+	docinto docs
+ 	dodoc docs/README.dg* docs/*.txt
+
+	insinto /usr/share/doc/${PF}/clients/examples
+	doins clients/examples/*.pl
+	insinto /usr/share/doc/${PF}/clients/headlines
+	doins clients/headlines/lcdheadlines
+
+	insinto /etc
+	doins LCDd.conf
+	doins scripts/lcdproc.conf
+ 
+ 	exeinto /etc/init.d
+	doexe ${FILESDIR}/LCDd
+	doexe ${FILESDIR}/lcdproc		
+}