* Update to 2.4.2.98

* Remove the old security warning.  There hasn't been a GDM CERT advisory in
  a long time.

Note, this release is a big win for us since a lot of our patches were
integrated into the GDM distribution.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@999 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 10 insertions, 113 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 310118bd5..825c6b218 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.2.97
+PORTVERSION=	2.4.2.98
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
@@ -35,15 +35,6 @@ PLIST_SUB=	PAM_MISC=""
 PLIST_SUB=	PAM_MISC="@comment "
 .endif
 
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-pre-fetch:
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
-
 post-extract:
 	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" \
 		${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index f595f4d71..cfcd02980 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.2.97.tar.bz2) = 300033d842870987ed8509b5bc13a722
+MD5 (gnome2/gdm-2.4.2.98.tar.bz2) = b1882d6dd25e2f9e1c7b0800e15481d0
diff --git a/x11/gdm2/files/patch-at b/x11/gdm2/files/patch-at
deleted file mode 100644
index 2e73a9b0b..000000000
--- a/x11/gdm2/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_PostSession.in b/x11/gdm2/files/patch-config_PostSession.in
deleted file mode 100644
index 0aa508fc9..000000000
--- a/x11/gdm2/files/patch-config_PostSession.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/PostSession.in.orig	Fri May 30 06:21:12 2003
-+++ config/PostSession.in	Mon Jun 16 17:31:05 2003
-@@ -2,7 +2,7 @@
- 
- PATH=@X_PATH@:$PATH
- 
--if command -v sessreg > /dev/null 2>&1; then
-+if /usr/bin/which -s sessreg > /dev/null 2>&1; then
- 	sessreg -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER
- fi
- exit 0
diff --git a/x11/gdm2/files/patch-config_PreSession.in b/x11/gdm2/files/patch-config_PreSession.in
deleted file mode 100644
index c7dea60c9..000000000
--- a/x11/gdm2/files/patch-config_PreSession.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/PreSession.in.orig	Fri May 30 06:21:12 2003
-+++ config/PreSession.in	Mon Jun 16 17:30:38 2003
-@@ -8,11 +8,11 @@
- #
- PATH=@X_PATH@:$PATH
- 
--if command -v xsetroot > /dev/null 2>&1; then
-+if /usr/bin/which -s xsetroot > /dev/null 2>&1; then
- 	xsetroot -cursor_name left_ptr -solid "#363047"
- fi
- 
--if command -v sessreg > /dev/null 2>&1; then
-+if /usr/bin/which -s sessreg > /dev/null 2>&1; then
- 	# some output for easy debugging
- 	echo "$0: Registering your session with wtmp and utmp"
- 	echo "$0: running: sessreg -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l $DISPLAY $USER"
diff --git a/x11/gdm2/files/patch-daemon_misc.c b/x11/gdm2/files/patch-daemon_misc.c
deleted file mode 100644
index e8be3c006..000000000
--- a/x11/gdm2/files/patch-daemon_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/misc.c.orig	Thu Jul 17 00:50:07 2003
-+++ daemon/misc.c	Thu Jul 17 00:51:57 2003
-@@ -23,6 +23,8 @@
- #include <signal.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <sys/wait.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
diff --git a/x11/gdm2/files/patch-daemon_slave.c b/x11/gdm2/files/patch-daemon_slave.c
deleted file mode 100644
index 27ac0544a..000000000
--- a/x11/gdm2/files/patch-daemon_slave.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- daemon/slave.c.orig	Wed Sep 18 02:25:09 2002
-+++ daemon/slave.c	Wed Sep 18 02:25:15 2002
-@@ -2327,7 +2327,8 @@
- 	if (setusercontext (NULL, pwent, pwent->pw_uid,
- 			    LOGIN_SETLOGIN | LOGIN_SETPATH |
- 			    LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
--			    LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
-+			    LOGIN_SETUMASK | LOGIN_SETUSER |
-+			    LOGIN_SETENV) < 0)
- 		gdm_child_exit (DISPLAY_REMANAGE,
- 				_("%s: setusercontext() failed for %s. "
- 				  "Aborting."), "gdm_slave_session_start",
diff --git a/x11/gdm2/files/patch-gui::gdmsetup.c b/x11/gdm2/files/patch-gui::gdmsetup.c
deleted file mode 100644
index 7167e6fae..000000000
--- a/x11/gdm2/files/patch-gui::gdmsetup.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- gui/gdmsetup.c.orig	Tue Jul 15 13:23:37 2003
-+++ gui/gdmsetup.c	Thu Jul 17 00:57:18 2003
-@@ -1550,13 +1550,14 @@
- 	if (dir_exists (theme_dir, dir)) {
- 		char *fname = g_filename_to_utf8 (dir, -1, NULL, NULL, NULL);
- 		char *s;
-+		GtkWidget *dlg;
- 		GtkWidget *button;
- 		/* FIXME: if exists already perhaps we could also have an
- 		 * option to change the dir name */
- 		s = g_strdup_printf (_("Theme directory '%s' seems to be already "
- 				       "installed, install again anyway?"),
- 				     fname);
--		GtkWidget *dlg =
-+		dlg =
- 			ve_hig_dialog_new
- 			(GTK_WINDOW (fs),
- 			 GTK_DIALOG_MODAL | 
-@@ -1602,7 +1603,7 @@
- 			success = TRUE;
- 
- 			/* HACK! */
--			cmd = g_strdup_printf ("/bin/chown -R root.root %s", quoted);
-+			cmd = g_strdup_printf ("/usr/sbin/chown -R gdm:gdm %s", quoted);
- 			system (cmd);
- 			g_free (cmd);
- 
diff --git a/x11/gdm2/files/patch-gui_gdmphotosetup.c b/x11/gdm2/files/patch-gui_gdmphotosetup.c
deleted file mode 100644
index 6121bdf93..000000000
--- a/x11/gdm2/files/patch-gui_gdmphotosetup.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/gdmphotosetup.c.orig	Mon May  5 21:47:14 2003
-+++ gui/gdmphotosetup.c	Mon May  5 21:47:39 2003
-@@ -22,6 +22,7 @@
- #include <libgnome/libgnome.h>
- #include <libgnomeui/libgnomeui.h>
- #include <sys/types.h>
-+#include <signal.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install
index e373a44e3..b8f29b328 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -40,7 +40,3 @@ if [ "$2" = "POST-INSTALL" ]; then
 	${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
 	exit 0
 fi
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --yesno "GDM may contain vulnerabilities leading local root compromise, and it is reported widely with various security sites and groups. It is not recommended that this port be installed in public environment. Do you wish to accept the security risk and build GDM anyway?" 10 60 || /usr/bin/false
-fi
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 2399fc3e7..d5a0e5916 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -31,6 +31,7 @@ etc/rc.d/gdm.sh.sample
 lib/gtk-2.0/modules/libdwellmouselistener.so
 lib/gtk-2.0/modules/libkeymouselistener.so
 %%PAM_MISC%%libexec/gdmaskpass
+libexec/gdmtranslate
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdm-stop
@@ -66,6 +67,10 @@ 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/help/gdm/C/gdm.xml
+share/gnome/help/gdm/C/legal.xml
+share/gnome/omf/gdm/gdm-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdm-foot-logo.png
 share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
@@ -126,6 +131,8 @@ share/locale/vi/LC_MESSAGES/gdm-2.4.mo
 share/locale/wa/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/omf/gdm
+@dirrm share/gnome/help/gdm/C
 @dirrm share/gnome/gdm/themes/happygnome
 @dirrm share/gnome/gdm/themes/happygnome-list
 @dirrm share/gnome/gdm/themes/circles
@@ -133,3 +140,4 @@ share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
 @dirrm etc/pam.d
 @dirrm etc/gdm/modules
 @unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gdm/gdm-C.omf 2>/dev/null || /usr/bin/true