Fri Jan 11 13:02:34 2008 UTC ()
update to 2.20.3
changes:
-bugfixes
-translation updates


(drochner)
diff -r1.134 -r1.135 pkgsrc/x11/gdm/Makefile
diff -r1.52 -r1.53 pkgsrc/x11/gdm/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/gdm/patches/patch-ap
diff -r0 -r1.1 pkgsrc/x11/gdm/patches/patch-ar
cvs diff -r1.134 -r1.135 pkgsrc/x11/gdm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/Makefile 2007/11/30 20:08:37 1.134
+++ pkgsrc/x11/gdm/Attic/Makefile 2008/01/11 13:02:33 1.135
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.134 2007/11/30 20:08:37 drochner Exp $ 1# $NetBSD: Makefile,v 1.135 2008/01/11 13:02:33 drochner Exp $
2# 2#
3 3
4DISTNAME= gdm-2.20.2 4DISTNAME= gdm-2.20.3
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= Gnome Display Manager - a re-implementation of the xdm program 11COMMENT= Gnome Display Manager - a re-implementation of the xdm program
12 12
13DEPENDS+= zenity>=2.16.0:../../x11/zenity 13DEPENDS+= zenity>=2.16.0:../../x11/zenity
14 14
15BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11 15BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11
16 16
17USE_DIRS+= gnome2-1.5 17USE_DIRS+= gnome2-1.5
@@ -25,28 +25,26 @@ PKG_SUPPORTED_OPTIONS= inet6 pam @@ -25,28 +25,26 @@ PKG_SUPPORTED_OPTIONS= inet6 pam
25.include "../../mk/bsd.options.mk" 25.include "../../mk/bsd.options.mk"
26 26
27CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
29CONFIGURE_ARGS+= --with-dmconfdir=${PKG_SYSCONFDIR:Q}/dm 29CONFIGURE_ARGS+= --with-dmconfdir=${PKG_SYSCONFDIR:Q}/dm
30CONFIGURE_ARGS+= --with-sysconfsubdir= 30CONFIGURE_ARGS+= --with-sysconfsubdir=
31CONFIGURE_ENV+= PREFIX=${PREFIX:Q} 31CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
32CONFIGURE_ENV+= X11BASE=${X11BASE:Q} 32CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
33INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 33INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
34INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf 34INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf
35INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} 35INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q}
36MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} 36MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
37 37
38#CONFIGURE_ARGS+= --disable-ipv6 
39 
40OWN_DIRS= ${PKG_SYSCONFDIR}/Init 38OWN_DIRS= ${PKG_SYSCONFDIR}/Init
41OWN_DIRS+= ${PKG_SYSCONFDIR}/PostLogin 39OWN_DIRS+= ${PKG_SYSCONFDIR}/PostLogin
42OWN_DIRS+= ${PKG_SYSCONFDIR}/PostSession 40OWN_DIRS+= ${PKG_SYSCONFDIR}/PostSession
43OWN_DIRS+= ${PKG_SYSCONFDIR}/PreSession 41OWN_DIRS+= ${PKG_SYSCONFDIR}/PreSession
44OWN_DIRS+= ${PKG_SYSCONFDIR}/dm 42OWN_DIRS+= ${PKG_SYSCONFDIR}/dm
45OWN_DIRS+= ${PKG_SYSCONFDIR}/modules 43OWN_DIRS+= ${PKG_SYSCONFDIR}/modules
46OWN_DIRS+= ${VARBASE}/gdm 44OWN_DIRS+= ${VARBASE}/gdm
47OWN_DIRS+= ${VARBASE}/log/gdm 45OWN_DIRS+= ${VARBASE}/log/gdm
48 46
49PKG_SYSCONFSUBDIR= gdm 47PKG_SYSCONFSUBDIR= gdm
50EGDIR= ${PREFIX}/share/examples/gdm 48EGDIR= ${PREFIX}/share/examples/gdm
51CONF_FILES= 49CONF_FILES=
52.for f in custom.conf locale.alias \ 50.for f in custom.conf locale.alias \
cvs diff -r1.52 -r1.53 pkgsrc/x11/gdm/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gdm/Attic/distinfo 2007/11/30 20:08:38 1.52
+++ pkgsrc/x11/gdm/Attic/distinfo 2008/01/11 13:02:33 1.53
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.52 2007/11/30 20:08:38 drochner Exp $ 1$NetBSD: distinfo,v 1.53 2008/01/11 13:02:33 drochner Exp $
2 2
3SHA1 (gdm-2.20.2.tar.bz2) = 4e2ad85df9ef61fa304c9a28cf7416a4121db12a 3SHA1 (gdm-2.20.3.tar.bz2) = de66323b890f2e65a33bb72c5937d1c95ee5bd89
4RMD160 (gdm-2.20.2.tar.bz2) = 19d3bf99853391685a1d16b848c1d27a94502395 4RMD160 (gdm-2.20.3.tar.bz2) = b6aace3153a9ba7adf4ed968ede9da19c3d706cb
5Size (gdm-2.20.2.tar.bz2) = 3892711 bytes 5Size (gdm-2.20.3.tar.bz2) = 3891861 bytes
6SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07 6SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07
7SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0 7SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0
8SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c 8SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c
9SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027 9SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027
10SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6 10SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6
11SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483 11SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483
12SHA1 (patch-ao) = 4c493da32e94689d239209d155abba67e897c364 12SHA1 (patch-ao) = 4c493da32e94689d239209d155abba67e897c364
13SHA1 (patch-ap) = 0852874be8d7b466baff34939dfe9c965f9c34ea 13SHA1 (patch-ap) = 2fc5050893ef7794b84a66d107b90e14c79015cc
14SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7 14SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7
 15SHA1 (patch-ar) = 4acfba02b237dd0185660989d14669d23d0a548e
cvs diff -r1.1 -r1.2 pkgsrc/x11/gdm/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/x11/gdm/patches/Attic/patch-ap 2007/11/30 20:08:39 1.1
+++ pkgsrc/x11/gdm/patches/Attic/patch-ap 2008/01/11 13:02:33 1.2
@@ -1,67 +1,67 @@ @@ -1,67 +1,67 @@
1$NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ 1$NetBSD: patch-ap,v 1.2 2008/01/11 13:02:33 drochner Exp $
2 2
3--- ./daemon/gdm-xdmcp-manager.c.orig 2007-11-27 00:12:29.000000000 +0100 3--- ./daemon/gdm-xdmcp-manager.c.orig 2008-01-07 20:39:37.000000000 +0100
4+++ ./daemon/gdm-xdmcp-manager.c 4+++ ./daemon/gdm-xdmcp-manager.c
5@@ -63,7 +63,7 @@ 5@@ -64,7 +64,7 @@
6 * On Sun, we need to define allow_severity and deny_severity to link 6 * On Sun, we need to define allow_severity and deny_severity to link
7 * against libwrap. 7 * against libwrap.
8 */ 8 */
9-#ifdef __sun 9-#ifdef __sun
10+#if defined(__sun) || defined(__NetBSD__) 10+#if defined(__sun) || defined(__NetBSD__)
11 #include <syslog.h> 11 #include <syslog.h>
12 int allow_severity = LOG_INFO; 12 int allow_severity = LOG_INFO;
13 int deny_severity = LOG_WARNING; 13 int deny_severity = LOG_WARNING;
14@@ -369,12 +369,14 @@ ai_flags_str (struct addrinfo *ai) 14@@ -370,12 +370,14 @@ ai_flags_str (struct addrinfo *ai)
15 if (ai->ai_flags & AI_NUMERICSERV) { 15 if (ai->ai_flags & AI_NUMERICSERV) {
16 g_string_append (str, "numserv "); 16 g_string_append (str, "numserv ");
17 } 17 }
18+#if 0 18+#if 0
19 if (ai->ai_flags & AI_V4MAPPED) { 19 if (ai->ai_flags & AI_V4MAPPED) {
20 g_string_append (str, "v4mapped "); 20 g_string_append (str, "v4mapped ");
21 } 21 }
22 if (ai->ai_flags & AI_ALL) { 22 if (ai->ai_flags & AI_ALL) {
23 g_string_append (str, "all "); 23 g_string_append (str, "all ");
24 } 24 }
25+#endif 25+#endif
26 } 26 }
27 return g_string_free (str, FALSE); 27 return g_string_free (str, FALSE);
28 } 28 }
29@@ -404,6 +406,14 @@ create_socket (struct addrinfo *ai) 29@@ -405,6 +407,14 @@ create_socket (struct addrinfo *ai)
30 return sock; 30 return sock;
31 } 31 }
32  32
33+#if defined(__NetBSD__) && ENABLE_IPV6 33+#if defined(__NetBSD__) && ENABLE_IPV6
34+ /* NetBSD defaults to V6ONLY */ 34+ /* NetBSD defaults to V6ONLY */
35+ { 35+ {
36+ int no = 0; 36+ int no = 0;
37+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no)); 37+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no));
38+ } 38+ }
39+#endif 39+#endif
40+ 40+
41 if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { 41 if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
42 g_warning ("bind: %s", g_strerror (errno)); 42 gdm_debug ("bind: %s", g_strerror (errno));
43 close (sock); 43 close (sock);
44@@ -1259,7 +1269,9 @@ create_sa_from_request (ARRAY8 *req_addr 44@@ -1260,7 +1270,9 @@ create_sa_from_request (ARRAY8 *req_addr
45  45
46 memset (&hints, 0, sizeof (hints)); 46 memset (&hints, 0, sizeof (hints));
47 hints.ai_family = family; 47 hints.ai_family = family;
48+#if !defined(__NetBSD__) || defined(AI_V4MAPPED) 48+#if !defined(__NetBSD__) || defined(AI_V4MAPPED)
49 hints.ai_flags = AI_V4MAPPED; /* this should convert IPv4 address to IPv6 if needed */ 49 hints.ai_flags = AI_V4MAPPED; /* this should convert IPv4 address to IPv6 if needed */
50+#endif 50+#endif
51 if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) { 51 if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) {
52 g_warning ("Unable get address: %s", gai_strerror (gaierr)); 52 gdm_debug ("Unable get address: %s", gai_strerror (gaierr));
53 return FALSE; 53 return FALSE;
54@@ -1278,6 +1290,20 @@ create_sa_from_request (ARRAY8 *req_addr 54@@ -1279,6 +1291,20 @@ create_sa_from_request (ARRAY8 *req_addr
55  55
56 freeaddrinfo (ai_list); 56 freeaddrinfo (ai_list);
57  57
58+#if defined(__NetBSD__) && !defined(AI_V4MAPPED) 58+#if defined(__NetBSD__) && !defined(AI_V4MAPPED)
59+ if (!found && family == AF_INET6 && req_addr->length == 4 && sap) { 59+ if (!found && family == AF_INET6 && req_addr->length == 4 && sap) {
60+ struct sockaddr_in6 *sa = g_malloc(sizeof(struct sockaddr_in6)); 60+ struct sockaddr_in6 *sa = g_malloc(sizeof(struct sockaddr_in6));
61+ memset(sa, 0, sizeof(struct sockaddr_in6)); 61+ memset(sa, 0, sizeof(struct sockaddr_in6));
62+ sa->sin6_len = sizeof(struct sockaddr_in6); 62+ sa->sin6_len = sizeof(struct sockaddr_in6);
63+ sa->sin6_family = AF_INET6; 63+ sa->sin6_family = AF_INET6;
64+ sa->sin6_port = port; 64+ sa->sin6_port = port;
65+ memset(&sa->sin6_addr.s6_addr[10], 0xff, 2); 65+ memset(&sa->sin6_addr.s6_addr[10], 0xff, 2);
66+ memcpy(&sa->sin6_addr.s6_addr[12], req_addr->data, 4); 66+ memcpy(&sa->sin6_addr.s6_addr[12], req_addr->data, 4);
67+ *sap = sa; 67+ *sap = sa;
File Added: pkgsrc/x11/gdm/patches/Attic/patch-ar
$NetBSD: patch-ar,v 1.1 2008/01/11 13:02:34 drochner Exp $

--- daemon/verify-crypt.c.orig	2008-01-08 21:21:30.000000000 +0100
+++ daemon/verify-crypt.c
@@ -43,6 +43,7 @@
 #include "gdm-common.h"
 #include "gdm-daemon-config.h"
 #include "gdm-socket-protocol.h"
+#include "gdm-log.h"
 
 static char *selected_user = NULL;