diff options
author | drochner <drochner> | 2008-01-11 13:02:33 +0000 |
---|---|---|
committer | drochner <drochner> | 2008-01-11 13:02:33 +0000 |
commit | 55bbf5b6147925a7862e1bbc35721fdeca7e5971 (patch) | |
tree | 2697b6609d6651fc48ad17491a8790c17186ed57 /x11 | |
parent | 0cf55eef4bf506f82da0fefc19e5fa30a4160578 (diff) | |
download | pkgsrc-55bbf5b6147925a7862e1bbc35721fdeca7e5971.tar.gz |
update to 2.20.3
changes:
-bugfixes
-translation updates
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm/Makefile | 6 | ||||
-rw-r--r-- | x11/gdm/distinfo | 11 | ||||
-rw-r--r-- | x11/gdm/patches/patch-ap | 18 | ||||
-rw-r--r-- | x11/gdm/patches/patch-ar | 12 |
4 files changed, 29 insertions, 18 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ee8117940b9..7bb326da099 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.134 2007/11/30 20:08:37 drochner Exp $ +# $NetBSD: Makefile,v 1.135 2008/01/11 13:02:33 drochner Exp $ # -DISTNAME= gdm-2.20.2 +DISTNAME= gdm-2.20.3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} EXTRACT_SUFX= .tar.bz2 @@ -35,8 +35,6 @@ INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR:Q}/custom.conf INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} -#CONFIGURE_ARGS+= --disable-ipv6 - OWN_DIRS= ${PKG_SYSCONFDIR}/Init OWN_DIRS+= ${PKG_SYSCONFDIR}/PostLogin OWN_DIRS+= ${PKG_SYSCONFDIR}/PostSession diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index eac61e6f787..cb092c308de 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.52 2007/11/30 20:08:38 drochner Exp $ +$NetBSD: distinfo,v 1.53 2008/01/11 13:02:33 drochner Exp $ -SHA1 (gdm-2.20.2.tar.bz2) = 4e2ad85df9ef61fa304c9a28cf7416a4121db12a -RMD160 (gdm-2.20.2.tar.bz2) = 19d3bf99853391685a1d16b848c1d27a94502395 -Size (gdm-2.20.2.tar.bz2) = 3892711 bytes +SHA1 (gdm-2.20.3.tar.bz2) = de66323b890f2e65a33bb72c5937d1c95ee5bd89 +RMD160 (gdm-2.20.3.tar.bz2) = b6aace3153a9ba7adf4ed968ede9da19c3d706cb +Size (gdm-2.20.3.tar.bz2) = 3891861 bytes SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07 SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c @@ -10,5 +10,6 @@ SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027 SHA1 (patch-ak) = 99ca1a7ce804a1ae99903860e2b923c972ae95e6 SHA1 (patch-al) = 3b66dd3f4cdea6a3af5cbd0ff65eb02ccdead483 SHA1 (patch-ao) = 4c493da32e94689d239209d155abba67e897c364 -SHA1 (patch-ap) = 0852874be8d7b466baff34939dfe9c965f9c34ea +SHA1 (patch-ap) = 2fc5050893ef7794b84a66d107b90e14c79015cc SHA1 (patch-aq) = 4417636865d45212a7fd9ad33d907eb8916a95b7 +SHA1 (patch-ar) = 4acfba02b237dd0185660989d14669d23d0a548e diff --git a/x11/gdm/patches/patch-ap b/x11/gdm/patches/patch-ap index 24c32a2cb71..541b189b7c2 100644 --- a/x11/gdm/patches/patch-ap +++ b/x11/gdm/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ +$NetBSD: patch-ap,v 1.2 2008/01/11 13:02:33 drochner Exp $ ---- ./daemon/gdm-xdmcp-manager.c.orig 2007-11-27 00:12:29.000000000 +0100 +--- ./daemon/gdm-xdmcp-manager.c.orig 2008-01-07 20:39:37.000000000 +0100 +++ ./daemon/gdm-xdmcp-manager.c -@@ -63,7 +63,7 @@ +@@ -64,7 +64,7 @@ * On Sun, we need to define allow_severity and deny_severity to link * against libwrap. */ @@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ #include <syslog.h> int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -@@ -369,12 +369,14 @@ ai_flags_str (struct addrinfo *ai) +@@ -370,12 +370,14 @@ ai_flags_str (struct addrinfo *ai) if (ai->ai_flags & AI_NUMERICSERV) { g_string_append (str, "numserv "); } @@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ } return g_string_free (str, FALSE); } -@@ -404,6 +406,14 @@ create_socket (struct addrinfo *ai) +@@ -405,6 +407,14 @@ create_socket (struct addrinfo *ai) return sock; } @@ -39,9 +39,9 @@ $NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ +#endif + if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { - g_warning ("bind: %s", g_strerror (errno)); + gdm_debug ("bind: %s", g_strerror (errno)); close (sock); -@@ -1259,7 +1269,9 @@ create_sa_from_request (ARRAY8 *req_addr +@@ -1260,7 +1270,9 @@ create_sa_from_request (ARRAY8 *req_addr memset (&hints, 0, sizeof (hints)); hints.ai_family = family; @@ -49,9 +49,9 @@ $NetBSD: patch-ap,v 1.1 2007/11/30 20:08:39 drochner Exp $ hints.ai_flags = AI_V4MAPPED; /* this should convert IPv4 address to IPv6 if needed */ +#endif if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) { - g_warning ("Unable get address: %s", gai_strerror (gaierr)); + gdm_debug ("Unable get address: %s", gai_strerror (gaierr)); return FALSE; -@@ -1278,6 +1290,20 @@ create_sa_from_request (ARRAY8 *req_addr +@@ -1279,6 +1291,20 @@ create_sa_from_request (ARRAY8 *req_addr freeaddrinfo (ai_list); diff --git a/x11/gdm/patches/patch-ar b/x11/gdm/patches/patch-ar new file mode 100644 index 00000000000..228027149cf --- /dev/null +++ b/x11/gdm/patches/patch-ar @@ -0,0 +1,12 @@ +$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; + |