From 68c7f20e2bef4ebdd4bf34b01edc8234a30f8ce8 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mar 03 2014 11:51:48 +0000
Subject: lex.l update: add \,% and @ character into regexp for ID


---

diff --git a/libcgroup-0.38-lex.patch b/libcgroup-0.38-lex.patch
new file mode 100644
index 0000000..6983d2f
--- /dev/null
+++ b/libcgroup-0.38-lex.patch
@@ -0,0 +1,26 @@
+From a34b549ff2b6f944b2d97653a32e97e92981ca0f Mon Sep 17 00:00:00 2001
+From: jchaloup <jchaloup@redhat.com>
+Date: Mon, 3 Mar 2014 12:16:13 +0100
+Subject: [PATCH] lex.l update: add \,% and @ character into regexp for ID
+ token
+
+---
+ src/lex.l | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lex.l b/src/lex.l
+index 9ff37ec..243b534 100644
+--- a/src/lex.l
++++ b/src/lex.l
+@@ -40,7 +40,7 @@ jmp_buf parser_error_env;
+ "group"		{return GROUP;}
+ "namespace"	{return NAMESPACE;}
+ "default"	{return DEFAULT;}
+-[a-zA-Z0-9_\-\/\.\,]+ {yylval.name = strdup(yytext); return ID;}
++[a-zA-Z0-9_\-\/\.\,\%\@\\]+ {yylval.name = strdup(yytext); return ID;}
+ \"[^"]*\" {yylval.name = strdup(yytext+1); yylval.name[strlen(yylval.name)-1] = '\0'; return ID; }
+ .	{return yytext[0];}
+ %%
+-- 
+1.8.5.3
+
diff --git a/libcgroup.spec b/libcgroup.spec
index 4bb8c59..b5996f2 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -4,7 +4,7 @@
 Summary: Library to control and monitor control groups
 Name: libcgroup
 Version: 0.38
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 URL: http://libcg.sourceforge.net/
@@ -14,6 +14,7 @@ Source2: cgred.service
 Source3: cgred.sysconfig
 
 Patch0: fedora-config.patch
+Patch1: libcgroup-0.38-lex.patch
 
 BuildRequires: byacc, coreutils, flex, pam-devel, systemd-units
 Requires(pre): shadow-utils
@@ -56,6 +57,7 @@ provide scripts to manage that configuration.
 %prep
 %setup -q
 %patch0 -p1 -b .config-patch
+%patch1 -p1 -b .lex
 
 %build
 %configure --enable-pam-module-dir=%{_libdir}/security \
@@ -153,6 +155,10 @@ getent group cgred >/dev/null || groupadd -r cgred
 %{_libdir}/pkgconfig/libcgroup.pc
 
 %changelog
+* Mon Mar 03 2014 jchaloup <jchaloup@redhat.com> - 0.38-8
+- resolves: #1018839
+  lex.l update: add \,% and @ character into regexp for ID
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.38-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild