summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/gdm/Makefile7
-rw-r--r--x11/gdm/PLIST32
-rw-r--r--x11/gdm/distinfo14
-rwxr-xr-xx11/gdm/files/gdm.sh6
-rw-r--r--x11/gdm/patches/patch-aa19
-rw-r--r--x11/gdm/patches/patch-ab13
-rw-r--r--x11/gdm/patches/patch-ae85
-rw-r--r--x11/gdm/patches/patch-ah34
8 files changed, 97 insertions, 113 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 9956f1c6019..60044868351 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2005/06/26 16:52:14 jmmv Exp $
#
-DISTNAME= gdm-2.6.0.9
+DISTNAME= gdm-2.8.0.0
CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.8/}
EXTRACT_SUFX= .tar.bz2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.README Daemon.png
@@ -24,6 +24,7 @@ USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= gmake
PKG_OPTIONS_VAR= PKG_OPTIONS.gdm
PKG_SUPPORTED_OPTIONS= inet6 pam
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 20c61c5cb99..69c38530161 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,24 +1,25 @@
-@comment $NetBSD: PLIST,v 1.17 2005/05/02 20:34:07 reed Exp $
-bin/gdm
-bin/gdm-binary
+@comment $NetBSD: PLIST,v 1.18 2005/06/26 16:52:14 jmmv Exp $
+bin/gdm-dmx-reconnect-proxy
bin/gdmXnest
bin/gdmXnestchooser
-bin/gdmchooser
+bin/gdmdynamic
bin/gdmflexiserver
-bin/gdmgreeter
-bin/gdmlogin
bin/gdmphotosetup
-bin/gdmsetup
bin/gdmthemetester
lib/gtk-2.0/modules/libdwellmouselistener.la
lib/gtk-2.0/modules/libkeymouselistener.la
-libexec/gdmtranslate
${PAM_MISC}libexec/gdmaskpass
+libexec/gdmchooser
+libexec/gdmgreeter
+libexec/gdmlogin
+libexec/gdmtranslate
man/man1/gdm.1
+sbin/gdm
+sbin/gdm-binary
sbin/gdm-restart
sbin/gdm-safe-restart
sbin/gdm-stop
-sbin/gdmconfig
+sbin/gdmsetup
share/applications/gdmflexiserver-xnest.desktop
share/applications/gdmflexiserver.desktop
share/applications/gdmsetup.desktop
@@ -36,7 +37,6 @@ share/examples/gdm/modules/AccessDwellMouseEvents
share/examples/gdm/modules/AccessKeyMouseEvents
share/examples/gdm/modules/factory-AccessDwellMouseEvents
share/examples/gdm/modules/factory-AccessKeyMouseEvents
-share/examples/rc.d/gdm
share/gdm/BuiltInSessions/default.desktop
share/gdm/gdmchooser.glade
share/gdm/gdmsetup.glade
@@ -144,6 +144,7 @@ ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gdm.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gdm.mo
${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gdm.mo
@@ -183,6 +184,16 @@ share/omf/gdm/gdm-zh_CN.omf
share/omf/gdm/gdm-zh_HK.omf
share/omf/gdm/gdm-zh_TW.omf
share/pixmaps/Daemon.png
+share/pixmaps/faces/bonfire.jpg
+share/pixmaps/faces/cdrom.jpg
+share/pixmaps/faces/clock.jpg
+share/pixmaps/faces/daisy.jpg
+share/pixmaps/faces/dice.jpg
+share/pixmaps/faces/hollyleaf.jpg
+share/pixmaps/faces/lamas.jpg
+share/pixmaps/faces/seal.jpg
+share/pixmaps/faces/sky.jpg
+share/pixmaps/faces/skyline.jpg
share/pixmaps/gdm-foot-logo.png
share/pixmaps/gdm-setup.png
share/pixmaps/gdm-xnest.png
@@ -192,6 +203,7 @@ share/pixmaps/nobody.png
share/pixmaps/nohost.png
share/xsessions/gnome.desktop
@dirrm share/xsessions
+@dirrm share/pixmaps/faces
@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/omf/gdm
@comment in scrollkeeper: @dirrm share/omf
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 9bcb1e5e2fe..223557721ef 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.23 2005/04/26 20:20:32 drochner Exp $
+$NetBSD: distinfo,v 1.24 2005/06/26 16:52:14 jmmv Exp $
-SHA1 (gdm-2.6.0.9.tar.bz2) = 89f9ec3ca6d22332edb8cbdd6603d5f7ab975736
-RMD160 (gdm-2.6.0.9.tar.bz2) = 818c3a0ac362afd73e568f05793b447895cf93dc
-Size (gdm-2.6.0.9.tar.bz2) = 3484460 bytes
+SHA1 (gdm-2.8.0.0.tar.bz2) = d97e2e489e84094151a795b6e4c3631b3a69deb9
+RMD160 (gdm-2.8.0.0.tar.bz2) = 97927daf7914b830b0fabd8569bfa4084530fd14
+Size (gdm-2.8.0.0.tar.bz2) = 3680270 bytes
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
Size (Daemon.README) = 2191 bytes
SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 68b631bdf400b33863c36b17478eb5e899659386
+SHA1 (patch-aa) = 8e81767c1cdb0d85ffcf3cf62a37ac0cb7ac8634
+SHA1 (patch-ab) = c4966199d4fb6354a32e3229e8b51a08b0ff5b02
SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
-SHA1 (patch-ae) = 358dc369e2bb7380b5c6bf7145c8822edba0330e
+SHA1 (patch-ae) = 55b66f0f32701f6911db88c0b7da29758a7b2b95
SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
+SHA1 (patch-ah) = bbd92c7051479e54cce1182e54aca165c43e5ca4
diff --git a/x11/gdm/files/gdm.sh b/x11/gdm/files/gdm.sh
index 1e9976f1a4d..1b92850381e 100755
--- a/x11/gdm/files/gdm.sh
+++ b/x11/gdm/files/gdm.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: gdm.sh,v 1.2 2004/01/22 09:16:59 jmmv Exp $
+# $NetBSD: gdm.sh,v 1.3 2005/06/26 16:52:14 jmmv Exp $
#
# PROVIDE: gdm
@@ -13,9 +13,9 @@ fi
name="gdm"
rcvar=${name}
-command="@PREFIX@/bin/${name}"
+command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
-procname="@PREFIX@/bin/gdm-binary"
+procname="@PREFIX@/sbin/gdm-binary"
required_files="@PKG_SYSCONFDIR@/gdm/gdm.conf"
extra_commands="reload"
diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa
index 5e241c979f0..84da253b340 100644
--- a/x11/gdm/patches/patch-aa
+++ b/x11/gdm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
+$NetBSD: patch-aa,v 1.14 2005/06/26 16:52:14 jmmv Exp $
---- configure.orig 2005-03-07 22:04:33.000000000 +0100
+--- configure.orig 2005-06-10 20:53:51.000000000 +0200
+++ configure
-@@ -21643,7 +21643,8 @@ _ACEOF
+@@ -22412,7 +22412,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
int
main ()
{
-@@ -22113,13 +22114,13 @@ echo "${ECHO_T}yes" >&6
+@@ -22876,13 +22877,13 @@ echo "${ECHO_T}yes" >&6
echo "$as_me:$LINENO: checking DAEMON_CFLAGS" >&5
echo $ECHO_N "checking DAEMON_CFLAGS... $ECHO_C" >&6
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
echo "$as_me:$LINENO: result: $DAEMON_LIBS" >&5
echo "${ECHO_T}$DAEMON_LIBS" >&6
else
-@@ -29017,6 +29018,11 @@ else
+@@ -30269,6 +30270,11 @@ else
X_CONFIG_OPTIONS="-audit 0"
fi
@@ -40,12 +40,3 @@ $NetBSD: patch-aa,v 1.13 2005/03/22 16:25:42 jmmv Exp $
# Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
if test "x$EXPANDED_BINDIR" != "x/bin" -a "x$EXPANDED_BINDIR" != "x/usr/bin"; then
GDM_USER_PATH="$GDM_USER_PATH:$EXPANDED_BINDIR"
-@@ -29117,6 +29123,8 @@ prefix=$old_prefix
- exec_prefix=$old_exec_prefix
-
- ac_config_files="$ac_config_files Makefile daemon/Makefile gui/Makefile gui/greeter/Makefile gui/greeter/themes/Makefile gui/greeter/themes/circles/Makefile gui/greeter/themes/happygnome/Makefile gui/greeter/themes/happygnome-list/Makefile gui/modules/Makefile gui/modules/AccessKeyMouseEvents gui/modules/AccessDwellMouseEvents utils/Makefile pixmaps/Makefile pixmaps/16x16/Makefile pixmaps/32x32/Makefile pixmaps/48x48/Makefile config/Makefile po/Makefile.in vicious-extensions/Makefile docs/Makefile docs/C/Makefile docs/de/Makefile docs/es/Makefile docs/fr/Makefile docs/it/Makefile docs/sv/Makefile docs/ja/Makefile docs/ko/Makefile docs/zh_CN/Makefile docs/zh_HK/Makefile docs/zh_TW/Makefile config/gdm.conf config/Xsession config/Default config/PreSession config/PostSession daemon/gdm gdm-stop gdm-restart gdm-safe-restart gdmsetup-security gdm.spec"
-+# This is to avoid GNU make; may not be needed on a later version..
-+ac_config_files="$ac_config_files config/default.desktop config/gnome.desktop config/CDE.desktop"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
new file mode 100644
index 00000000000..596171cf90f
--- /dev/null
+++ b/x11/gdm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2005/06/26 16:52:14 jmmv Exp $
+
+--- docs/C/gdm.xml.orig 2005-05-17 18:55:38.000000000 +0200
++++ docs/C/gdm.xml
+@@ -4316,7 +4316,7 @@ remote-flexi - In remote (XDMCP) &amp;
+ </sect2>
+ </sect1>
+
+- <sect1 id="sbindir_binaries">
++ <sect1 id="libexecdir_binaries">
+ <title>GDM Commands in EXPANDED_LIBEXECDIR</title>
+
+ <para>
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 68e32d3d8d7..5be6e0195a8 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
+$NetBSD: patch-ae,v 1.8 2005/06/26 16:52:14 jmmv Exp $
---- config/Makefile.in.orig 2005-02-02 18:35:44.000000000 +0100
+--- config/Makefile.in.orig 2005-06-10 20:54:02.000000000 +0200
+++ config/Makefile.in
-@@ -240,7 +240,7 @@ prefix = @prefix@
+@@ -254,7 +254,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -11,21 +11,7 @@ $NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
target_alias = @target_alias@
pixmapdir = $(datadir)/pixmaps
confdir = $(sysconfdir)/gdm
-@@ -478,11 +478,11 @@ uninstall-hook:
- install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
- if test '!' -d $(DESTDIR)$(confdir); then \
- $(mkinstalldirs) $(DESTDIR)$(confdir); \
-- chmod 755 $(DESTDIR)$(confdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(confdir); \
- fi
- if test '!' -d $(DESTDIR)$(crossconfdir); then \
- $(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
-- chmod 755 $(DESTDIR)$(crossconfdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(crossconfdir); \
- fi
- -if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
- cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \
-@@ -496,19 +496,16 @@ install-data-hook: gdm.conf Xsession gno
+@@ -510,10 +510,7 @@ install-data-hook: gdm.conf Xsession gno
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
@@ -37,58 +23,10 @@ $NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
if test '!' -d $(DESTDIR)$(bisessdir); then \
$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-- chmod 755 $(DESTDIR)$(bisessdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(bisessdir); \
- fi
-
- if test '!' -d $(DESTDIR)$(instsessdir); then \
- $(mkinstalldirs) $(DESTDIR)$(instsessdir); \
-- chmod 755 $(DESTDIR)$(instsessdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(instsessdir); \
- fi
-
- -if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \
-@@ -539,7 +536,7 @@ install-data-hook: gdm.conf Xsession gno
-
- if test '!' -d $(DESTDIR)$(initdir); then \
- $(mkinstalldirs) $(DESTDIR)$(initdir); \
-- chmod 755 $(DESTDIR)$(initdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(initdir); \
+@@ -589,18 +586,6 @@ install-data-hook: gdm.conf Xsession gno
+ chmod 755 $(DESTDIR)$(gnomercdir); \
fi
- -if test -f $(DESTDIR)$(initdir)/Default; then \
- cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
-@@ -548,13 +545,13 @@ install-data-hook: gdm.conf Xsession gno
- if test '!' -d $(DESTDIR)$(postlogindir); then \
- $(mkinstalldirs) $(DESTDIR)$(postlogindir); \
-- chmod 755 $(DESTDIR)$(postlogindir); \
-+ ${CHMOD} 755 $(DESTDIR)$(postlogindir); \
- fi
- $(INSTALL_SCRIPT) $(srcdir)/PostLogin $(DESTDIR)$(postlogindir)/Default.sample
-
- if test '!' -d $(DESTDIR)$(predir); then \
- $(mkinstalldirs) $(DESTDIR)$(predir); \
-- chmod 755 $(DESTDIR)$(predir); \
-+ ${CHMOD} 755 $(DESTDIR)$(predir); \
- fi
- -if test -f $(DESTDIR)$(predir)/Default; then \
- cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
-@@ -563,7 +560,7 @@ install-data-hook: gdm.conf Xsession gno
-
- if test '!' -d $(DESTDIR)$(postdir); then \
- $(mkinstalldirs) $(DESTDIR)$(postdir); \
-- chmod 755 $(DESTDIR)$(postdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(postdir); \
- fi
- -if test -f $(DESTDIR)$(postdir)/Default; then \
- cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
-@@ -572,26 +569,14 @@ install-data-hook: gdm.conf Xsession gno
-
- if test '!' -d $(DESTDIR)$(gnomercdir); then \
- $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \
-- chmod 755 $(DESTDIR)$(gnomercdir); \
-- fi
--
- if test '!' -d $(DESTDIR)$(logdir); then \
- $(mkinstalldirs) $(DESTDIR)$(logdir); \
- chown root:root $(DESTDIR)$(logdir); \
@@ -99,15 +37,8 @@ $NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
- $(mkinstalldirs) $(DESTDIR)$(authdir); \
- chown root:gdm $(DESTDIR)$(authdir); \
- chmod 1770 $(DESTDIR)$(authdir); \
-+ ${CHMOD} 755 $(DESTDIR)$(gnomercdir); \
- fi
-
+- fi
+-
system=`uname`; \
if test -f /usr/include/security/pam_appl.h; then \
if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
- $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-- chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
-+ ${CHMOD} 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
- fi; \
- if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; then \
- $(INSTALL_DATA) gdm $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm; \
diff --git a/x11/gdm/patches/patch-ah b/x11/gdm/patches/patch-ah
new file mode 100644
index 00000000000..309e6c7453b
--- /dev/null
+++ b/x11/gdm/patches/patch-ah
@@ -0,0 +1,34 @@
+$NetBSD: patch-ah,v 1.3 2005/06/26 16:52:14 jmmv Exp $
+
+--- daemon/slave.c.orig 2005-05-06 17:05:17.000000000 +0200
++++ daemon/slave.c
+@@ -4051,6 +4051,14 @@ gdm_slave_session_start (void)
+
+ g_free (msg);
+
++ 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;
++ }
++
+ home_dir_ok = FALSE;
+ home_dir = "/";
+ } else {
+@@ -4058,14 +4066,6 @@ gdm_slave_session_start (void)
+ 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,
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 04:56:07 +0000