Date: Mon, 1 Oct 2001 14:02:05 +0200 (CEST) From: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org Subject: ports/30955: [UPDATE]: x11/gdm Message-ID: <200110011202.f91C25j39580@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 30955
>Category: ports
>Synopsis: [UPDATE]: x11/gdm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 01 05:10:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD 4.4-STABLE #0: Tue Sep 25 04:55:50 CEST 2001
>Description:
- Update x11/gdm to 2.2.4.1
- I couldn't test the functionality using XFree86-4.1.0; it hangs gdm, just
as the previous version of this port did. I do submit this update in the
hope that someone else is able to test it with previous versions of XFree86,
or find a workaround for XFree86 4.1.0.
- Add code taken from mail/mailman to install user 'gdm' & group 'gdm',
instead of requiring people to add it by hand. I've taken UID 91 because
a simple grep -r of /usr/ports didn't reveal it being taken before, but
feel free to change this.
- Besides updating pkg-plist, this diff sorts it as well
- CC: maintainer
>How-To-Repeat:
N/A
>Fix:
diff -urN /usr/ports/x11/gdm/Makefile gdm/Makefile
--- /usr/ports/x11/gdm/Makefile Fri Aug 17 05:39:45 2001
+++ gdm/Makefile Mon Oct 1 13:12:54 2001
@@ -6,7 +6,7 @@
#
PORTNAME= gdm
-PORTVERSION= 2.2.3.2
+PORTVERSION= 2.2.4.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gdm
@@ -20,6 +20,10 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+USERNAME?= gdm
+USERID?= 91
+GDMDIR?= ${PREFIX}/etc/gdm
+
pre-fetch:
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -31,6 +35,10 @@
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+
+pre-configure:
+ # Add the username, uid, group and gid
+ ${SH} ${FILESDIR}/configure.sh ${USERNAME} ${USERID} ${GDMDIR}
post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm/
diff -urN /usr/ports/x11/gdm/distinfo gdm/distinfo
--- /usr/ports/x11/gdm/distinfo Fri Aug 17 05:39:45 2001
+++ gdm/distinfo Mon Oct 1 12:28:06 2001
@@ -1 +1 @@
-MD5 (gdm-2.2.3.2.tar.gz) = 5e05b0b4722061311121f63e02907b50
+MD5 (gdm-2.2.4.1.tar.gz) = b1ea0aca76480f14ae9eb3175da2a65a
diff -urN /usr/ports/x11/gdm/files/configure.sh gdm/files/configure.sh
--- /usr/ports/x11/gdm/files/configure.sh Thu Jan 1 01:00:00 1970
+++ gdm/files/configure.sh Mon Oct 1 13:13:18 2001
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Taken from ports/mail/mailman
+
+USER=$1
+UID=$2
+GDMDIR=$3
+GROUP=${USER}
+GID=${UID}
+
+if [ -z "$USER" -o -z "$UID" -o -z "$GDMDIR" ]; then
+ echo "Syntax: $0 <username> <uid> <homedir>"
+ exit 1
+fi
+
+if pw group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+else
+ if pw groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+fi
+
+if pw user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+else
+ if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d ${MAILMANDIR} -s /sbin/nologin -c "GDM User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+fi
diff -urN /usr/ports/x11/gdm/files/patch-ab gdm/files/patch-ab
--- /usr/ports/x11/gdm/files/patch-ab Mon Apr 23 05:37:33 2001
+++ gdm/files/patch-ab Mon Oct 1 12:31:45 2001
@@ -1,6 +1,6 @@
---- config/gdm.conf.in.orig Mon Mar 5 05:27:12 2001
-+++ config/gdm.conf.in Fri Apr 20 20:42:22 2001
-@@ -7,7 +7,7 @@
+--- config/gdm.conf.in.orig Sat Sep 1 12:03:45 2001
++++ config/gdm.conf.in Mon Oct 1 12:31:22 2001
+@@ -11,7 +11,7 @@
Group=gdm
HaltCommand=/sbin/shutdown -h now
KillInitClients=true
@@ -9,11 +9,11 @@
PidFile=/var/run/gdm.pid
PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -47,11 +47,11 @@
+@@ -68,11 +68,11 @@
DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
- DefaultLocale=english
+ DefaultLocale=en_US
Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm
--Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*
+-Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
GlobalFaceDir=@EXPANDED_DATADIR@/faces/
Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
@@ -23,14 +23,10 @@
Quiver=true
SystemMenu=true
Welcome=Welcome to %n
-@@ -75,8 +75,8 @@
- Enable=false
+@@ -117,5 +117,5 @@
- [servers]
--0=/usr/bin/X11/X
--#1=/usr/bin/X11/X
-+0=@EXPANDED_BINDIR@/X
-+#1=@EXPANDED_BINDIR@/X
- #Note: If you want to make sure X runs on a specific virtual console on linux,
- # you can use the following (for console 7):
- #0=/usr/bin/X11/X vt7
+ [server-Standard]
+ name=Standard server
+-command=/usr/bin/X11/X
++command=/usr/X11R6/bin/X
+ flexible=true
diff -urN /usr/ports/x11/gdm/files/patch-ar gdm/files/patch-ar
--- /usr/ports/x11/gdm/files/patch-ar Thu Jan 1 01:00:00 1970
+++ gdm/files/patch-ar Mon Oct 1 12:38:28 2001
@@ -0,0 +1,15 @@
+--- daemon/gdm-net.c.orig Mon Oct 1 12:37:53 2001
++++ daemon/gdm-net.c Mon Oct 1 12:37:34 2001
+@@ -156,7 +156,12 @@
+ if ( ! conn->writable)
+ return FALSE;
+
++#ifndef __FreeBSD__
+ if (send (conn->fd, str, strlen (str), MSG_NOSIGNAL) < 0)
++#else
++ /* According to send(2), FreeBSD doesn't return SIGPIPE */
++ if (send (conn->fd, str, strlen (str), 0) < 0)
++#endif
+ return FALSE;
+ else
+ return TRUE;
diff -urN /usr/ports/x11/gdm/files/patch-as gdm/files/patch-as
--- /usr/ports/x11/gdm/files/patch-as Thu Jan 1 01:00:00 1970
+++ gdm/files/patch-as Mon Oct 1 12:40:23 2001
@@ -0,0 +1,14 @@
+--- gui/gdmflexiserver.c.orig Mon Oct 1 12:39:52 2001
++++ gui/gdmflexiserver.c Mon Oct 1 12:40:08 2001
+@@ -59,7 +59,11 @@
+ g_print ("Sending command: '%s'\n", command);
+
+ cstr = g_strdup_printf ("%s\n", command);
++#ifndef __FreeBSD__
+ if (send (fd, cstr, strlen (cstr), MSG_NOSIGNAL) < 0)
++#else
++ if (send (fd, cstr, strlen (cstr), 0) < 0)
++#endif
+ return NULL;
+
+ if ( ! get_response)
diff -urN /usr/ports/x11/gdm/files/patch-at gdm/files/patch-at
--- /usr/ports/x11/gdm/files/patch-at Thu Jan 1 01:00:00 1970
+++ gdm/files/patch-at Mon Oct 1 12:43:17 2001
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig Mon Oct 1 12:42:50 2001
++++ utils/Makefile.in Mon Oct 1 12:43:00 2001
+@@ -161,7 +161,7 @@
+ gdmopen_SOURCES = gdmopen.c
+
+
+-gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam -lpam_misc
++gdmaskpass_LDADD = $(GNOME_LIBDIR) $(INTLLIBS) -lpam
+
+
+ gdmopen_LDADD = $(GNOME_LIBDIR) $(INTLLIBS)
diff -urN /usr/ports/x11/gdm/pkg-descr gdm/pkg-descr
--- /usr/ports/x11/gdm/pkg-descr Sat Sep 16 14:12:28 2000
+++ gdm/pkg-descr Mon Oct 1 13:23:19 2001
@@ -1,14 +1,6 @@
-GNOME version of xdm display manager
+The GNOME version of the xdm display manager. It has support for
+face pixmaps, multiple sessions plus clean shutdowns from the login
+menu.
-- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because
- those pam is not stable.
- I'm sure this works on 5.0-current, and it may works on 4.x-RELEASE
-
- You should append those lines to your /etc/pam.conf
-
-# gdm config
-gdm auth requisite pam_unix.so try_first_pass
-gdm account requisite pam_unix.so try_first_pass
-gdm session required pam_permit.so
-
-This notes is written by: Yukihiro Nakai <nakai@FreeBSD.org>
+For now it only works with the 3.3.x series of XFree86 and a fairly
+recent FreeBSD (4.x-STABLE).
diff -urN /usr/ports/x11/gdm/pkg-message gdm/pkg-message
--- /usr/ports/x11/gdm/pkg-message Mon Apr 23 05:37:33 2001
+++ gdm/pkg-message Mon Oct 1 13:12:08 2001
@@ -1,11 +1,8 @@
GDM is installed.
Please note the following:
-- Add 'gdm' user and 'gdm' group by handle.
-- This port doesn't work on the normal FreeBSD 3.x-RELEASEs because
- PAM is not stable.
-- This port has been tested on 5.0-CURRENT and 4.1.1-STABLE.
- 4.x-RELEASE may or may not work.
+- This port has been tested on 5.0-CURRENT and 4.4-STABLE. It only works
+ with XFree86-3.3.x. It will not work on 3.x.
- You should append these lines to your /etc/pam.conf, otherwise
GDM will refuse all logins:
diff -urN /usr/ports/x11/gdm/pkg-plist gdm/pkg-plist
--- /usr/ports/x11/gdm/pkg-plist Fri Aug 17 05:39:45 2001
+++ gdm/pkg-plist Mon Oct 1 12:59:10 2001
@@ -1,63 +1,44 @@
bin/gdm
+bin/gdmXnestchooser
bin/gdmchooser
bin/gdmconfig
+bin/gdmflexiserver
bin/gdmlogin
bin/gdmphotosetup
-sbin/gdm-restart
-sbin/gdm-safe-restart
etc/gdm/Init/Default
etc/gdm/PostSession/Default
etc/gdm/PreSession/Default
-etc/gdm/Sessions/Xsession
etc/gdm/Sessions/Gnome
-etc/gdm/factory-gdm.conf
+etc/gdm/Sessions/Xsession
etc/gdm/XKeepsCrashing
+etc/gdm/factory-gdm.conf
etc/gdm/gdm.conf
etc/gdm/gnomerc
etc/gdm/locale.alias
-share/gnome/apps/System/gdmconfig.desktop
+sbin/gdm-restart
+sbin/gdm-safe-restart
+sbin/gdmaskpass
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
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/x155.html
+share/gnome/help/gdm/C/ln33.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/index.html
-share/gnome/help/gdmconfig/C/gdmconfig.sgml
-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/expert.html
-share/gnome/help/gdmconfig/C/license.html
-share/gnome/help/gdmconfig/C/ln7.html
-share/gnome/help/gdmconfig/C/system.html
-share/gnome/help/gdmconfig/C/usage.html
-share/gnome/help/gdmconfig/C/docbook.css
-share/gnome/help/gdmconfig/C/topic.dat
-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/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_expert_misc.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
@@ -69,6 +50,11 @@
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/ln7.html
+share/gnome/help/gdmconfig/C/topic.dat
+share/gnome/help/gdmconfig/C/usage.html
share/gnome/omf/gdm/gdmconfig-C.omf
share/gnome/pixmaps/gdm.xpm
share/gnome/pixmaps/nobody.png
@@ -104,19 +90,19 @@
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/uk/LC_MESSAGES/gdm.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gdm.mo
-@dirrm etc/gdm/Init
-@dirrm etc/gdm/PostSession
-@dirrm etc/gdm/PreSession
-@dirrm etc/gdm/Sessions
-@dirrm etc/gdm
-@dirrm etc/pam.d
+share/locale/zh_TW/LC_MESSAGES/gdm.mo
@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/gdm
-@dirrm share/gnome/help/gdm/C/images
-@dirrm share/gnome/help/gdm/C
-@dirrm share/gnome/help/gdm
@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
+@dirrm share/gnome/gdm
+@dirrm etc/pam.d
+@dirrm etc/gdm/Sessions
+@dirrm etc/gdm/PreSession
+@dirrm etc/gdm/PostSession
+@dirrm etc/gdm/Init
+@dirrm etc/gdm
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110011202.f91C25j39580>