[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (365bcce4f9ab9ada9b51ef1cf5976e4556c3cd47)

Pol Vinogradov scm at sourcemage.org
Tue Jan 15 15:56:58 EST 2008


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 kernels/lm_sensors/HISTORY        |    3 
 kernels/lm_sensors/PRE_BUILD      |    3 
 kernels/lm_sensors/conf-lex.patch |  205 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletion(-)

New commits:
commit 31e23d587b7d3906989dfeec3a8c3398b7606383
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    kernels/lm_sensors: added patch for config lexical analyzer

diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index cb01e4e..0e776f6 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,3 +1,6 @@
+2008-01-14 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD, conf-lex.patch: added patch for config lexical analyzer
+
 2008-01-12 Mathieu Lonjaret <lejatorn at sourcemage.org>
 	* fixed non persistence of branch change in DETAILS (credits go to
 		ryuji and lynxlynxlynx).
diff --git a/kernels/lm_sensors/PRE_BUILD b/kernels/lm_sensors/PRE_BUILD
index 97bece3..761fa89 100755
--- a/kernels/lm_sensors/PRE_BUILD
+++ b/kernels/lm_sensors/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-sed -i 's,MANDIR := $(PREFIX)/man,MANDIR := $(PREFIX)/share/man,' Makefile
+sed -i 's,MANDIR := $(PREFIX)/man,MANDIR := $(PREFIX)/share/man,' Makefile  &&
+patch -p0 < ${SCRIPT_DIRECTORY}/conf-lex.patch
diff --git a/kernels/lm_sensors/conf-lex.patch b/kernels/lm_sensors/conf-lex.patch
new file mode 100644
index 0000000..6c3a20f
--- /dev/null
+++ b/kernels/lm_sensors/conf-lex.patch
@@ -0,0 +1,205 @@
+--- lib/conf-lex.l.orig	2008-01-14 13:01:27.000000000 +0500
++++ lib/conf-lex.l	2008-01-14 13:42:10.000000000 +0500
+@@ -48,38 +48,36 @@
+ 
+ %}
+ 
+- /* Scanner for configuration files */
++/* Scanner for configuration files */
+ 
+ %option nodefault
+ %option noyywrap
+ %option nounput
+ 
+- /* All states are exclusive */
++/* All states are exclusive */
+ 
+ %x MIDDLE
+ %x STRING
+ %x ERR
+ 
+- /* Any whitespace-like character */
++/* Any whitespace-like character */
+ 
+ BLANK		[ \f\t\v]
+ 
+ IDCHAR		[[:alnum:]_]
+ 
+- /* Note: `10', `10.4' and `.4' are valid, `10.' is not */
++/* Note: `10', `10.4' and `.4' are valid, `10.' is not */
+ 
+ FLOAT   [[:digit:]]*\.?[[:digit:]]+
+ 
+- /* Only positive whole numbers are recognized here */
++/* Only positive whole numbers are recognized here */
+ 
+ NUM	0|([1-9][[:digit:]]*)
+ 
+ 
+ %%
+ 
+- /*
+-  * STATE: INITIAL
+-  */
++    /* STATE: INITIAL */
+ 
+ <INITIAL>{
+ 
+@@ -93,7 +91,7 @@
+ 		  sensors_yylineno++;
+ 		}
+ 
+- /* comments */
++    /* comments */
+ 
+ #.*		; /* eat the rest of the line after comment char */
+ 
+@@ -101,12 +99,12 @@
+ 		  sensors_yylineno++;
+ 		}
+ 
+- /*
+-  * Keywords must be followed by whitespace - eat that too.
+-  * If there isn't trailing whitespace, we still need to
+-  * accept it as lexically correct (even though the parser
+-  * will reject it anyway.)
+-  */
++    /*
++     * Keywords must be followed by whitespace - eat that too.
++     * If there isn't trailing whitespace, we still need to
++     * accept it as lexically correct (even though the parser
++     * will reject it anyway.)
++     */
+ 
+ label{BLANK}*	{
+ 		  sensors_yylval.line = sensors_yylineno;
+@@ -144,7 +142,7 @@
+ 		  return IGNORE;
+ 		}
+ 
+- /* Anything else at the beginning of a line is an error */
++    /* Anything else at the beginning of a line is an error */
+ 
+ [a-z]+		|
+ .		{
+@@ -154,9 +152,9 @@
+ 		}
+ }
+ 
+- /*
+-  * STATE: ERROR
+-  */
++    /*
++     * STATE: ERROR
++     */
+ 
+ <ERR>{
+ 
+@@ -169,9 +167,9 @@
+ 		}
+ }
+ 
+- /*
+-  * STATE: MIDDLE
+-  */
++    /*
++     * STATE: MIDDLE
++     */
+ 
+ <MIDDLE>{
+ 
+@@ -192,7 +190,7 @@
+ 		  sensors_yylineno++;
+ 		}
+ 
+- /* comments */
++    /* comments */
+ 
+ #.*		; /* eat the rest of the line after comment char */
+ 
+@@ -202,14 +200,14 @@
+ 		  return EOL;
+ 		}
+ 
+- /* A number */
++    /* A number */
+ 
+ {FLOAT}		{
+ 		  sensors_yylval.value = atof(sensors_yytext);
+ 		  return FLOAT;
+ 		}
+ 
+- /* Some operators */
++    /* Some operators */
+ 
+ "+"		return '+';
+ "-"		return '-';
+@@ -222,14 +220,14 @@
+ "^"		return '^';
+ "`"		return '`';
+ 
+- /* Quoted string */
++    /* Quoted string */
+ 
+ \"		{
+ 		  buffer_malloc();
+ 		  BEGIN(STRING);
+ 		}
+ 
+- /* A normal, unquoted identifier */
++    /* A normal, unquoted identifier */
+ 
+ {IDCHAR}+	{
+ 		  sensors_yylval.name = strdup(sensors_yytext);
+@@ -240,7 +238,7 @@
+ 		  return NAME;
+ 		}
+ 
+- /* anything else is bogus */
++    /* anything else is bogus */
+ 
+ .		|
+ [[:digit:]]*\.	|
+@@ -250,13 +248,13 @@
+ 		}
+ }
+ 
+- /*
+-  * STATE: STRING
+-  */
++    /*
++     * STATE: STRING
++     */
+ 
+ <STRING>{
+ 
+- /* Oops, newline or EOF while in a string is not good */
++    /* Oops, newline or EOF while in a string is not good */
+ 
+ \n		|
+ \\\n		{
+@@ -277,7 +275,7 @@
+ 		  return ERROR;
+ 		}
+ 
+- /* At the end */
++    /* At the end */
+ 
+ \"\"		{
+ 		  buffer_add_char("\0");
+@@ -307,13 +305,13 @@
+ \\t		buffer_add_char("\t");
+ \\v		buffer_add_char("\v");
+ 
+- /* Other escapes: just copy the character behind the slash */
++    /* Other escapes: just copy the character behind the slash */
+ 
+ \\.		{
+ 		  buffer_add_char(&sensors_yytext[1]);
+ 		}
+ 
+- /* Anything else (including a bare '\' which may be followed by EOF) */
++    /* Anything else (including a bare '\' which may be followed by EOF) */
+ 
+ \\		|
+ [^\\\n\"]+	{



More information about the SM-Commit mailing list