[libcgroup/f14] - Resolves: #683541 cgconfig fails to parse commas in the cgconfig.conf file

[Ivana Varekova]

commit 7157da0d8cf0b98b005c0ec5577ac21db88bf4d9
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Thu May 26 16:10:18 2011 +0200

    - Resolves: #683541
      cgconfig fails to parse commas in the cgconfig.conf file

 libcgroup-0.36.2-comma.patch |   12 ++++++++++++
 libcgroup.spec               |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/libcgroup-0.36.2-comma.patch b/libcgroup-0.36.2-comma.patch
new file mode 100644
index 0000000..6506082
--- /dev/null
+++ b/libcgroup-0.36.2-comma.patch
@@ -0,0 +1,12 @@
+diff -up libcgroup-0.36.2/src/lex.l.pom libcgroup-0.36.2/src/lex.l
+--- libcgroup-0.36.2/src/lex.l.pom	2010-06-04 13:39:18.000000000 +0200
++++ libcgroup-0.36.2/src/lex.l	2011-05-26 15:57:58.000000000 +0200
+@@ -32,7 +32,7 @@ int line_no = 1;
+ "perm"		{return PERM;}
+ "group"		{return GROUP;}
+ "namespace"	{return NAMESPACE;}
+-[a-zA-Z0-9_\-\/\.]+ {yylval.name = strdup(yytext); return ID;}
++[a-zA-Z0-9_\-\/\.\,]+ {yylval.name = strdup(yytext); return ID;}
+ .	{return yytext[0];}
+ %%
+ 
diff --git a/libcgroup.spec b/libcgroup.spec
index d0c096f..085bd64 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -5,7 +5,7 @@ Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
 Version: 0.36.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
@@ -16,6 +16,8 @@ Patch3: libcgroup-0.36.2-initscripts.patch
 Patch4: fedora-nochdir.patch
 Patch5: libcgroup-CVE-2011-1022.patch
 Patch6: libcgroup-CVE-2011-1006.patch
+#Resolves: #683541
+Patch7: libcgroup-0.36.2-comma.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel
@@ -56,6 +58,7 @@ provide scripts to manage that configuration.
 %patch4 -p1 -b .nochdir
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1 -b .comma
 
 %build
 %configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install --enable-pam-module-dir=/%{_lib}/security
@@ -150,6 +153,10 @@ fi
 %doc COPYING INSTALL 
 
 %changelog
+* Thu May 26 2011 Ivana Hutarova Varekova <varekova at redhat.com> 0.36.2-7
+- Resolves: #683541
+  cgconfig fails to parse commas in the cgconfig.conf file
+
 * Thu Mar  3 2011 Jan Safranek <jsafrane at redhat.com> 0.36.2-6
 - Fixed CVE-2011-1022 and CVE-2011-1006