rpms/gdm/FC-5 gdmthemetester.in,NONE,1.1 gdm.spec,1.143,1.144

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5713

Modified Files:
	gdm.spec 
Added Files:
	gdmthemetester.in 
Log Message:
- Update to 2.14.1
- fixes CVE-2006-1057 (bug 188303)



--- NEW FILE gdmthemetester.in ---
#!/bin/sh

gdmwhich () {
  COMMAND="$1"
  OUTPUT=
  IFS=:
  for dir in $PATH
  do
    if test -x "$dir/$COMMAND" ; then
      if test "x$OUTPUT" = "x" ; then
        OUTPUT="$dir/$COMMAND"
      fi
    fi
  done
  IFS=$OLD_IFS
  echo "$OUTPUT"
}

echo
echo "GDM Theme Tester"
echo
echo "Be sure to test all the environments:"
echo " console, console-timed, flexi, remote-flexi, xdmcp"
echo "Also be sure to test using caps lock"
echo

XNEST=`gdmwhich Xnest`
GDMXNEST=`gdmwhich gdmXnest`
GDMGREETER="@libexecdir@/gdmgreeter"

if [ x$XNEST = x ]; then
	echo "ERROR: Xnest not found"
        echo ""
	exit 1
fi

if [ x$GDMXNEST = x ]; then
	echo "ERROR: gdmXnest not found"
        echo ""
	exit 1
fi

if [ x$GDMGREETER = x ]; then
	echo "ERROR: gdmgreeter not found"
        echo ""
	exit 1
fi

USAGE="
Usage: $0 <environment> <theme>
<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
<theme> is either the path of the theme or the name of an installed theme

If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
you can test the greeter at that resolution
"
if [ "$#" != 2 ]; then
	echo "$USAGE"
	exit 1
fi

GDM_THEME="$2"
DOING_GDM_DEVELOPMENT=yes
GDM_PARENT_DISPLAY="$DISPLAY"
export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY

case $1 in
console)
	GDM_IS_LOCAL=yes
	export GDM_IS_LOCAL
	;;
console-timed)
	GDM_IS_LOCAL=yes
	GDM_FAKE_TIMED=yes
	export GDM_IS_LOCAL GDM_FAKE_TIMED
	;;
flexi)
	GDM_IS_LOCAL=yes
	GDM_FLEXI_SERVER=yes
	export GDM_IS_LOCAL GDM_FLEXI_SERVER
	;;
remote-flexi)
	GDM_FLEXI_SERVER=yes
	export GDM_FLEXI_SERVER
	;;
xdmcp)
	;;
*)
	echo "$USAGE"
	exit 1
	;;
esac

if [ "x$XNESTSIZE" = x ] ; then
  eval `gdmXnest -b`
else
  eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
fi
export DISPLAY

if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
	echo "ERROR: Can't start the Xnest server"
	exit 1
fi

# This may not be necessary
sleep 1

@libexecdir@/gdmgreeter



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/FC-5/gdm.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gdm.spec	11 Apr 2006 13:57:59 -0000	1.143
+++ gdm.spec	11 Apr 2006 21:05:01 -0000	1.144
@@ -24,6 +24,7 @@
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
+Source4: gdmthemetester.in
 
 Patch1: gdm-2.14.1-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
@@ -115,6 +116,15 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch22 -p1 -b .pam_stack
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=338079
+if [ -f gui/greeter/gdmthemetester.in ]
+then
+  echo "gdmthemetester.in is back. Get rid of Source4" 1>&2
+  exit
+fi
+
+cp -f %{SOURCE4} gui/greeter
+
 # fix the time format for ja
 perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po
 
@@ -308,8 +318,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
-* Tue Apr 11 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.14.1-1.fc5.1
+* Tue Apr 11 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.1-1.fc5.1
 - Update to 2.14.1
+- fixes CVE-2006-1057 (bug 188303)
 
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.14.0-1
 - Update to 2.14.0