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 | |
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')
-rw-r--r-- | app-misc/lcdproc/Manifest | 44 | ||||
-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 |
4 files changed, 24 insertions, 147 deletions
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest index ccbe407a0da7..62e493737223 100644 --- a/app-misc/lcdproc/Manifest +++ b/app-misc/lcdproc/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 0.5.0-LCDd-conf-driver-path.patch 444 RMD160 11d980069324d65eaea54b955cb2dbfc4eeed502 SHA1 697645ac576e062c7e2f2ace5ced16dff362abc5 SHA256 f3aa79cded429f6b0f7f77a554497c8cf8680d9ae614c7b4d9bd05a0a57113f1 +MD5 aeb87b6641dabc50f7ccd3dfe0c5aae9 files/0.5.0-LCDd-conf-driver-path.patch 444 +RMD160 11d980069324d65eaea54b955cb2dbfc4eeed502 files/0.5.0-LCDd-conf-driver-path.patch 444 +SHA256 f3aa79cded429f6b0f7f77a554497c8cf8680d9ae614c7b4d9bd05a0a57113f1 files/0.5.0-LCDd-conf-driver-path.patch 444 AUX LCDd 544 RMD160 554201b2ca62fb5496f06fc3bf40afcb36af9974 SHA1 594fd6be41199fb9a536ec8dd9b29f46de6f7f25 SHA256 d8009b3984169a819e95a73adc19d5b63c990d63a965a396e10b68703614a652 MD5 d3107f6fcc0b4c876e4ed05170177365 files/LCDd 544 RMD160 554201b2ca62fb5496f06fc3bf40afcb36af9974 files/LCDd 544 @@ -9,34 +13,34 @@ AUX lcdproc 512 RMD160 45c496b9f1f6e683c096d4a1ec09ffb6e9c9fdda SHA1 da36be60745 MD5 51af79cb647ae69176a97e1217b47d4c files/lcdproc 512 RMD160 45c496b9f1f6e683c096d4a1ec09ffb6e9c9fdda files/lcdproc 512 SHA256 c8fb7ec117015b7a32118bd8d653ada5950c0f6b214a18a098eb291c606e9cca files/lcdproc 512 -AUX lcdproc-0.4.3-gentoo.diff 2801 RMD160 51d3d903c515f79945a7119d4ffa738377173915 SHA1 730856f219b41aedb046381ead021168e32a9654 SHA256 bd14ff1d461409fe9fef4e5be58fd7850f9ca40f029f8868d453ba69fd5e41bb -MD5 6230f34f250e4f4c7026702e31047d27 files/lcdproc-0.4.3-gentoo.diff 2801 -RMD160 51d3d903c515f79945a7119d4ffa738377173915 files/lcdproc-0.4.3-gentoo.diff 2801 -SHA256 bd14ff1d461409fe9fef4e5be58fd7850f9ca40f029f8868d453ba69fd5e41bb files/lcdproc-0.4.3-gentoo.diff 2801 -AUX lcdproc-0.4.4-security.patch 372 RMD160 4af020a56070fcc111460432c35c32b95abba906 SHA1 8eddc2359cf9630efe62e3016afcb7fe27cddaff SHA256 7129ca04d3cf0fd3cf999aa29e4c7839bfc7703b25608aff2f3ebd5e135ee467 -MD5 93bc2139ae4ea5fdb0cc9cda7cdf1ec8 files/lcdproc-0.4.4-security.patch 372 -RMD160 4af020a56070fcc111460432c35c32b95abba906 files/lcdproc-0.4.4-security.patch 372 -SHA256 7129ca04d3cf0fd3cf999aa29e4c7839bfc7703b25608aff2f3ebd5e135ee467 files/lcdproc-0.4.4-security.patch 372 -AUX lcdproc.confd 331 RMD160 2343561665d39d30224fdedd1e2fad185c8d14fc SHA1 37cf7b014eb174ebb16f72be5f02d7e35d675fee SHA256 31583e8761d975a5c205dc5d0cb495907cebc5276e16b25ea56a8c989ed5232d -MD5 041467af40c15c7a566f4c56bb369676 files/lcdproc.confd 331 -RMD160 2343561665d39d30224fdedd1e2fad185c8d14fc files/lcdproc.confd 331 -SHA256 31583e8761d975a5c205dc5d0cb495907cebc5276e16b25ea56a8c989ed5232d files/lcdproc.confd 331 DIST lcdproc-0.4.5.tar.bz2 291703 RMD160 07067bfb681a098494a105a290711d973ea0171a SHA1 9680b83d18da8569e8f58d6d0b7b0158f543c94d SHA256 8707767a1ddf85b7894f4f62d9af53121fefff4ab8182eb9491b49a6d56b8127 +DIST lcdproc-0.5.0.tar.gz 711118 RMD160 44153db5fe24cc45aa1b7a4be8afb87a9cd58062 SHA1 e3e1b32ff2f1c534e4f31b5866cbbcd6fbea50fc SHA256 a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b EBUILD lcdproc-0.4.5.ebuild 2630 RMD160 1b8d9a62e1fc0f82ebf16ba3040fe7b5a1463b94 SHA1 5ef27a8ce766eed2d3c207df6eade94a7eddd660 SHA256 e654a5f1bab92e295c8f4a8da1134010f35a579717e9cd7b6d09da041954a10d MD5 c52e55c9684695749b6f83c467622b10 lcdproc-0.4.5.ebuild 2630 RMD160 1b8d9a62e1fc0f82ebf16ba3040fe7b5a1463b94 lcdproc-0.4.5.ebuild 2630 SHA256 e654a5f1bab92e295c8f4a8da1134010f35a579717e9cd7b6d09da041954a10d lcdproc-0.4.5.ebuild 2630 -MISC ChangeLog 4206 RMD160 fbc80367b1259374ced0f107b02c3d043fc4ed80 SHA1 6e538db8647938bad07283ccc21f267131274716 SHA256 11b771d29b0161225caebaef1a4c23365a70d3030b523d3c1e0d784dc7da017c -MD5 bde6e6b23c93ff06c787428784e20713 ChangeLog 4206 -RMD160 fbc80367b1259374ced0f107b02c3d043fc4ed80 ChangeLog 4206 -SHA256 11b771d29b0161225caebaef1a4c23365a70d3030b523d3c1e0d784dc7da017c ChangeLog 4206 +EBUILD lcdproc-0.5.0.ebuild 5322 RMD160 5831d6bed1344569cb4aade1baa433325606dd16 SHA1 cdd857a41c83ab77ba1a63e90de0dbbcfdd1ef54 SHA256 98ec5473e291f65aa24535d0b4edf2f08cd27f3c839f07740663f0f5a8885ab7 +MD5 5263a7f9dc5b30e9b6832933397e9424 lcdproc-0.5.0.ebuild 5322 +RMD160 5831d6bed1344569cb4aade1baa433325606dd16 lcdproc-0.5.0.ebuild 5322 +SHA256 98ec5473e291f65aa24535d0b4edf2f08cd27f3c839f07740663f0f5a8885ab7 lcdproc-0.5.0.ebuild 5322 +MISC ChangeLog 4571 RMD160 e68407ce985aaf071e7b925dc1be16e5be5315b2 SHA1 6dcfaf8bd3ffe8f8418a786ae54fb3542d95ef05 SHA256 3e456ec0c8aa23d22a1c06a886e693b99fd18750c8a76ad069db17ee4d982faa +MD5 563861e513ce5355b29ec67fe192c013 ChangeLog 4571 +RMD160 e68407ce985aaf071e7b925dc1be16e5be5315b2 ChangeLog 4571 +SHA256 3e456ec0c8aa23d22a1c06a886e693b99fd18750c8a76ad069db17ee4d982faa ChangeLog 4571 +MISC metadata.xml 347 RMD160 57d9115a67602540437d61e4bf94f2f5e164e061 SHA1 2fc61586cd884fab52bf7db6056aee450d2bfa22 SHA256 1f8d5bf798f8c8fbdd3c05d5a65edfb149dd36dacd054f237078a748816d6b61 +MD5 c64d0b3bf93b0d9a555d4faaaa5fa9f3 metadata.xml 347 +RMD160 57d9115a67602540437d61e4bf94f2f5e164e061 metadata.xml 347 +SHA256 1f8d5bf798f8c8fbdd3c05d5a65edfb149dd36dacd054f237078a748816d6b61 metadata.xml 347 MD5 dd73d1296a9e0c2b636f440d8ec7108c files/digest-lcdproc-0.4.5 244 RMD160 8ac61a26eb229cd464fde4a99eae188c66cd7474 files/digest-lcdproc-0.4.5 244 SHA256 ec3e28b7b2139bc95d6d832b07f789aa55db4f469147309e40a5c06ae587511a files/digest-lcdproc-0.4.5 244 +MD5 6d44a04cfda3b2fc4e142c9e5f6c030f files/digest-lcdproc-0.5.0 241 +RMD160 0f9866a631a7ba250b3f31cd775862102e1f6a46 files/digest-lcdproc-0.5.0 241 +SHA256 93b5ec62e59ce1da93698995d0e96d014ab04be84ab1639c2a6f185033c7dd0c files/digest-lcdproc-0.5.0 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE1EDlFdQwWVoAgN4RAkrBAKDzdDaSmMmfo8cWF697EdbHdfsbigCg9CpP -bYJfzzX/ESpTHX2hfvckD80= -=L9e+ +iD8DBQFFDrObz974XjDVpbkRApECAJ9lZRfgzhrptySv83qq6FoV9pmRBwCcCqQp +zfuAntT1ESremxenRuRlJ2g= +=8aDe -----END PGP SIGNATURE----- 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" |