update to 2.20.10

changes:
-bugfixes
-translation updates
-portability improvements

5 files changed, 24 insertions, 25 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2852fcfa103..d49406701e6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.150 2009/03/02 15:13:10 jmcneill Exp $
+# $NetBSD: Makefile,v 1.151 2009/04/07 11:40:20 drochner Exp $
 #
 
-DISTNAME=	gdm-2.20.7
-PKGREVISION=	5
+DISTNAME=	gdm-2.20.10
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 9494aa200be..7719b4902f5 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.58 2008/11/23 22:06:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.59 2009/04/07 11:40:20 drochner Exp $
 
-SHA1 (gdm-2.20.7.tar.bz2) = 349a5a2e60a3e2e229afe99e1342f75e321e53e9
-RMD160 (gdm-2.20.7.tar.bz2) = 1b9321a81aa5984e76715fec9ce7e01f161b8bcb
-Size (gdm-2.20.7.tar.bz2) = 3978969 bytes
+SHA1 (gdm-2.20.10.tar.bz2) = 42e9e52184393352f005f1735843a30f764aef18
+RMD160 (gdm-2.20.10.tar.bz2) = 4bb50375d30638143b47b7884405e9999e304da5
+Size (gdm-2.20.10.tar.bz2) = 3940077 bytes
 SHA1 (patch-aa) = 0e919c36bed0901583b4a527d4e9461ab737a171
 SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
 SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
 SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
 SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
-SHA1 (patch-ao) = 70aead2c0452a99a1036c07f22c5641e8cdc092c
-SHA1 (patch-ap) = 2fc5050893ef7794b84a66d107b90e14c79015cc
-SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7
+SHA1 (patch-ao) = c67c0b76db15c50dfb20d1cc9cd44d76ba7220f3
+SHA1 (patch-ap) = 634fae3ae86620229c66d48ae0e3f8d86d71b1af
+SHA1 (patch-aq) = 7885ca3774bb3cd91a800654368f9cd5cde806c7
 SHA1 (patch-ar) = 9783e336cd11b34e990291c25f0b70752edec012
 SHA1 (patch-as) = 13135a44949dac9ff23be4c8efb15baffd18b58b
 SHA1 (patch-at) = 4be192597cf1bb129e5b69f27d9d388bcd00b4e0
diff --git a/x11/gdm/patches/patch-ao b/x11/gdm/patches/patch-ao
index 378abf180da..89b814ece2d 100644
--- a/x11/gdm/patches/patch-ao
+++ b/x11/gdm/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2008/03/12 21:41:21 drochner Exp $
+$NetBSD: patch-ao,v 1.3 2009/04/07 11:40:20 drochner Exp $
 
---- ./daemon/slave.c.orig	2008-03-10 23:23:00.000000000 +0100
+--- ./daemon/slave.c.orig	2009-03-19 05:59:27.000000000 +0100
 +++ ./daemon/slave.c
-@@ -3694,7 +3694,7 @@ session_child_run (struct passwd *pwent,
+@@ -3721,7 +3721,7 @@ session_child_run (struct passwd *pwent,
  		char *new_system_data_dirs;
  
  		new_system_data_dirs = g_build_path (":",
@@ -11,12 +11,12 @@ $NetBSD: patch-ao,v 1.2 2008/03/12 21:41:21 drochner Exp $
  
  		g_setenv ("XDG_DATA_DIRS", new_system_data_dirs, TRUE);
  
-@@ -3792,7 +3792,7 @@ session_child_run (struct passwd *pwent,
+@@ -3820,7 +3820,7 @@ session_child_run (struct passwd *pwent,
  		gdm_child_exit (DISPLAY_REMANAGE,
  				_("%s: setusercontext () failed for %s. "
  				  "Aborting."), "session_child_run",
--				login);
-+				login_user);
+-				login ? login : "(null)");
++				login_user ? login_user : "(null)");
  #else
  	if G_UNLIKELY (setuid (pwent->pw_uid) < 0)
  		gdm_child_exit (DISPLAY_REMANAGE,
diff --git a/x11/gdm/patches/patch-ap b/x11/gdm/patches/patch-ap
index 541b189b7c2..8ec62f025e1 100644
--- a/x11/gdm/patches/patch-ap
+++ b/x11/gdm/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2008/01/11 13:02:33 drochner Exp $
+$NetBSD: patch-ap,v 1.3 2009/04/07 11:40:20 drochner Exp $
 
---- ./daemon/gdm-xdmcp-manager.c.orig	2008-01-07 20:39:37.000000000 +0100
+--- ./daemon/gdm-xdmcp-manager.c.orig	2009-03-19 05:59:27.000000000 +0100
 +++ ./daemon/gdm-xdmcp-manager.c
 @@ -64,7 +64,7 @@
   * On Sun, we need to define allow_severity and deny_severity to link
@@ -39,9 +39,9 @@ $NetBSD: patch-ap,v 1.2 2008/01/11 13:02:33 drochner Exp $
 +#endif
 +
  	if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
- 		gdm_debug ("bind: %s", g_strerror (errno));
+ 		gdm_error ("bind: %s", g_strerror (errno));
  		close (sock);
-@@ -1260,7 +1270,9 @@ create_sa_from_request (ARRAY8 *req_addr
+@@ -1259,7 +1269,9 @@ create_sa_from_request (ARRAY8 *req_addr
  
  	memset (&hints, 0, sizeof (hints));
  	hints.ai_family = family;
@@ -51,7 +51,7 @@ $NetBSD: patch-ap,v 1.2 2008/01/11 13:02:33 drochner Exp $
  	if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) {
  		gdm_debug ("Unable get address: %s", gai_strerror (gaierr));
  		return FALSE;
-@@ -1279,6 +1291,20 @@ create_sa_from_request (ARRAY8 *req_addr
+@@ -1278,6 +1290,20 @@ create_sa_from_request (ARRAY8 *req_addr
  
  	freeaddrinfo (ai_list);
  
diff --git a/x11/gdm/patches/patch-aq b/x11/gdm/patches/patch-aq
index 5835456ac26..e7feb35e38a 100644
--- a/x11/gdm/patches/patch-aq
+++ b/x11/gdm/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2007/11/30 20:08:39 drochner Exp $
+$NetBSD: patch-aq,v 1.2 2009/04/07 11:40:20 drochner Exp $
 
---- ./gui/gdmchooser.c.orig	2007-11-27 00:11:04.000000000 +0100
-+++ ./gui/gdmchooser.c
-@@ -1123,6 +1123,13 @@ gdm_chooser_xdmcp_init (char **hosts)
+--- gui/gdmchooser.c.orig	2008-09-03 20:35:57.000000000 +0200
++++ gui/gdmchooser.c
+@@ -1128,6 +1128,13 @@ gdm_chooser_xdmcp_init (char **hosts)
  		have_ipv6 = FALSE;
  	else
  		have_ipv6 = TRUE;