From ac3d06838daff2fc5cbfab3d432a63e94d2b2e54 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Jun 04 2009 03:56:25 +0000
Subject: - Fix language parsing code (bug 502778)


---

diff --git a/gdm-2.26.0-fix-lang-regex.patch b/gdm-2.26.0-fix-lang-regex.patch
new file mode 100644
index 0000000..bf95dca
--- /dev/null
+++ b/gdm-2.26.0-fix-lang-regex.patch
@@ -0,0 +1,22 @@
+commit 74cdbc6d71120f2d9c91965ead989f68cadb4bac
+Author: Ray Strode <rstrode@redhat.com>
+Date:   Wed Jun 3 23:52:06 2009 -0400
+
+    Fix language name parsing regex
+    
+    It didn't properly escape the "." character so it was allowing
+    any character to be matched instead of just periods.
+
+diff --git a/gui/simple-greeter/gdm-languages.c b/gui/simple-greeter/gdm-languages.c
+index 2d862b2..429ba28 100644
+--- a/gui/simple-greeter/gdm-languages.c
++++ b/gui/simple-greeter/gdm-languages.c
+@@ -123,7 +123,7 @@ gdm_parse_language_name (const char *name,
+         error = NULL;
+         re = g_regex_new ("^(?P<language>[^_.@[:space:]]+)"
+                           "(_(?P<territory>[[:upper:]]+))?"
+-                          "(.(?P<codeset>[-_0-9a-zA-Z]+))?"
++                          "(\\.(?P<codeset>[-_0-9a-zA-Z]+))?"
+                           "(@(?P<modifier>[[:ascii:]]+))?$",
+                           0, 0, &error);
+         if (re == NULL) {
diff --git a/gdm.spec b/gdm.spec
index 829681e..a9397ee 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.26.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -103,6 +103,9 @@ Patch20: session-client.patch
 # fixed upstream
 Patch21: xdmcp-use-after-free.patch
 
+# fixed upstream, rh 502778
+Patch22: gdm-2.26.0-fix-lang-regex.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -148,6 +151,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 
 %patch20 -p1 -b .session-client
 %patch21 -p1 -b .xdmcp-use-after-free
+%patch22 -p1 -b .fix-lang-regex
 
 %patch99 -p1 -b .fedora-logo
 
@@ -389,6 +393,9 @@ fi
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Wed Jun 03 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.1-11
+- Fix language parsing code (bug 502778)
+
 * Wed May 13 2009 Ray Strode <rstrode@redhat.com> - 1:2.26.1-10
 - Update multi-stack patch to fix bug 499272