diff options
author | Markus Ullmann <jokey@gentoo.org> | 2006-09-18 14:55:45 +0000 |
---|---|---|
committer | Markus Ullmann <jokey@gentoo.org> | 2006-09-18 14:55:45 +0000 |
commit | 5b9165f9f8d45114b645f4d08e5f940ffa6ede78 (patch) | |
tree | 93da422fdce8e010ba14964d91b4a1612b6c7212 /app-misc/lcdproc/files | |
parent | Cleanup and Version bump, thanks to Robert Buchholz in bug #130302 for provid... (diff) | |
download | gentoo-2-5b9165f9f8d45114b645f4d08e5f940ffa6ede78.tar.gz gentoo-2-5b9165f9f8d45114b645f4d08e5f940ffa6ede78.tar.bz2 gentoo-2-5b9165f9f8d45114b645f4d08e5f940ffa6ede78.zip |
Cleanup and Version bump, thanks to Robert Buchholz in bug #130302 for providing ebuild and needed patch
(Portage version: 2.1.2_pre1)
(Signed Manifest commit)
Diffstat (limited to 'app-misc/lcdproc/files')
-rw-r--r-- | app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff | 99 | ||||
-rw-r--r-- | app-misc/lcdproc/files/lcdproc-0.4.4-security.patch | 12 | ||||
-rw-r--r-- | app-misc/lcdproc/files/lcdproc.confd | 16 |
3 files changed, 0 insertions, 127 deletions
diff --git a/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff b/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff deleted file mode 100644 index 5fc8cd72e267..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.4.3-gentoo.diff +++ /dev/null @@ -1,99 +0,0 @@ -=================================================================== -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/files/lcdproc-0.4.4-security.patch b/app-misc/lcdproc/files/lcdproc-0.4.4-security.patch deleted file mode 100644 index 299abdeafe5b..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.4.4-security.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN lcdproc-0.4.4/server/parse.c lcdproc-0.4.4-fixed/server/parse.c ---- lcdproc-0.4.4/server/parse.c 2004-03-16 17:06:12.000000000 -0300 -+++ lcdproc-0.4.4-fixed/server/parse.c 2004-03-31 13:49:23.000000000 -0300 -@@ -158,7 +158,7 @@ - - - argc++; -- } while (*p); -+ } while (*p && i < MAX_ARGUMENTS); - - /*debug(RPT_DEBUG, "exiting string scan...");*/ - diff --git a/app-misc/lcdproc/files/lcdproc.confd b/app-misc/lcdproc/files/lcdproc.confd deleted file mode 100644 index 1dae1f578f33..000000000000 --- a/app-misc/lcdproc/files/lcdproc.confd +++ /dev/null @@ -1,16 +0,0 @@ -# which port is the LCD connected -port="ttyS0" - -# what driver should be used -driver="MtxOrb" - -# "C" (CPU usage) -# "G" (CPU Graph like Xload) -# "M" (Memory Usage) -# "X" (X-Load) -# "T" (Date, time, Uptime, OS version) -# "D" (Disk Stats) -# "B" (Battery Stats) -# "A" (About) -# for more clients see "LCDproc Homepage" -clients="C M T X" |