summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/gdm2/Makefile24
-rw-r--r--x11/gdm2/distinfo2
-rw-r--r--x11/gdm2/files/patch-ab42
-rw-r--r--x11/gdm2/files/patch-ag10
-rw-r--r--x11/gdm2/files/patch-ah4
-rw-r--r--x11/gdm2/files/patch-ai4
-rw-r--r--x11/gdm2/files/patch-al7
-rw-r--r--x11/gdm2/files/patch-ap28
-rw-r--r--x11/gdm2/files/patch-aq11
-rw-r--r--x11/gdm2/files/patch-at26
-rw-r--r--x11/gdm2/files/patch-config.h.in4
-rw-r--r--x11/gdm2/files/patch-configure32
-rw-r--r--x11/gdm2/files/patch-daemon::slave.c195
-rw-r--r--x11/gdm2/files/patch-docs::Makefile.in14
-rw-r--r--x11/gdm2/files/patch-gui::gdmlogin.c9
-rw-r--r--x11/gdm2/files/patch-ltmain.sh28
-rw-r--r--x11/gdm2/pkg-comment2
-rw-r--r--x11/gdm2/pkg-descr2
-rw-r--r--x11/gdm2/pkg-plist202
19 files changed, 247 insertions, 399 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 7a72bb1729fb..a0b30def9dc3 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -1,26 +1,30 @@
-# New ports collection makefile for: gdm
-# Date created: 12 September 2000
-# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
+# New ports collection makefile for: gdm2
+# Date created: 20 May 2002
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= gdm
-PORTVERSION= 2.2.5.5
+PORTNAME= gdm2
+PORTVERSION= 2.3.90.3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/gdm
-DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+ rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+USE_LIBTOOL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+ --datadir=${PREFIX}/share/gnome
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
GDMDIR?= ${PREFIX}/etc/gdm
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index b5072879b419..4fdca20c7f87 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome/gdm-2.2.5.5.tar.bz2) = 32085157d128caab9b53c110a9818d61
+MD5 (gnome2/gdm-2.3.90.3.tar.bz2) = 8545d607c518b8b0819d27bcc66c800e
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index cd7353010772..4165942a4b05 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,18 +1,15 @@
-
-$FreeBSD$
-
---- config/gdm.conf.in.orig Fri Nov 16 13:42:13 2001
-+++ config/gdm.conf.in Thu Dec 20 11:35:10 2001
-@@ -5,7 +5,7 @@
+--- config/gdm.conf.in.orig Mon May 20 23:50:34 2002
++++ config/gdm.conf.in Mon May 20 23:53:04 2002
+@@ -17,7 +17,7 @@
# want gdm to kill/restart the server, turn this on
AlwaysRestartServer=false
- Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
+ Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog
-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
- DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+ DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -13,7 +13,7 @@
+@@ -26,7 +26,7 @@
Group=gdm
HaltCommand=/sbin/shutdown -h now
KillInitClients=true
@@ -21,28 +18,28 @@ $FreeBSD$
PidFile=/var/run/gdm.pid
PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -22,7 +22,7 @@
+@@ -35,7 +35,7 @@
FailsafeXServer=
XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
RebootCommand=/sbin/shutdown -r now
--RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
+-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
ServAuthDir=@EXPANDED_AUTHDIR@
SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
SuspendCommand=
-@@ -33,9 +33,9 @@
+@@ -46,9 +46,9 @@
TimedLoginEnable=false
TimedLogin=
TimedLoginDelay=30
--StandardXServer=/usr/bin/X11/X
+-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=@EXPANDED_BINDIR@/X
FlexibleXServers=5
--Xnest=/usr/bin/X11/Xnest -name Xnest
+-Xnest=/usr/X11R6/bin/Xnest -name Xnest
+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
[security]
# If any distributions ship with this one off, they should be shot
-@@ -68,7 +68,7 @@
+@@ -81,7 +81,7 @@
Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
[gui]
@@ -51,7 +48,7 @@ $FreeBSD$
MaxIconWidth=128
MaxIconHeight=128
-@@ -77,14 +77,14 @@
+@@ -90,7 +90,7 @@
ConfigAvailable=true
Browser=false
DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
@@ -59,20 +56,11 @@ $FreeBSD$
+DefaultLocale=en_US.ISO_8859-1
# These are things excluded from the face browser, not from logging in
Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
--Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
-+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
GlobalFaceDir=@EXPANDED_DATADIR@/faces/
- Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
- LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
--Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
-+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
- Quiver=true
- SystemMenu=true
- Welcome=Welcome to %n
-@@ -137,5 +137,5 @@
+@@ -151,5 +151,5 @@
[server-Standard]
name=Standard server
--command=/usr/bin/X11/X
+-command=/usr/X11R6/bin/X
+command=@EXPANDED_BINDIR@/X
flexible=true
diff --git a/x11/gdm2/files/patch-ag b/x11/gdm2/files/patch-ag
index 90113125f8c1..dca3ff5bbf9b 100644
--- a/x11/gdm2/files/patch-ag
+++ b/x11/gdm2/files/patch-ag
@@ -1,7 +1,11 @@
---- config/Default.orig Fri Mar 30 19:27:22 2001
-+++ config/Default Tue May 8 11:30:59 2001
-@@ -3,3 +3,3 @@
+--- config/Default.orig Mon May 20 23:53:42 2002
++++ config/Default Mon May 20 23:53:55 2002
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
#Color is now handled by gdmgreeter itself
-#/usr/bin/X11/xsetroot -solid "#007777"
+#/usr/X11R6/bin/xsetroot -solid "#007777"
+
+
diff --git a/x11/gdm2/files/patch-ah b/x11/gdm2/files/patch-ah
index f536eab3268a..53dfab40a1bc 100644
--- a/x11/gdm2/files/patch-ah
+++ b/x11/gdm2/files/patch-ah
@@ -1,5 +1,5 @@
---- config/PreSession.orig Sun Jun 3 14:45:40 2001
-+++ config/PreSession Sun Jun 3 14:47:23 2001
+--- config/PreSession.orig Mon May 20 23:54:34 2002
++++ config/PreSession Mon May 20 23:55:03 2002
@@ -1,4 +1,4 @@
#!/bin/sh
-if [ -x /usr/bin/X11/sessreg ]; then
diff --git a/x11/gdm2/files/patch-ai b/x11/gdm2/files/patch-ai
index 47d98e7f5070..b79b89270fc5 100644
--- a/x11/gdm2/files/patch-ai
+++ b/x11/gdm2/files/patch-ai
@@ -1,5 +1,5 @@
---- config/PostSession.orig Sun Jun 3 14:48:43 2001
-+++ config/PostSession Sun Jun 3 14:49:15 2001
+--- config/PostSession.orig Mon May 20 23:55:40 2002
++++ config/PostSession Mon May 20 23:55:56 2002
@@ -1,4 +1,4 @@
#!/bin/sh
-if [ -x /usr/bin/X11/sessreg ]; then
diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al
index 1a731f39fddf..2b72bfecdfc3 100644
--- a/x11/gdm2/files/patch-al
+++ b/x11/gdm2/files/patch-al
@@ -1,8 +1,7 @@
---- config/gnomerc.in.orig Thu Feb 15 19:41:46 2001
-+++ config/gnomerc.in Fri Apr 20 18:48:24 2001
+--- config/gnomerc.in.orig Mon May 20 23:56:25 2002
++++ config/gnomerc.in Mon May 20 23:56:45 2002
@@ -1 +1,4 @@
--@EXPANDED_BINDIR@/gnome-session
+#!/bin/csh
+
+unsetenv LC_CTYPE
-+exec @EXPANDED_BINDIR@/gnome-session
+ exec @EXPANDED_BINDIR@/gnome-session
diff --git a/x11/gdm2/files/patch-ap b/x11/gdm2/files/patch-ap
index e971ac1a811b..fa2852604e44 100644
--- a/x11/gdm2/files/patch-ap
+++ b/x11/gdm2/files/patch-ap
@@ -1,23 +1,22 @@
-
-$FreeBSD$
-
---- config/locale.alias.orig Thu Dec 20 11:40:42 2001
-+++ config/locale.alias Thu Dec 20 11:40:47 2001
-@@ -29,39 +29,38 @@
- catalan ca_ES.ISO-8859-1
+--- config/locale.alias.orig Wed May 1 13:01:47 2002
++++ config/locale.alias Tue May 21 00:01:09 2002
+@@ -26,42 +26,41 @@
+ # it with the rest of us. Send it using the `glibcbug' script to
+ # bugs@gnu.org.
+
+-catalan ca_ES.ISO-8859-1
++catalan ca_ES.ISO_8859-1
chinese(simplified) zh_CN.GB2312
- chinese(traditional) zh_TW
+ chinese(traditional) zh_TW.Big5
-croatian hr_HR.ISO-8859-2
-czech cs_CZ.ISO-8859-2
-+croatian hr_HR.ISO_8859-2
-+czech cs_CZ.ISO_8859-2
- danish da_DK.ISO-8859-1
+-danish da_DK.ISO-8859-1
-dansk da_DK.ISO-8859-1
-deutsch de_DE.ISO-8859-1
-dutch nl_NL.ISO-8859-1
--english en.ISO-8859-1
-english.us en_US.ISO-8859-1
-english.gb en_GB.ISO-8859-1
+-estonian et_EE.ISO-8859-15
-finnish fi_FI.ISO-8859-1
-french fr_FR.ISO-8859-1
-galician gl_ES.ISO-8859-1
@@ -38,12 +37,15 @@ $FreeBSD$
-portuguese pt_PT.ISO-8859-1
-portuguese.br pt_BR.ISO-8859-1
-romanian ro_RO.ISO-8859-2
++croatian hr_HR.ISO_8859-2
++czech cs_CZ.ISO_8859-2
++danish da_DK.ISO_8859-1
+dansk da_DK.ISO_8859-1
+deutsch de_DE.ISO_8859-1
+dutch nl_NL.ISO_8859-1
-+english en_US.ISO_8859-1
+english.us en_US.ISO_8859-1
+english.gb en_GB.ISO_8859-1
++estonian et_EE.ISO_8859-15
+finnish fi_FI.ISO_8859-1
+french fr_FR.ISO_8859-1
+galician gl_ES.ISO_8859-1
diff --git a/x11/gdm2/files/patch-aq b/x11/gdm2/files/patch-aq
deleted file mode 100644
index ac696b53c1e9..000000000000
--- a/x11/gdm2/files/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig Thu Aug 16 16:02:46 2001
-+++ po/Makefile.in.in Thu Aug 16 16:02:59 2001
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
-
- INSTALL = @INSTALL@
diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at
index fe089e70b8c8..2e73a9b0b71f 100644
--- a/x11/gdm2/files/patch-at
+++ b/x11/gdm2/files/patch-at
@@ -1,15 +1,11 @@
-
-$FreeBSD$
-
---- utils/Makefile.in.orig Wed Mar 13 17:52:05 2002
-+++ utils/Makefile.in Wed Mar 13 17:52:32 2002
-@@ -195,8 +195,7 @@
- gdmaskpass_LDADD = \
- $(GNOME_LIBDIR) \
- $(INTLLIBS) \
-- -lpam \
-- -lpam_misc
-+ -lpam
-
-
- gdmopen_LDADD = \
+--- utils/Makefile.in.orig Tue May 21 00:01:55 2002
++++ utils/Makefile.in Tue May 21 00:02:20 2002
+@@ -160,7 +160,7 @@
+ gdmmktemp_SOURCES = gdmmktemp.c
+
+
+-gdmaskpass_LDADD = $(INTLLIBS) -lpam -lpam_misc
++gdmaskpass_LDADD = $(INTLLIBS) -lpam
+
+
+ gdmopen_LDADD = $(INTLLIBS)
diff --git a/x11/gdm2/files/patch-config.h.in b/x11/gdm2/files/patch-config.h.in
index 0ef95695c763..dce71b7f7d66 100644
--- a/x11/gdm2/files/patch-config.h.in
+++ b/x11/gdm2/files/patch-config.h.in
@@ -1,5 +1,5 @@
---- config.h.in.orig Thu Jan 10 11:06:01 2002
-+++ config.h.in Thu Jan 10 11:06:18 2002
+--- config.h.in.orig Mon May 20 23:48:55 2002
++++ config.h.in Mon May 20 23:49:11 2002
@@ -6,6 +6,7 @@
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
index c543ff09aa19..740079442e32 100644
--- a/x11/gdm2/files/patch-configure
+++ b/x11/gdm2/files/patch-configure
@@ -1,12 +1,18 @@
-
-$FreeBSD$
-
---- configure 2002/03/13 23:11:57 1.3
-+++ configure 2002/03/13 23:16:32
-@@ -8575,6 +8575,52 @@
- fi
+--- configure.orig Mon May 20 23:47:49 2002
++++ configure Mon May 20 23:47:42 2002
+@@ -7371,6 +7371,7 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -10963,6 +10964,53 @@
+ GDMOPEN=gdmopen
+ fi
+ done
++
+for ac_hdr in sys/types.h login_cap.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -41,9 +47,9 @@ $FreeBSD$
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
-+
-+ LIBS="$LIBS -lutil"
-+ cat >> confdefs.h <<\EOF
++
++ LIBS="$LIBS -lutil"
++ cat >> confdefs.h <<\EOF
+#define HAVE_LOGINCAP 1
+EOF
+
@@ -53,6 +59,6 @@ $FreeBSD$
+done
+
+
- if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then
- { echo "configure: error: PAM support requested but not available" 1>&2; exit 1; }
- fi
+
+ have_pam=no
+ VRFY="verify-crypt"
diff --git a/x11/gdm2/files/patch-daemon::slave.c b/x11/gdm2/files/patch-daemon::slave.c
index 060a89ff690f..f3722dcec3c1 100644
--- a/x11/gdm2/files/patch-daemon::slave.c
+++ b/x11/gdm2/files/patch-daemon::slave.c
@@ -1,118 +1,111 @@
-
-$FreeBSD$
-
---- daemon/slave.c.orig Tue Jan 1 04:48:07 2002
-+++ daemon/slave.c Fri Jan 11 15:51:27 2002
-@@ -45,6 +45,11 @@
- #include <time.h>
- #include <syslog.h>
-
+--- daemon/slave.c.orig Tue May 21 00:04:14 2002
++++ daemon/slave.c Tue May 21 00:17:55 2002
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+#ifdef HAVE_LOGINCAP
-+#include <unistd.h>
+#include <login_cap.h>
+#endif
+
- #include <vicious.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -2008,6 +2012,7 @@
+ const char *session,
+ const char *save_session,
+ const char *language,
++ gboolean def_language,
+ const char *gnome_session,
+ gboolean usrcfgok,
+ gboolean savesess,
+@@ -2023,6 +2028,11 @@
- #include "gdm.h"
-@@ -140,6 +145,8 @@
- static gboolean x_error_occured = FALSE;
- static gboolean gdm_got_usr2 = FALSE;
+ gdm_clearenv ();
-+static void changeUser(struct passwd *pwent, char *login);
++ if (setsid() < 0)
++ /* should never happen */
++ gdm_error (_("%s: setsid() failed: %s!"),
++ "session_child_run", strerror(errno));
+
- /* ignore handlers */
- static int
- ignore_xerror_handler (Display *disp, XErrorEvent *evt)
-@@ -1785,6 +1792,27 @@
+ /* Prepare user session */
+ gnome_setenv ("XAUTHORITY", d->userauth, TRUE);
+ gnome_setenv ("DISPLAY", d->name, TRUE);
+@@ -2050,10 +2060,6 @@
+ language = unaliaslang (language);
+ }
- }
+- /* Set locale */
+- gnome_setenv ("LANG", language, TRUE);
+- gnome_setenv ("GDM_LANG", language, TRUE);
+-
+ setpgid (0, 0);
+
+ umask (022);
+@@ -2069,10 +2075,35 @@
+ * not to leave the egid around */
+ setegid (pwent->pw_gid);
+#ifdef HAVE_LOGINCAP
-+void changeUser(struct passwd *pwent, char *login) {
-+ if (setsid() == -1)
-+ gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setsid() failed for %s. Aborting."), login);
-+ if (setusercontext(NULL, pwent, pwent->pw_uid, LOGIN_SETALL) == -1)
-+ gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setusercontext() failed for %s. Aborting."), login);
-+}
++ if (setusercontext (NULL, pwent, pwent->pw_uid,
++ LOGIN_SETLOGIN | LOGIN_SETPATH |
++ LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
++ LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
++ gdm_child_exit (DISPLAY_REMANAGE,
++ _("%s: setusercontext() failed for %s. "
++ "Aborting."), "gdm_slave_session_start",
++ login);
++ /* A different language was selected, or taken from the saved
++ * prefs of the user */
++ if ( ! def_language) {
++ gnome_setenv ("LANG", language, TRUE);
++ gnome_setenv ("GDM_LANG", language, TRUE);
++ } else {
++ /* setusercontext sets up user languages */
++ gnome_setenv ("GDM_LANG", g_getenv ("LANG"), TRUE);
++ }
+#else
-+void changeUser(struct passwd *pwent, char *login) {
-+ setpgid(0, 0);
-+ umask(022);
-+ /* setup the user's correct group */
-+ if (setgid(pwent->pw_gid) < 0)
-+ gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
-+ if (initgroups(login, pwent->pw_gid) < 0)
-+ gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
-+ if (setuid(pwent->pw_uid) < 0)
-+ gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not become %s. Aborting."), login);
-+}
++
+ if (setuid (pwent->pw_uid) < 0)
+ gdm_child_exit (DISPLAY_REMANAGE,
+ _("gdm_slave_session_start: Could not become %s. Aborting."), login);
+
++ /* Set locale */
++ gnome_setenv ("LANG", language, TRUE);
++ gnome_setenv ("GDM_LANG", language, TRUE);
+#endif
+
- static char *
- dequote (const char *in)
- {
-@@ -1840,12 +1871,6 @@
- if (gnome_session != NULL)
- ve_setenv ("GDM_GNOME_SESSION", gnome_session, TRUE);
+ chdir (home_dir);
-- /* Special PATH for root */
-- if (pwent->pw_uid == 0)
-- ve_setenv ("PATH", GdmRootPath, TRUE);
-- else
-- ve_setenv ("PATH", GdmDefaultPath, TRUE);
--
- /* Eeeeek, this no lookie as a correct language code, let's
- * try unaliasing it */
- if (strlen (language) < 3 ||
-@@ -1853,14 +1878,31 @@
- language = unaliaslang (language);
- }
+ /* anality, make sure nothing is in memory for gnome_config
+@@ -2259,6 +2290,7 @@
+ char *gnome_session = NULL;
+ gboolean savesess = FALSE, savelang = FALSE, savegnomesess = FALSE;
+ gboolean usrcfgok = FALSE, sessoptok = FALSE, authok = FALSE;
++ gboolean def_language = FALSE;
+ const char *home_dir = NULL;
+ gboolean home_dir_ok = FALSE;
+ pid_t pid;
+@@ -2392,12 +2424,13 @@
+ language = g_strdup (lang);
+ else
+ language = g_strdup (GdmDefaultLocale);
+- savelang = TRUE;
-- /* Set locale */
-+ changeUser(pwent, login);
-+
-+ /*
-+ * Set locale. XXX in the HAVE_LOGINCAP case we override user's
-+ * default language, but there is no other way around, because there
-+ * is no way to select "Use user's default language" in the GDM, so
-+ * that we either have to give up ability to select language other
-+ * one specified in the login.conf, or just ignore default setting.
-+ * I selected the latter, which is suboptimal, but at least gives
-+ * some freedom to the user.
-+ */
- ve_setenv ("LANG", language, TRUE);
- ve_setenv ("GDM_LANG", language, TRUE);
-+
-+#ifndef HAVE_LOGINCAP
+ if (ve_string_empty (language)) {
+ g_free (language);
+ language = g_strdup ("C");
+ }
+
-+ /* Special PATH for root */
-+ if (pwent->pw_uid == 0)
-+ ve_setenv("PATH", GdmRootPath, TRUE);
-+ else
-+ ve_setenv("PATH", GdmDefaultPath, TRUE);
-+#else
-+ /* Do not reset PATH */
-+#endif
-
-- setpgid (0, 0);
--
-- umask (022);
--
- /* setup the verify env vars */
- if ( ! gdm_verify_setup_env (d))
- gdm_child_exit (DISPLAY_REMANAGE,
-@@ -1870,12 +1912,8 @@
++ def_language = TRUE;
+ }
- /* setup egid to the correct group,
- * not to leave the egid around */
-- setegid (pwent->pw_gid);
-+ /*setegid (pwent->pw_gid);*/
-
-- if (setuid (pwent->pw_uid) < 0)
-- gdm_child_exit (DISPLAY_REMANAGE,
-- _("gdm_slave_session_start: Could not become %s. Aborting."), login);
--
- chdir (home_dir);
-
- /* anality, make sure nothing is in memory for gnome_config
+ /* save this session as the users session */
+@@ -2499,6 +2532,7 @@
+ session,
+ save_session,
+ language,
++ def_language,
+ gnome_session,
+ usrcfgok,
+ savesess,
diff --git a/x11/gdm2/files/patch-docs::Makefile.in b/x11/gdm2/files/patch-docs::Makefile.in
deleted file mode 100644
index 91ccdd36565e..000000000000
--- a/x11/gdm2/files/patch-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- docs/Makefile.in 2002/03/13 23:43:57 1.1
-+++ docs/Makefile.in 2002/03/13 23:44:08
-@@ -147,7 +147,7 @@
- XPM_LIBS = @XPM_LIBS@
- ZVT_LIBS = @ZVT_LIBS@
-
--SUBDIRS = C eu gdmconfig
-+SUBDIRS = C gdmconfig
-
- EXTRA_DIST = sgmldocs.make
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/gdm2/files/patch-gui::gdmlogin.c b/x11/gdm2/files/patch-gui::gdmlogin.c
index 69eb35342a0f..379619b734ca 100644
--- a/x11/gdm2/files/patch-gui::gdmlogin.c
+++ b/x11/gdm2/files/patch-gui::gdmlogin.c
@@ -1,7 +1,6 @@
-
---- gui/gdmlogin.c.orig Mon Dec 31 21:51:17 2001
-+++ gui/gdmlogin.c Tue Jan 29 18:12:12 2002
-@@ -3326,7 +3326,9 @@
+--- gui/gdmlogin.c.orig Tue May 21 00:19:12 2002
++++ gui/gdmlogin.c Tue May 21 00:20:02 2002
+@@ -3419,7 +3419,9 @@
static gboolean
gdm_login_check_exclude (struct passwd *pwent)
{
@@ -11,7 +10,7 @@
gint i;
if ( ! GdmAllowRoot && pwent->pw_uid == 0)
-@@ -3335,11 +3337,13 @@
+@@ -3428,11 +3430,13 @@
if ( ! GdmAllowRemoteRoot && ! login_is_local && pwent->pw_uid == 0)
return TRUE;
diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/x11/gdm2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gdm2/pkg-comment b/x11/gdm2/pkg-comment
index f14f12f39ea0..cd5640b89cf3 100644
--- a/x11/gdm2/pkg-comment
+++ b/x11/gdm2/pkg-comment
@@ -1 +1 @@
-GNOME version of xdm display manager
+GNOME 2.0 version of xdm display manager
diff --git a/x11/gdm2/pkg-descr b/x11/gdm2/pkg-descr
index 59e6a26cf5fe..85c150c4c6f2 100644
--- a/x11/gdm2/pkg-descr
+++ b/x11/gdm2/pkg-descr
@@ -1,3 +1,3 @@
-The GNOME version of the xdm display manager. It has support for
+The GNOME 2.0 version of the xdm display manager. It has support for
face pixmaps, multiple sessions plus clean shutdowns from the login
menu.
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index e31ce00ba3fd..82d68c1a0f39 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -1,11 +1,12 @@
bin/gdm
bin/gdmXnestchooser
bin/gdmchooser
-bin/gdmconfig
bin/gdmflexiserver
+bin/gdmgreeter
bin/gdmlogin
bin/gdmmktemp
bin/gdmphotosetup
+bin/gdmsetup
etc/gdm/Init/Default
etc/gdm/PostSession/Default
etc/gdm/PreSession/Default
@@ -16,158 +17,67 @@ etc/gdm/factory-gdm.conf
etc/gdm/gdm.conf
etc/gdm/gnomerc
etc/gdm/locale.alias
-sbin/gdmaskpass
sbin/gdm-restart
sbin/gdm-safe-restart
-share/gnome/apps/Settings/gdmphotosetup.desktop
-share/gnome/apps/System/gdmconfig.desktop
-share/gnome/apps/System/gdmflexiserver-xnest.desktop
-share/gnome/apps/System/gdmflexiserver.desktop
+sbin/gdmaskpass
+sbin/gdmconfig
+share/gnome/applications/gdmflexiserver-xnest.desktop
+share/gnome/applications/gdmflexiserver.desktop
+share/gnome/applications/gdmsetup.desktop
+share/gnome/capplets/gdmphotosetup.desktop
share/gnome/gdm/gdmchooser.glade
-share/gnome/gdm/gdmconfig.glade
-share/gnome/help/gdm/C/configuration.html
-share/gnome/help/gdm/C/daemonov.html
-share/gnome/help/gdm/C/docbook.css
-share/gnome/help/gdm/C/f39.html
-share/gnome/help/gdm/C/gdm.html
-share/gnome/help/gdm/C/index.html
-share/gnome/help/gdm/C/intro.html
-share/gnome/help/gdm/C/x156.html
-share/gnome/help/gdm/C/x80.html
-share/gnome/help/gdm/C/x89.html
-share/gnome/help/gdmconfig/C/authors.html
-share/gnome/help/gdmconfig/C/basic.html
-share/gnome/help/gdmconfig/C/bugs.html
-share/gnome/help/gdmconfig/C/docbook.css
-share/gnome/help/gdmconfig/C/expert.html
-share/gnome/help/gdmconfig/C/figures/GDM_auto_login.png
-share/gnome/help/gdmconfig/C/figures/GDM_background.png
-share/gnome/help/gdmconfig/C/figures/GDM_chooser.png
-share/gnome/help/gdmconfig/C/figures/GDM_enviro.png
-share/gnome/help/gdmconfig/C/figures/GDM_face_brow.png
-share/gnome/help/gdmconfig/C/figures/GDM_full.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_appear.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_behav.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_sessions.png
-share/gnome/help/gdmconfig/C/figures/GDM_menubar.png
-share/gnome/help/gdmconfig/C/figures/GDM_misc.png
-share/gnome/help/gdmconfig/C/figures/GDM_paths.png
-share/gnome/help/gdmconfig/C/figures/GDM_security.png
-share/gnome/help/gdmconfig/C/figures/GDM_xdmcp.png
-share/gnome/help/gdmconfig/C/figures/GDM_xserv_setup.png
-share/gnome/help/gdmconfig/C/gdmconfig.sgml
-share/gnome/help/gdmconfig/C/index.html
-share/gnome/help/gdmconfig/C/license.html
-share/gnome/help/gdmconfig/C/ln7.html
-share/gnome/help/gdmconfig/C/stylesheet-images/caution.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/home.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/important.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/next.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/note.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/prev.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/tip.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-blank.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-minus.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-plus.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/up.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/warning.gif
-share/gnome/help/gdmconfig/C/system.html
-share/gnome/help/gdmconfig/C/topic.dat
-share/gnome/help/gdmconfig/C/usage.html
-share/gnome/help/gdmconfig/eu/basic.html
-share/gnome/help/gdmconfig/eu/figures/GDM_auto_login.png
-share/gnome/help/gdmconfig/eu/figures/GDM_background.png
-share/gnome/help/gdmconfig/eu/figures/GDM_chooser.png
-share/gnome/help/gdmconfig/eu/figures/GDM_enviro.png
-share/gnome/help/gdmconfig/eu/figures/GDM_face_brow.png
-share/gnome/help/gdmconfig/eu/figures/GDM_full.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_appear.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_behav.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_sessions.png
-share/gnome/help/gdmconfig/eu/figures/GDM_menubar.png
-share/gnome/help/gdmconfig/eu/figures/GDM_misc.png
-share/gnome/help/gdmconfig/eu/figures/GDM_paths.png
-share/gnome/help/gdmconfig/eu/figures/GDM_security.png
-share/gnome/help/gdmconfig/eu/figures/GDM_xdmcp.png
-share/gnome/help/gdmconfig/eu/figures/GDM_xserv_setup.png
-share/gnome/help/gdmconfig/eu/gdmconfig.sgml
-share/gnome/help/gdmconfig/eu/index.html
-share/gnome/help/gdmconfig/eu/ln10.html
-share/gnome/help/gdmconfig/eu/stylesheet-images/caution.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/home.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/important.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/next.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/note.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/prev.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/tip.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-blank.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-minus.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-plus.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/up.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/warning.gif
-share/gnome/help/gdmconfig/eu/topic.dat
-share/gnome/help/gdmconfig/eu/usage.html
-share/gnome/omf/gdm/gdmconfig-C.omf
-share/gnome/omf/gdm/gdmconfig-eu.omf
+share/gnome/gdm/gdmsetup.glade
+share/gnome/gdm/themes/circles/GdmGreeterTheme.info
+share/gnome/gdm/themes/circles/background.svg
+share/gnome/gdm/themes/circles/circles.xml
+share/gnome/gdm/themes/circles/flower.png
+share/gnome/gdm/themes/circles/help.png
+share/gnome/gdm/themes/circles/options.png
+share/gnome/gdm/themes/circles/screenshot.png
share/gnome/pixmaps/gdm.xpm
+share/gnome/pixmaps/login-photo.png
share/gnome/pixmaps/nobody.png
share/gnome/pixmaps/nohost.png
-share/locale/az/LC_MESSAGES/gdm.mo
-share/locale/bg/LC_MESSAGES/gdm.mo
-share/locale/ca/LC_MESSAGES/gdm.mo
-share/locale/cs/LC_MESSAGES/gdm.mo
-share/locale/da/LC_MESSAGES/gdm.mo
-share/locale/de/LC_MESSAGES/gdm.mo
-share/locale/el/LC_MESSAGES/gdm.mo
-share/locale/es/LC_MESSAGES/gdm.mo
-share/locale/et/LC_MESSAGES/gdm.mo
-share/locale/eu/LC_MESSAGES/gdm.mo
-share/locale/fi/LC_MESSAGES/gdm.mo
-share/locale/fr/LC_MESSAGES/gdm.mo
-share/locale/ga/LC_MESSAGES/gdm.mo
-share/locale/gl/LC_MESSAGES/gdm.mo
-share/locale/hu/LC_MESSAGES/gdm.mo
-share/locale/it/LC_MESSAGES/gdm.mo
-share/locale/ja/LC_MESSAGES/gdm.mo
-share/locale/ko/LC_MESSAGES/gdm.mo
-share/locale/lt/LC_MESSAGES/gdm.mo
-share/locale/lv/LC_MESSAGES/gdm.mo
-share/locale/ms/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
-share/locale/pl/LC_MESSAGES/gdm.mo
-share/locale/pt/LC_MESSAGES/gdm.mo
-share/locale/pt_BR/LC_MESSAGES/gdm.mo
-share/locale/ro/LC_MESSAGES/gdm.mo
-share/locale/ru/LC_MESSAGES/gdm.mo
-share/locale/sk/LC_MESSAGES/gdm.mo
-share/locale/sl/LC_MESSAGES/gdm.mo
-share/locale/sv/LC_MESSAGES/gdm.mo
-share/locale/ta/LC_MESSAGES/gdm.mo
-share/locale/tr/LC_MESSAGES/gdm.mo
-share/locale/uk/LC_MESSAGES/gdm.mo
-share/locale/zh_CN/LC_MESSAGES/gdm.mo
-share/locale/zh_TW/LC_MESSAGES/gdm.mo
-@unexec rm -f %D/etc/gdm/Init/Default.orig :: true
-@unexec rm -f %D/etc/gdm/PostSession/Default.orig :: true
-@unexec rm -f %D/etc/gdm/PreSession/Default.orig :: true
-@unexec rm -f %D/etc/gdm/Sessions/Gnome.orig :: true
-@unexec rm -f %D/etc/gdm/Sessions/Xsession.orig :: true
-@unexec rm -f %D/etc/gdm/locale.alias.orig :: true
-@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/help/gdmconfig/eu/stylesheet-images
-@dirrm share/gnome/help/gdmconfig/eu/figures
-@dirrm share/gnome/help/gdmconfig/eu
-@dirrm share/gnome/help/gdmconfig/C/stylesheet-images
-@dirrm share/gnome/help/gdmconfig/C/figures
-@dirrm share/gnome/help/gdmconfig/C
-@dirrm share/gnome/help/gdmconfig
-@dirrm share/gnome/help/gdm/C/images
-@dirrm share/gnome/help/gdm/C
-@dirrm share/gnome/help/gdm
+share/locale/az/LC_MESSAGES/gdm-2.4.mo
+share/locale/ca/LC_MESSAGES/gdm-2.4.mo
+share/locale/cs/LC_MESSAGES/gdm-2.4.mo
+share/locale/da/LC_MESSAGES/gdm-2.4.mo
+share/locale/de/LC_MESSAGES/gdm-2.4.mo
+share/locale/el/LC_MESSAGES/gdm-2.4.mo
+share/locale/es/LC_MESSAGES/gdm-2.4.mo
+share/locale/et/LC_MESSAGES/gdm-2.4.mo
+share/locale/eu/LC_MESSAGES/gdm-2.4.mo
+share/locale/fi/LC_MESSAGES/gdm-2.4.mo
+share/locale/fr/LC_MESSAGES/gdm-2.4.mo
+share/locale/ga/LC_MESSAGES/gdm-2.4.mo
+share/locale/gl/LC_MESSAGES/gdm-2.4.mo
+share/locale/hu/LC_MESSAGES/gdm-2.4.mo
+share/locale/it/LC_MESSAGES/gdm-2.4.mo
+share/locale/ja/LC_MESSAGES/gdm-2.4.mo
+share/locale/ko/LC_MESSAGES/gdm-2.4.mo
+share/locale/lt/LC_MESSAGES/gdm-2.4.mo
+share/locale/lv/LC_MESSAGES/gdm-2.4.mo
+share/locale/ms/LC_MESSAGES/gdm-2.4.mo
+share/locale/nl/LC_MESSAGES/gdm-2.4.mo
+share/locale/nn/LC_MESSAGES/gdm-2.4.mo
+share/locale/no/LC_MESSAGES/gdm-2.4.mo
+share/locale/pl/LC_MESSAGES/gdm-2.4.mo
+share/locale/pt/LC_MESSAGES/gdm-2.4.mo
+share/locale/pt_BR/LC_MESSAGES/gdm-2.4.mo
+share/locale/ro/LC_MESSAGES/gdm-2.4.mo
+share/locale/ru/LC_MESSAGES/gdm-2.4.mo
+share/locale/sk/LC_MESSAGES/gdm-2.4.mo
+share/locale/sl/LC_MESSAGES/gdm-2.4.mo
+share/locale/sv/LC_MESSAGES/gdm-2.4.mo
+share/locale/ta/LC_MESSAGES/gdm-2.4.mo
+share/locale/tr/LC_MESSAGES/gdm-2.4.mo
+share/locale/uk/LC_MESSAGES/gdm-2.4.mo
+share/locale/vi/LC_MESSAGES/gdm-2.4.mo
+share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
+share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
+@dirrm share/gnome/gdm/themes/circles
+@dirrm share/gnome/gdm/themes
@dirrm share/gnome/gdm
-@dirrm etc/pam.d
@dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@dirrm etc/gdm/PostSession
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:18:04 +0000