Update to 2.14.2. Based on patch provided by drochner@.

2.14.2 stuff:

- Now include gui/gdmthemetester.in in the distribution.  It being missing
  was causing the module to fail to compile.  (Brian Cameron)

- Fix to the BROADCAST key in gdmchooser so it should now work.  (Brian
  Cameron, kudos to Tiago Vignatti)

- Further cleanups to Addresses CVE-2006-1057.  (Hans Petter Jansson,
  Ray Strode)

- Path and RootPath now do not contain /usr/bin or /bin more than once.
  (Brian Cameron)

- Translation updates (Takeshi AIHANA, \305\275ygimantas Beru\304\215ka,
  Laurent Dhima, Pema Geyleg, Lukas Novotny)

2.14.1 stuff:

- The sockets connection between the slaves and the GDM daemon is now
  better managed to better ensure that sockets are never left open.
  This work also makes gdmsetup start faster.  (Brian Cameron)

- Corrected bug that causes a core dump when you click on gdmgreeter
  fields that have an id.  (Brian Cameron)

- Add new GdmXserverTimeout configuration setting so that the length of
  time GDM waits for the Xserver to start can be tuned, so GDM better
  works with Xservers that require more than 10 seconds to start.
  (Emilie)

- The happygnome and happygnome-list gdmgreeter themes now use the
  official logo.  (Brian Cameron)

- Now GDM configure supports --with-sysconfsubdir so that GDM's
  configuration directory can be configured to not have "/gdm" appended
  to the end.  (Julio M. Merino Vidal)

- Fix for ensuring .ICEauthority file has proper ownership/permissions.
  Addresses CVE-2006-1057.  (Hans Petter Jansson)

- Fix "Show Actions Menu" section in gdmsetup so it appears when both
  "Plain" and "Themed" style is chosen.  (Brian Cameron, Dennis
  Cranston)

- Now use LINGUAS procedure for defining languages.  (Michiel Sikkes)

- Now Xsession script uses "$@" instead of "$1" so it is possible to
  pass arguments with the command to run.  (Brian Cameron)

- Add Trusted Solraris support.  (Niall Power)

- One line fix to Solaris auditing logic that fixes a bug causing
  authentication to fail when auditing is turned on.  (Brian Cameron)

- Fixes to compile with C99 and fixes to compile under NetBSD.
  Remove EXPANDED_* variables from the configure.  (Julio M. Merino
  Vidal)

- Translation updates (\305\275ygimantas Beru\304\215ka, Beno\303\256t
  Dejean, Laurent Dhima, Maxim Dziumanenko, Alessio Frusciante, Rhys
  Jones, Raphael Higino, Theppitak Karoonboonyanan, Gabor Kelmen,
  Priit Laes, Jordi Mallach, Kjartan Maraas, Daniel Nylander, Kostas
  Papdimas, Guilherme de S. Pastore, Ankit Patel, Ignacio Casal
  Quinteiro, Hendrik Richter, Jens Seidel, Francisco Javier F. Serrador,
  Alexander Shopov, Clytie Siddall, Ilkka Tuohela, Vincent van Adrighem,
  Tommi Vainikaninen)

10 files changed, 41 insertions, 123 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 15d1aea3261..fa106513cdf 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2006/04/22 09:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.110 2006/05/01 09:50:25 jmmv Exp $
 #
 
-DISTNAME=	gdm-2.14.0
-PKGREVISION=	2
+DISTNAME=	gdm-2.14.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,35 +26,36 @@ PKG_SUPPORTED_OPTIONS=	inet6 pam
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-dmconfdir=${PKG_SYSCONFDIR:Q}/dm
+CONFIGURE_ARGS+=	--with-sysconfsubdir=
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR}/gdm/custom.conf
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+INSTALL_MAKE_FLAGS+=	GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
 MAKE_ENV+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
 
-OWN_DIRS=		${PKG_SYSCONFDIR}/dm
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/Init
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PostLogin
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PostSession
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/PreSession
-OWN_DIRS+=		${PKG_SYSCONFDIR}/gdm/modules
+OWN_DIRS=		${PKG_SYSCONFDIR}/Init
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostLogin
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PostSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/PreSession
+OWN_DIRS+=		${PKG_SYSCONFDIR}/dm
+OWN_DIRS+=		${PKG_SYSCONFDIR}/modules
 OWN_DIRS+=		${VARBASE}/gdm
 OWN_DIRS+=		${VARBASE}/log/gdm
 
-EGDIR=			${PREFIX}/share/examples
+PKG_SYSCONFSUBDIR=	gdm
+EGDIR=			${PREFIX}/share/examples/gdm
 CONF_FILES=
 .for f in custom.conf locale.alias \
 	modules/AccessDwellMouseEvents modules/AccessKeyMouseEvents \
 	modules/factory-AccessDwellMouseEvents \
 	modules/factory-AccessKeyMouseEvents
-CONF_FILES+=		${EGDIR}/gdm/${f} \
-			${PKG_SYSCONFDIR}/gdm/${f}
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 .for f in Init/Default PostLogin/Default.sample PostSession/Default \
 	PreSession/Default XKeepsCrashing Xsession
-CONF_FILES_PERMS+=	${EGDIR}/gdm/${f} \
-			${PKG_SYSCONFDIR}/gdm/${f} \
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
 			${ROOT_USER} ${ROOT_GROUP} 0755
 .endfor
 RCD_SCRIPTS=		gdm
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 0ca86101dff..5f55d2d1c8b 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2006/04/17 07:07:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.28 2006/05/01 09:50:25 jmmv Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -53,13 +53,13 @@ share/gdm/themes/circles/options.png
 share/gdm/themes/circles/screenshot.png
 share/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
 share/gdm/themes/happygnome-list/background.svg
-share/gdm/themes/happygnome-list/gnome-logo.png
+share/gdm/themes/happygnome-list/gnome-logo.svg
 share/gdm/themes/happygnome-list/happygnome.xml
 share/gdm/themes/happygnome-list/options.png
 share/gdm/themes/happygnome-list/screenshot.png
 share/gdm/themes/happygnome/GdmGreeterTheme.desktop
 share/gdm/themes/happygnome/background.svg
-share/gdm/themes/happygnome/gnome-logo.png
+share/gdm/themes/happygnome/gnome-logo.svg
 share/gdm/themes/happygnome/happygnome.xml
 share/gdm/themes/happygnome/options.png
 share/gdm/themes/happygnome/screenshot.png
@@ -113,6 +113,7 @@ share/locale/cs/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
 share/locale/de/LC_MESSAGES/gdm.mo
+share/locale/dz/LC_MESSAGES/gdm.mo
 share/locale/el/LC_MESSAGES/gdm.mo
 share/locale/en_CA/LC_MESSAGES/gdm.mo
 share/locale/en_GB/LC_MESSAGES/gdm.mo
@@ -133,6 +134,7 @@ share/locale/id/LC_MESSAGES/gdm.mo
 share/locale/is/LC_MESSAGES/gdm.mo
 share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
+share/locale/ka/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
@@ -225,6 +227,7 @@ share/xsessions/gnome.desktop
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/gdm/zh_TW/figures
 @dirrm share/gnome/help/gdm/zh_TW
 @dirrm share/gnome/help/gdm/zh_HK/figures
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index f0ab328fa9f..c2e98839b75 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,19 +1,8 @@
-$NetBSD: distinfo,v 1.34 2006/04/02 09:16:19 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2006/05/01 09:50:25 jmmv Exp $
 
-SHA1 (gdm-2.14.0.tar.bz2) = 84e2f91e6215bf2e75f70ded6e7b2afb29c28082
-RMD160 (gdm-2.14.0.tar.bz2) = 1a152d4d2dde11f70be24e6dade98721c3d7c5a1
-Size (gdm-2.14.0.tar.bz2) = 2997013 bytes
-SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
-RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
-Size (Daemon.README) = 2191 bytes
-SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
-RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
-Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = e976c88c54f8620252d4d86351b52111dbcfa113
-SHA1 (patch-ab) = 527a77fd79ba47d897bd4693d0ce7c0eae08081e
-SHA1 (patch-ac) = 1870b541791bfbc41ff30b63debcf493782984f7
-SHA1 (patch-ad) = 66659330d6ac66bc88b7fb5f6f08ba8512be73c5
-SHA1 (patch-ae) = 0fb90856c3a85e896633b83cc9197984b8e96422
-SHA1 (patch-ai) = 9123d74db483148ca65d864626723e6b8e3f2444
-SHA1 (patch-aj) = e675f38079ab309064cadf917a4a9442a7a00ef4
+SHA1 (gdm-2.14.2.tar.bz2) = 1e1780e4ff7090758eb665c0d4342b278f1c7fd2
+RMD160 (gdm-2.14.2.tar.bz2) = 868322ee4a20c503154b722ed30588d337787595
+Size (gdm-2.14.2.tar.bz2) = 3030103 bytes
+SHA1 (patch-aa) = 2b7112cd5670f99b261765f47a6b70b73c0f42a0
+SHA1 (patch-ae) = 87f26d19ec42eacef853df1b0cf680dae102d3fd
 SHA1 (patch-ak) = e3eaf2dfa1e393f9808d22fe4384710a46a83afc
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 425135a0ac6..c5b19f7ed8d 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.17 2006/04/02 09:16:19 jmmv Exp $
+$NetBSD: patch-aa,v 1.18 2006/05/01 09:50:25 jmmv Exp $
 
---- configure.orig	2006-03-13 22:42:24.000000000 +0100
+--- configure.orig	2006-04-14 22:49:06.000000000 +0200
 +++ configure
-@@ -32481,6 +32481,7 @@ else
+@@ -32571,6 +32571,7 @@ else
     GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
     X_CONFIG_OPTIONS="-audit 0"
  fi
 +X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS"
  
- # Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
- # If it is /usr/bin, for example.
+ # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
+ # If it is /bin or /usr/bin, for example.
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
deleted file mode 100644
index 66814264644..00000000000
--- a/x11/gdm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2006/01/24 19:43:50 jmmv Exp $
-
---- po/fa.po.orig	2005-11-02 17:59:32.000000000 +0100
-+++ po/fa.po
-@@ -1444,7 +1444,6 @@ msgstr "%s: Failed executing: %s"
- msgid ""
- "\n"
- "Incorrect username or password.  Letters must be typed in the correct case."
--
- msgstr ""
- "\n"
- "نام کاربر یا گذرواژه درست نیست.  بزرگی و کوچکی حروف باید رعایت شود."
diff --git a/x11/gdm/patches/patch-ac b/x11/gdm/patches/patch-ac
deleted file mode 100644
index cca6842223b..00000000000
--- a/x11/gdm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2006/03/30 21:25:48 jmmv Exp $
-
---- gui/modules/Makefile.in.orig	2006-03-13 22:42:41.000000000 +0100
-+++ gui/modules/Makefile.in
-@@ -323,7 +323,7 @@ prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples
- target_alias = @target_alias@
- INCLUDES = \
- 	-I.						\
diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
deleted file mode 100644
index 50511c88258..00000000000
--- a/x11/gdm/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/03/30 21:25:48 jmmv Exp $
-
---- daemon/xdmcp.c.orig	2006-02-08 00:57:25.000000000 +0100
-+++ daemon/xdmcp.c
-@@ -1142,6 +1142,7 @@ gdm_xdmcp_handle_forward_query (struct s
- 
- 	if (clnt_port.length == 2 &&
- 	       clnt_addr.length == 4) {
-+		char * ipv4_addr;
- 
- 		/* Convert IPv4 address to IPv6 if needed */
- 		struct sockaddr_in tmp_disp_sa = {0};
-@@ -1149,7 +1150,7 @@ gdm_xdmcp_handle_forward_query (struct s
- 		memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_port, clnt_port.data, 2);
- 		memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr.s_addr, clnt_addr.data, 4);
- 
--		char * ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
-+		ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
- 		strcpy (buffer6, "::ffff:");
- 		strncat (buffer6, ipv4_addr, INET_ADDRSTRLEN);
- 
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index c34abaee6e0..abe8727e54a 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,19 +1,19 @@
-$NetBSD: patch-ae,v 1.10 2006/03/30 21:25:48 jmmv Exp $
+$NetBSD: patch-ae,v 1.11 2006/05/01 09:50:25 jmmv Exp $
 
---- config/Makefile.in.orig	2006-03-13 22:42:30.000000000 +0100
+--- config/Makefile.in.orig	2006-04-14 22:49:13.000000000 +0200
 +++ config/Makefile.in
-@@ -545,10 +545,6 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -569,10 +569,6 @@ install-data-hook: gdm.conf gdm.conf-cus
  		$(mkinstalldirs) $(DESTDIR)$(confdir); \
  		chmod 755 $(DESTDIR)$(confdir); \
  	fi
--	if test '!' -d $(DESTDIR)$(crossconfdir); then \
--		$(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
--		chmod 755 $(DESTDIR)$(crossconfdir); \
+-	if test '!' -d $(DESTDIR)$(dmconfdir); then \
+-		$(mkinstalldirs) $(DESTDIR)$(dmconfdir); \
+-		chmod 755 $(DESTDIR)$(dmconfdir); \
 -	fi
  	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
  		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
  		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
-@@ -577,10 +573,7 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -601,10 +597,7 @@ install-data-hook: gdm.conf gdm.conf-cus
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ae,v 1.10 2006/03/30 21:25:48 jmmv Exp $
  
  	if test '!' -d $(DESTDIR)$(bisessdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -658,20 +651,8 @@ install-data-hook: gdm.conf gdm.conf-cus
+@@ -682,20 +675,8 @@ install-data-hook: gdm.conf gdm.conf-cus
  		chmod 755 $(DESTDIR)$(gnomercdir); \
  	fi
  
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
deleted file mode 100644
index 00fdbb4321a..00000000000
--- a/x11/gdm/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2006/03/30 21:25:48 jmmv Exp $
-
---- daemon/gdmconfig.c.orig	2006-03-13 22:18:24.000000000 +0100
-+++ daemon/gdmconfig.c
-@@ -38,6 +38,9 @@
- #include <ctype.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#if defined(__NetBSD__)
-+#include <sys/resource.h>
-+#endif
- #include <sys/stat.h>
- #include <signal.h>
- #include <pwd.h>
diff --git a/x11/gdm/patches/patch-aj b/x11/gdm/patches/patch-aj
deleted file mode 100644
index d5f49b20858..00000000000
--- a/x11/gdm/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/03/30 21:25:48 jmmv Exp $
-
---- daemon/server.c.orig	2006-01-19 00:32:50.000000000 +0100
-+++ daemon/server.c
-@@ -27,6 +27,9 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <grp.h>
-+#if defined(__NetBSD__)
-+#include <sys/resource.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/wait.h>