Update to GDM 2.8.0.0.

Submitted by:	sajd on #freebsd-gnome

8 files changed, 74 insertions, 68 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 59baec73029..f03f4b4e0b6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.6.0.9
-PORTREVISION=	2
+PORTVERSION=	2.8.0.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -32,8 +31,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		gdm.1
 
-PLIST_SUB=	VERSION="2.6"
-
 OPTIONS=	IPV6 "Enable IPv6 support (This disables IPv4 support)" off
 
 .include <bsd.port.pre.mk>
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 977269e292a..8c04766ecb6 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.6.0.9.tar.bz2) = d845fe205412bb101d4c66d1e88a317d
-SIZE (gnome2/gdm-2.6.0.9.tar.bz2) = 3484460
+MD5 (gnome2/gdm-2.8.0.0.tar.bz2) = f5540e6ddc136d3b4a5bc32baa0ea3eb
+SIZE (gnome2/gdm-2.8.0.0.tar.bz2) = 3680270
diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.sh.in
index b3a1a3b0063..f3fe02d38c3 100644
--- a/x11/gdm/files/gdm.sh.in
+++ b/x11/gdm/files/gdm.sh.in
@@ -11,9 +11,9 @@ gdm_enable=${gdm_enable-"NO"}
 
 name=gdm
 rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-procname="%%PREFIX%%/bin/gdm-binary"
+procname="%%PREFIX%%/sbin/gdm-binary"
 
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 2576ce2b631..60a61690277 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig	Tue Aug  3 19:38:53 2004
-+++ config/locale.alias	Thu Aug 19 13:11:27 2004
-@@ -14,89 +14,50 @@
+--- config/locale.alias.orig	Sat Jun 11 02:01:45 2005
++++ config/locale.alias	Sat Jun 11 03:34:22 2005
+@@ -14,104 +14,56 @@
  #
  #		- George
  
@@ -11,15 +11,19 @@
 -Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
 -Armenian		hy_AM.UTF-8,hy_AM
 -Azerbaijani		az_AZ.UTF-8,az_AZ
+-Azerbaijani(Iran)	az_IR.UTF-8,az_IR
 -Basque			eu_ES.UTF-8,eu_ES
 -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
+-Breton			br_FR.UTF-8,br_FR
 -Bulgarian		bg_BG.UTF-8,bg_BG
 -Catalan			ca_ES.UTF-8,ca_ES
--Chinese(simplified)	zh_CN.UTF-8,zh_CN
--Chinese(traditional)	zh_TW.UTF-8,zh_TW
+-Chinese(China Mainland)	zh_CN.UTF-8,zh_CN
+-Chinese(Hong Kong)	zh_HK.UTF-8,zh_HK
+-Chinese(Singapore)	zh_SG.UTF-8,zh_SG
+-Chinese(Taiwan)		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
@@ -30,6 +34,7 @@
 -English(Canada)		en_CA.UTF-8,en_CA
 -English(Ireland)	en_IE.UTF-8,en_IE
 -English(SouthAfrica)	en_ZA.UTF-8,en_ZA
+-Esparanto		eo.UTF-8,eo
 -Estonian		et_EE.UTF-8,et_EE
 -Finnish			fi_FI.UTF-8,fi_FI
 -French			fr_FR.UTF-8,fr_FR
@@ -54,12 +59,17 @@
 -Kinyarwanda             rw_RW.UTF-8,rw_RW
 -Korean			ko_KR.UTF-8,ko_KR
 -Latvian			lv_LV.UTF-8,lv_LV
+-Limburgish		li_NL.UTF-8,li_NL
+-Limburgish(Belgium)	li_BE.UTF-8,li_BE
+-Limburgish(Germany)	li_DE.UTF-8,li_DE
 -Lithuanian		lt_LT.UTF-8,lt_LT
 -Macedonian		mk_MK.UTF-8,mk_MK
 -Malayalam			ml_IN.UTF-8,ml_IN
 -Malay			ms_MY.UTF-8,ms_MY
+-Maori			mi_NZ.UTF-8,mi_NZ	
 -Marathi			mr_IN.UTF-8,mr_IN
 -Mongolian		mn_MN.UTF-8,mn_MN
+-Nepali			ne_NP.UTF-8,ne_NP
 -NorthernSotho	nso_ZA.UTF-8,nso_ZA
 -Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
 -Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
@@ -80,24 +90,31 @@
 -Spanish(Mexico)		es_MX.UTF-8,es_MX
 -Swedish(Finland)	sv_FI.UTF-8,sv_FI
 -Swedish			sv_SE.UTF-8,sv_SE
+-Tagalog			tl_PH.UTF-8,tl_PH
+-Tajik			tg_TJ.UTF-8,tg_TJ
 -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
+-Uzbek			uz_UZ.UTF-8,uz_UZ
+-Uzbek(Latin)		uz_UZ.UTF-8@Latn,uz_UZ@Latn
 -Vietnamese		vi_VN.UTF-8,vi_VN
 -Walloon			wa_BE.UTF-8,wa_BE
 -Welsh			cy_GB.UTF-8,cy_GB
+-Xhosa			xh_ZA.UTF-8,xh_ZA
 -Yiddish			yi.UTF-8,yi
 -Zulu			zu_ZA.UTF-8,zu_ZA
 +Afrikaans              af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
 +Amharic                am_ET.UTF-8
 +Armenian               hy_AM.UTF-8
++Basque                 eu_ES.UTF-8,eu_ES.ISO8859-15,eu_ES.ISO8859-1
 +Byelorussian           be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
 +Bulgarian              bg_BG.UTF-8,bg_BG.CP1251
 +Catalan                ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1
 +Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN
 +Chinese(traditional)   zh_TW.UTF-8,zh_TW.Big5
++Chinese(Hong Kong)     zh_HK.UTF-8,zh_HK.Big5HKSCS
 +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,da_DK.ISO8859-1
@@ -112,9 +129,12 @@
 +Estonian               et_EE.UTF-8,et_EE.ISO8859-15
 +Finnish                fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1
 +French                 fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1
++French(Belgium)        fr_BE.UTF-8,fr_BE.ISO8859-15,fr_BE.ISO8859-1
 +French(Canadian)       fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15
 +French(Swiss)          fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1
 +German                 de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1
++German(Austria)        de_AT.UTF-8,de_AT.ISO8859-15,de_AT.ISO8859-1
++German(Switzerland)    de_CH.UTF-8,de_CH.ISO8859-15,de_CH.ISO8859-1
 +Greek                  el_GR.UTF-8,el_GR.ISO8859-7
 +Hebrew                 he_IL.UTF-8
 +Hindi                  hi_IN.ISCII-DEV
@@ -131,6 +151,7 @@
 +Portuguese(Brazilian)  pt_PT.UTF-8,pt_BR.ISO8859-1
 +Romanian               ro_RO.UTF-8,ro_RO.ISO8859-2
 +Russian                ru_RU.UTF-8,ru_RU.ISO8859-5
++Serbian                sr_YU.UTF-8,sr_YU.ISO8859-2,sr_YU.ISO8859-5
 +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,es_ES.ISO8859-1
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index 7ffdc1457e6..72f2005ff72 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Mar  7 20:58:02 2005
-+++ configure	Mon Mar  7 20:59:44 2005
-@@ -21643,6 +21643,8 @@
+--- configure.orig	Sat Jun 11 03:35:18 2005
++++ configure	Sat Jun 11 03:43:21 2005
+@@ -22412,6 +22412,8 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -9,15 +9,16 @@
  $ac_includes_default
  int
  main ()
-@@ -28959,6 +28961,12 @@
-         REBOOT_COMMAND="/sbin/init 6"
+@@ -30210,6 +30212,13 @@
          SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
+         XSESSION_SHELL=/bin/ksh
          ;;
 +*freebsd*)
 +	GDM_USER_PATH="/bin:/usr/bin"
 +	HALT_COMMAND="/sbin/shutdown -p now;/usr/sbin/shutdown -p now"
 +	REBOOT_COMMAND="/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
 +	SUSPEND_COMMAND="/usr/sbin/zzz"
++	XSESSION_SHELL=/bin/sh
 +	;;
  *)
          GDM_USER_PATH="/bin:/usr/bin"
diff --git a/x11/gdm/files/patch-daemon_gdm-net.c b/x11/gdm/files/patch-daemon_gdm-net.c
deleted file mode 100644
index caf221d7c95..00000000000
--- a/x11/gdm/files/patch-daemon_gdm-net.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- daemon/gdm-net.c.orig	Thu May 12 01:00:31 2005
-+++ daemon/gdm-net.c	Thu May 12 01:00:36 2005
-@@ -76,14 +76,14 @@ struct _GdmConnection {
- };
- 
- static gboolean
--close_if_needed (GdmConnection *conn, GIOCondition cond)
-+close_if_needed (GdmConnection *conn, GIOCondition cond, gboolean error)
- {
- 	/* non-subconnections are never closed */
- 	if (conn->parent == NULL)
- 		return TRUE;
- 
- 	if (cond & G_IO_ERR ||
--	    cond & G_IO_HUP) {
-+	    cond & G_IO_HUP || error) {
- 		gdm_debug ("close_if_needed: Got HUP/ERR on %d", conn->fd);
- 		conn->source = 0;
- 		gdm_connection_close (conn);
-@@ -103,11 +103,11 @@ gdm_connection_handler (GIOChannel *sour
- 	size_t len;
- 
- 	if ( ! (cond & G_IO_IN)) 
--		return close_if_needed (conn, cond);
-+		return close_if_needed (conn, cond, FALSE);
- 
- 	VE_IGNORE_EINTR (len = read (conn->fd, buf, sizeof (buf) -1));
- 	if (len <= 0) {
--		return close_if_needed (conn, cond);
-+		return close_if_needed (conn, cond, TRUE);
- 	}
- 
- 	buf[len] = '\0';
-@@ -141,7 +141,7 @@ gdm_connection_handler (GIOChannel *sour
- 		}
- 	}
- 
--	return close_if_needed (conn, cond);
-+	return close_if_needed (conn, cond, FALSE);
- }
- 
- gboolean
diff --git a/x11/gdm/files/patch-daemon_slave.c b/x11/gdm/files/patch-daemon_slave.c
new file mode 100644
index 00000000000..5a1a3aca730
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_slave.c
@@ -0,0 +1,17 @@
+--- daemon/slave.c.orig	Sat Jun 11 00:44:02 2005
++++ daemon/slave.c	Sat Jun 11 00:45:58 2005
+@@ -4058,14 +4058,6 @@
+ 	    home_dir = pwent->pw_dir;
+     }
+ 
+-    if G_UNLIKELY (setegid (pwent->pw_gid) != 0 ||
+-		   seteuid (pwent->pw_uid) != 0) {
+-	    gdm_error ("Cannot set effective user/group id");
+-	    gdm_verify_cleanup (d);
+-	    session_started = FALSE;
+-	    return;
+-    }
+-
+     if G_LIKELY (home_dir_ok) {
+ 	    /* Sanity check on ~user/.dmrc */
+ 	    usrcfgok = gdm_file_check ("gdm_slave_session_start", pwent->pw_uid,
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 6debc5f006d..dd964d28aca 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,13 +1,8 @@
-bin/gdm
-bin/gdm-binary
 bin/gdmXnest
 bin/gdmXnestchooser
-bin/gdmchooser
+bin/gdmdynamic
 bin/gdmflexiserver
-bin/gdmgreeter
-bin/gdmlogin
 bin/gdmphotosetup
-bin/gdmsetup
 bin/gdmthemetester
 etc/gdm/Init/Default
 etc/gdm/PostLogin/Default.sample
@@ -28,11 +23,16 @@ etc/gdm/modules/factory-AccessKeyMouseEvents
 lib/gtk-2.0/modules/libdwellmouselistener.so
 lib/gtk-2.0/modules/libkeymouselistener.so
 %%PAM_MISC%%libexec/gdmaskpass
+libexec/gdmchooser
+libexec/gdmlogin
+libexec/gdmgreeter
 libexec/gdmtranslate
+sbin/gdm
+sbin/gdm-binary
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
-sbin/gdmconfig
+sbin/gdmsetup
 share/gnome/applications/gdmflexiserver-xnest.desktop
 share/gnome/applications/gdmflexiserver.desktop
 share/gnome/applications/gdmsetup.desktop
@@ -115,6 +115,16 @@ share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
+share/gnome/pixmaps/faces/bonfire.jpg
+share/gnome/pixmaps/faces/cdrom.jpg
+share/gnome/pixmaps/faces/clock.jpg
+share/gnome/pixmaps/faces/daisy.jpg
+share/gnome/pixmaps/faces/dice.jpg
+share/gnome/pixmaps/faces/hollyleaf.jpg
+share/gnome/pixmaps/faces/lamas.jpg
+share/gnome/pixmaps/faces/seal.jpg
+share/gnome/pixmaps/faces/sky.jpg
+share/gnome/pixmaps/faces/skyline.jpg
 share/gnome/xsessions/gnome.desktop
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
@@ -162,6 +172,7 @@ share/locale/mn/LC_MESSAGES/gdm.mo
 share/locale/mr/LC_MESSAGES/gdm.mo
 share/locale/ms/LC_MESSAGES/gdm.mo
 share/locale/nb/LC_MESSAGES/gdm.mo
+share/locale/ne/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
 share/locale/no/LC_MESSAGES/gdm.mo
@@ -219,6 +230,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrm share/gnome/gdm/themes
 @dirrm share/gnome/gdm/BuiltInSessions
 @dirrm share/gnome/gdm
+@dirrm share/gnome/pixmaps/faces
 @dirrm etc/pam.d
 @dirrm etc/gdm/modules
 @dirrm etc/gdm/Sessions