Update to 2.6.0.0:

2.6.0.0 stuff:

- DisplayLastLogin defaults to false since '/usr/bin/last' is stupidly
  unlocalized

- Add translated (de, es, fr, it, ja, ko, sv, zh_CN, zh_HK and zh_TW)
  documentation (Glynn, Sun translation team)

- Translation updates (Christophe Merlet, Christian Neumair, Maxim Dziumanenko,
  Telsa Gwynne, Stanislav Visnovsky, Gustavo Maciel Dias Vieira,
  Alastair McKinstry, Alexander Winston, Sanlig Badral, Vincent van Adrighem,
  Michiel Sikkes, Funda Wang, Ales Nyakhaychyk, Metin Amiroff, Takeshi AIHANA,
  Alessio Frusciante, Francesco Marletta)

2.5.90.2 stuff:

- Support for GTK+ theming (accessibility) and ability to change current
  theme in the standard login, fixes #125070 (Muktha, me)

- Hindi was written wrong in the language menu fixes #134372
  (Guntupalli Karunakar)

- When restarting a server by whacking it and starting it again, wait
  for 1 sec to allow things to "settle", plus be a lot milder on X
  server's lock files / sockets to avoid whacking ones currently in use

- Make language dialog in the graphical greeter come up quicker and init
  the languages lazily

- Fix #135232 by using code@mod for the translation matrix (me), and added
  Serbian variants there (Danilo Segan)

- Fix #135053 by adding canadian english (Adam Weinberger, Danilo Segan)

- Fix sourcing of environment on AIX, #135401 (Vincent Berger)

- Fix displaying of ~/.xsession-errors file

- Attempt to handle out of user diskspace more gracefully by whacking old
  .xsession-errors in case we fail.

- Translation updates (Nikos Charonitakis, Jordi Mallach, Funda Wang,
  Tommi Vainikainen, Kostas Papadimas, Kjartan Maraas, Miloslav Trmac,
  Laurent Dhima, Zygimantas Berucka, Christian Rose, Changwoo Ryu,
  Yukihiro Nakai, Duarte Loreto, Christophe Merlet,
  Francisco Javier F. Serrador, Artur Flinta, Alastair McKinstry,
  Guntupalli Karunakar, Takeshi AIHANA, Paisa Seeluangsawat,
  Surichat Sumrit, Supranee Thirawatthanasuk, Chanchai Junlouchai,
  Adam Weinberger, Christian Neumair, Hasbullah Bin Pit,
  Pauli Virtanen, Ole Laursen, Asmund Skjaeveland, Metin Amiroff,
  Vincent van Adrighem, Tino Meinen, GNOME PL Team)

2.5.90.1 stuff:

- Login field was not clearned when x server / slave crashed (#131389)

- Change the 12 hour format to be less confusing (#133189)

- Re-fix the aix ADMCHG bug #123766 (Vincent Berger)

- keymouselistener fixes (Brian Cameron)

- Compilation fixes #131042, #130963

- Build fixes (Tomasz Kloczko)

- Other fixes and cleanups (among others #133181 by Mariano Suarez-Alvarez)

- Translation update (Andras Timar, Francisco Javier F. Serrador, Lucas Vieites,
  Maxim Dziumanenko, Robert Sedak, Metin Amiroff, Laurent Dhima, Changwoo Ryu,
  Kjartan Maraas, Miloslav Trmac, Asmund Skjaeveland, Sanlig Badral,
  Zygimantas Berucka, Kostas Papadimas, Christian Neumair, Artur Flinta,
  GNOME PL Team, Gustavo Maciel Dias Vieira, Joao Emanuel, Danilo Segan,
  Vincent van Adrighem, Tino Meinen, Fernando Herrera, Arafat Medini)

2.5.90.0 stuff:

- Add accessibility setting to gdmsetup and allow setting an arbitrary
  sound for the "ready for login" sound.  (#125487)

- gdmflexiserver now lists running sessions if there are some and allow
  the users to easily switch. (#127038)

- Display last login when the user enters their name (can be turned
  off) (#128940)

- Inactive flexiservers are reaped by default after 5 minutes.

- Accessibility modules set the busy cursor for 2 secs to show that
  an action was started (#125153)

- Doubleclicking on a language in graphical greeter selects it
  (Kirk Mitchener, #123199)

- Optional info message on login (sort of like motd) (Anton Altaparmakov,
  #125219)

- New SUP (socket protocol) commands to request shutdown/reboot after
  session ends or after all users log out.  Also new SUP commands for
  querying and setting the VT on Linux.

- A --wait-for-go option that will start one X server and then wait until
  GO is sent through the fifo before going further.

- IPv6 support (Archana Shah)

- Built in sessions are out of /etc/X11/dm/Sessions and moved to
  <datadir>/gdm/BuiltInSessions

- Fix chooser commonication vs. accessibility stuff (#125064)

- Fix RetryDelay and make it default to 1 and not 3 (Leena Gunda, me, #128507)

- On AIX without PAM, password expiration is done (Vincent Berger, me, #123766)

- On crypt/shadow the double login warning was too early, now done after
  authentication as in the PAM setup.

- Clients are now forcibly whacked at session stop, should "fix" #126071

- Use GtkFileChooser in gdmsetup (Jan Arne Petersen, #128668)

- Paranoia: Check owenership of the socket before using it

- Fix xdmcp session counting (#126465)

- Warn the user when they want to set root as autologin (RH #97716)

- StandardXServer can now have arguments

- Default color is now #76848F and the PreSession script tries
  to use the default gdm color to fix #128220

- Fix assert failure when starting Xnest (#127780)

- Indent the chooser and config toggles in the setup (#120639)

- Lots of cleanup and fixes and adding to the general paranoia in the
  code.  (me, Ray Strode, Brian Cameron)

- Translation updates (Miloslav Trmac, Andras Timar, David O'Callaghan,
  Paul Duffy, Danilo Segan, Vincent van Adrighem, Kostas Papadimas,
  Jordi Mallach, Ole Laursen, Dmitry G. Mastrukov, Russian team,
  Sanlig Badral, Francisco Javier F. Serrador, Lucas Vieites,
  Laurent Dhima, Asmund Skjaeveland, Artur Flinta, Duarte Loreto,
  Robert Sedak, Christophe Merlet, Christian Neumair, Zygimantas Berucka)

3 files changed, 21 insertions, 120 deletions

diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 12f633f36c1..54dc4b3b968 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2004/04/01 18:49:37 jmmv Exp $
 
---- configure.orig	2003-12-31 19:10:05.000000000 +0100
+--- configure.orig	2004-03-15 19:38:10.000000000 +0100
 +++ configure
-@@ -22912,6 +22912,7 @@ VRFY="verify-crypt"
+@@ -24803,6 +24803,7 @@ VRFY="verify-crypt"
  if test x$enable_authentication_scheme != xcrypt -a \
  	x$enable_authentication_scheme != xshadow ; then
  
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $
  for ac_header in security/pam_appl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -23061,6 +23062,7 @@ fi
+@@ -24960,6 +24961,7 @@ fi
  done
  
  fi
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $
  
  GDMASKPASS=
  EXTRA_GDMASKPASS_LIBS=
-@@ -25357,6 +25359,10 @@ else
+@@ -28015,6 +28017,10 @@ else
     X_SERVER="/usr/X11R6/bin/X"
     X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
  fi
@@ -29,10 +29,10 @@ $NetBSD: patch-aa,v 1.5 2004/01/22 10:11:16 jmmv Exp $
  
  
  
-@@ -25406,6 +25412,8 @@ prefix=$old_prefix
+@@ -28064,6 +28070,8 @@ prefix=$old_prefix
  exec_prefix=$old_exec_prefix
  
-                                                                                                                                                                                                                                                                                                   ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
+                                                                                                                                                                                                                                                                                                                                                                                                       ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
 +# This is to avoid GNU make; may not be needed on a later version..
 +ac_config_files="$ac_config_files config/default.desktop config/gnome.desktop config/CDE.desktop"
  cat >confcache <<\_ACEOF
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
deleted file mode 100644
index fde6df14b0d..00000000000
--- a/x11/gdm/patches/patch-ad
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/01/20 13:46:00 xtraeme Exp $
-
---- config/locale.alias.orig	2003-03-15 04:31:02.000000000 -0600
-+++ config/locale.alias
-@@ -24,65 +24,65 @@ Belarusian			be_BY.UTF-8,be_BY
- Bengali			bn_BD.UTF-8,bn_BD
- Bengali(India)			bn_IN.UTF-8,bn_IN
- Bosnian			bs_BA.UTF-8,bs_BA
--Bulgarian		bg_BG.UTF-8,bg_BG
--Catalan			ca_ES.UTF-8,ca_ES
-+Bulgarian		bg_BG.UTF-8,bg_BG.CP1251
-+Catalan			ca_ES.UTF-8,ca_ES.ISO8859-15
- Chinese(simplified)	zh_CN.UTF-8,zh_CN
- Chinese(traditional)	zh_TW.UTF-8,zh_TW
--Croatian		hr_HR.UTF-8,hr_HR
--Czech			cs_CZ.UTF-8,cs_CZ
--Danish			da_DK.UTF-8,da_DK
--Dutch			nl_NL.UTF-8,nl_NL
-+Croatian		hr_HR.UTF-8,hr_HR.ISO8859-2
-+Czech			cs_CZ.UTF-8,cs_CZ.ISO8859-2
-+Danish			da_DK.UTF-8,da_DK.ISO8859-15
-+Dutch			nl_NL.UTF-8,nl_NL.ISO8859-15
- English(American)	en_US.UTF-8,en_US
--English(Australian)	en_AU.UTF-8,en_AU
--English(British)	en_GB.UTF-8,en_GB
-+English(Australian)	en_AU.UTF-8,en_AU.ISO8859-15
-+English(British)	en_GB.UTF-8,en_GB.ISO8859-15
- English(Ireland)	en_IE.UTF-8,en_IE
--Estonian		et_EE.UTF-8,et_EE
--Finnish			fi_FI.UTF-8,fi_FI
--French			fr_FR.UTF-8,fr_FR
--Galician		gl_ES.UTF-8,gl_ES
--German			de_DE.UTF-8,de_DE
--Greek			el_GR.UTF-8,el_GR
-+Estonian		et_EE.UTF-8,et
-+Finnish			fi_FI.UTF-8,fi_FI.ISO8859-15
-+French			fr_FR.UTF-8,fr_FR.ISO8859-15
-+Galician		gl_ES.UTF-8,gl
-+German			de_DE.UTF-8,de_DE.ISO8859-15
-+Greek			el_GR.UTF-8,el_GR.ISO8859-7
- Gujarati			gu_IN.UTF-8,gu_IN
--Hebrew			he_IL.UTF-8,he_IL
-+Hebrew			he_IL.UTF-8,he
- Hindi			hi_IN.UTF-8,hi_IN
--Hungarian		hu_HU.UTF-8,hu_HU
--Icelandic		is_IS.UTF-8,is_IS
--Indonesian			id_ID.UTF-8,id_ID
-+Hungarian		hu_HU.UTF-8,hu_HU.ISO8859-2
-+Icelandic		is_IS.UTF-8,is_IS.ISO8859-15
-+Indonesian			id_ID.UTF-8,id
- Interlingua			ia.UTF-8,ia
- Irish			ga_IE.UTF-8,ga_IE
--Italian			it_IT.UTF-8,it_IT
--Japanese		ja_JP.UTF-8,ja_JP
-+Italian			it_IT.UTF-8,it_IT.ISO8859-15
-+Japanese		ja_JP.UTF-8,ja_JP.eucJP
- Kannada			kn_IN.UTF-8,kn_IN
- Korean			ko_KR.UTF-8,ko_KR
- Latvian			lv_LV.UTF-8,lv_LV
--Lithuanian		lt_LT.UTF-8,lt_LT
-+Lithuanian		lt_LT.UTF-8,lt_LT.ISO8859-4
- Macedonian		mk_MK.UTF-8,mk_MK
- Malayalam			ml_IN.UTF-8,ml_IN
- Malay			ms_MY.UTF-8,ms_MY
- Marathi			mr_IN.UTF-8,mr_IN
- Mongolian		mn_MN.UTF-8,mn_MN
--Norwegian(bokmal)	no_NO.UTF-8,no_NO
-+Norwegian(bokmal)	no_NO.UTF-8,no_NO.ISO8859-15
- Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
- Oriya			or_IN.UTF-8,or_IN
- Panjabi			pa_IN.UTF-8,pa_IN
- Persian			fa_IR.UTF-8,fa_IR
--Polish			pl_PL.UTF-8,pl_PL
-+Polish			pl_PL.UTF-8,pl_PL.ISO8859-2
- Portuguese(Brazilian)	pt_BR.UTF-8,pt_BR
--Portuguese		pt_PT.UTF-8,pt_PT
--Romanian		ro_RO.UTF-8,ro_RO
--Russian			ru_RU.UTF-8,ru_RU
-+Portuguese		pt_PT.UTF-8,pt_PT.ISO8859-15
-+Romanian		ro_RO.UTF-8,ro
-+Russian			ru_RU.UTF-8,ru_RU.CP866
- Serbian			sr_YU.UTF-8,sr_YU
--Slovak			sk_SK.UTF-8,sk_SK
--Slovenian		sl_SI.UTF-8,sl_SI
--Spanish			es_ES.UTF-8,es_ES
-+Slovak			sk_SK.UTF-8,sk_SK.ISO8859-2
-+Slovenian		sl_SI.UTF-8,sl_SI.ISO8859-2
-+Spanish			es_ES.UTF-8,es_ES.ISO8859-15
- Spanish(Mexico)		es_MX.UTF-8,es_MX
- Swedish(Finland)	sv_FI.UTF-8,sv_FI
--Swedish			sv_SE.UTF-8,sv_SE
-+Swedish			sv_SE.UTF-8,sv_SE.ISO8859-15
- Tamil			ta_IN.UTF-8,ta_IN
- Telugu			te_IN.UTF-8,te_IN
- Thai			th_TH.UTF-8,th_TH
--Turkish			tr_TR.UTF-8,tr_TR
--Ukrainian		uk_UA.UTF-8,uk_UA
-+Turkish			tr_TR.UTF-8,tr
-+Ukrainian		uk_UA.UTF-8,uk_UA.KOI8-U
- Vietnamese		vi_VN.UTF-8,vi_VN
- Walloon			wa_BE.UTF-8,wa_BE
- Welsh			cy_GB.UTF-8,cy_GB
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 0b302972f29..c1d86c17825 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
+$NetBSD: patch-ae,v 1.5 2004/04/01 18:49:37 jmmv Exp $
 
---- config/Makefile.in.orig	2003-12-31 19:31:32.000000000 +0100
+--- config/Makefile.in.orig	2004-03-16 00:14:53.000000000 +0100
 +++ config/Makefile.in
 @@ -23,7 +23,7 @@ bindir = @bindir@
  sbindir = @sbindir@
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
-@@ -303,11 +303,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in
+@@ -301,11 +301,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in
  install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
  	if test '!' -d $(DESTDIR)$(confdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(confdir); \
@@ -25,10 +25,13 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  	fi
  	-if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
  		cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \
-@@ -324,16 +324,16 @@ install-data-hook: gdm.conf Xsession gno
- 	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
- 		cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
- 	fi
+@@ -319,19 +319,16 @@ install-data-hook: gdm.conf Xsession gno
+ 	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
+ 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
+ 
+-	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+-		cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
+-	fi
 -	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
 +	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(confdir)/locale.alias
  
@@ -45,7 +48,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  	fi
  
  	-if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \
-@@ -364,7 +364,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -362,7 +359,7 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(initdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(initdir); \
@@ -54,7 +57,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(initdir)/Default; then \
  		cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
-@@ -373,13 +373,13 @@ install-data-hook: gdm.conf Xsession gno
+@@ -371,13 +368,13 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(postlogindir); then \
  		$(mkinstalldirs) $(DESTDIR)$(postlogindir); \
@@ -70,7 +73,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(predir)/Default; then \
  		cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
-@@ -388,7 +388,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -386,7 +383,7 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(postdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(postdir); \
@@ -79,7 +82,7 @@ $NetBSD: patch-ae,v 1.4 2004/01/22 10:11:16 jmmv Exp $
  	fi
  	-if test -f $(DESTDIR)$(postdir)/Default; then \
  		cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
-@@ -397,26 +397,14 @@ install-data-hook: gdm.conf Xsession gno
+@@ -395,26 +392,14 @@ install-data-hook: gdm.conf Xsession gno
  
  	if test '!' -d $(DESTDIR)$(gnomercdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \