Security update

3 files changed, 107 insertions, 12 deletions

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) {
+