From 42be20122e70d45b8b36fc1f764e261e59410dce Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Sun, 22 Apr 2001 00:20:31 +0000 Subject: Update to 2.2.0 - Now it needs to make gdm user and gdm group. --- x11/gdm2/Makefile | 4 +-- x11/gdm2/distinfo | 2 +- x11/gdm2/files/patch-aa | 24 ------------------ x11/gdm2/files/patch-ab | 67 +++++++++++++++++++++---------------------------- x11/gdm2/files/patch-ac | 12 ++------- x11/gdm2/files/patch-ad | 22 ---------------- x11/gdm2/files/patch-ae | 13 ---------- x11/gdm2/files/patch-af | 48 ----------------------------------- x11/gdm2/files/patch-ak | 21 ---------------- x11/gdm2/files/patch-al | 8 +++--- x11/gdm2/files/patch-ao | 21 ++++++++++++++++ x11/gdm2/files/patch-ap | 14 +++++++++++ x11/gdm2/pkg-message | 1 + x11/gdm2/pkg-plist | 27 +++++++++++++++++++- 14 files changed, 98 insertions(+), 186 deletions(-) delete mode 100644 x11/gdm2/files/patch-aa delete mode 100644 x11/gdm2/files/patch-ad delete mode 100644 x11/gdm2/files/patch-ae delete mode 100644 x11/gdm2/files/patch-af delete mode 100644 x11/gdm2/files/patch-ak create mode 100644 x11/gdm2/files/patch-ao create mode 100644 x11/gdm2/files/patch-ap (limited to 'x11/gdm2') diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 42a4d93e02e5..284e58fd251f 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,12 +6,10 @@ # PORTNAME= gdm -PORTVERSION= 2.0b4 -PORTREVISION= 2 +PORTVERSION= 2.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gdm -DISTNAME= ${PORTNAME}-2.0beta4 MAINTAINER= nakai@FreeBSD.org diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 8c70336ba6d5..e2b5b7c497c7 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gdm-2.0beta4.tar.gz) = 651fd0762fb1a2e70ab2d0379a7d3374 +MD5 (gdm-2.2.0.tar.gz) = d28f7ec1f94e7d3e661918d43079e807 diff --git a/x11/gdm2/files/patch-aa b/x11/gdm2/files/patch-aa deleted file mode 100644 index 52f448b51b0f..000000000000 --- a/x11/gdm2/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $ - ---- config/Makefile.in.orig Thu Sep 30 01:15:45 1999 -+++ config/Makefile.in Tue Nov 9 23:30:28 1999 -@@ -243,6 +243,10 @@ - -e 's,\@sysconfdir\@,$(sysconfdir),g' \ - -e 's,\@localedir\@,$(localedir),g' \ - -e 's,\@authdir\@,$(authdir),g' \ -+ -e 's,\@GDMOWN\@,$(GDMOWN),g' \ -+ -e 's,\@GDMGRP\@,$(GDMGRP),g' \ -+ -e 's,\@X11BASE\@,$(X11BASE),g' \ -+ -e 's,\@LOCALBASE\@,$(LOCALBASE),g' \ - < $(srcdir)/gdm.conf.in > gdm.conf.tmp; \ - mv -f gdm.conf.tmp gdm.conf - -@@ -300,7 +304,7 @@ - fi - if test '!' -d $(authdir); then \ - $(mkinstalldirs) $(authdir); \ -- chown gdm.gdm $(authdir); \ -+ chown $(GDMOWN):$(GDMGRP) $(authdir); \ - chmod 750 $(authdir); \ - fi - diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab index 8adacc171117..cfb9fb8551e8 100644 --- a/x11/gdm2/files/patch-ab +++ b/x11/gdm2/files/patch-ab @@ -1,47 +1,36 @@ ---- config/gdm.conf.in.orig Tue Sep 7 13:37:16 1999 -+++ config/gdm.conf.in Wed Sep 13 01:26:33 2000 -@@ -1,20 +1,20 @@ - [daemon] - Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog --DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@ -+DefaultPath=/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin - DisplayInitDir=@sysconfdir@/gdm/Init - Greeter=@bindir@/gdmlogin --disable-sound --disable-crash-dialog --Group=gdm -+Group=wheel +--- 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 @@ + Group=gdm HaltCommand=/sbin/shutdown -h now - KillInitClients=1 --LogDir=@authdir@ + KillInitClients=true +-LogDir=@EXPANDED_AUTHDIR@ +LogDir=/var/log PidFile=/var/run/gdm.pid - PostSessionScriptDir=@sysconfdir@/gdm/PostSession/ - PreSessionScriptDir=@sysconfdir@/gdm/PreSession/ - RebootCommand=/sbin/shutdown -r now --RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@ -+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:@X11BASE@/bin:@LOCALBASE@/bin - ServAuthDir=@authdir@ - SessionDir=@sysconfdir@/gdm/Sessions/ --User=gdm -+User=root - UserAuthDir= - UserAuthFBDir=/tmp - UserAuthFile=.Xauthority -@@ -50,7 +50,7 @@ - GlobalFaceDir=@datadir@/faces/ - Icon=@pixmapdir@/gdm.xpm - LocaleFile=@localedir@/locale.alias --Logo=@pixmapdir@/gnome-logo-large.png -+Logo=@pixmapdir@/Daemon.png - Quiver=1 - SystemMenu=0 + PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ + PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ +@@ -47,11 +47,11 @@ + DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png + DefaultLocale=english + 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-*-*-*-*-*-*,*-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 -@@ -64,7 +64,7 @@ - Enable=0 +@@ -75,8 +75,8 @@ + Enable=false [servers] -0=/usr/bin/X11/X -#1=/usr/bin/X11/X -+0=@X11BASE@/bin/X -+#1=@X11BASE@/bin/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 diff --git a/x11/gdm2/files/patch-ac b/x11/gdm2/files/patch-ac index 99387e481e31..019a7fde66f2 100644 --- a/x11/gdm2/files/patch-ac +++ b/x11/gdm2/files/patch-ac @@ -1,16 +1,8 @@ ---- config/Gnome.in.orig Mon Apr 19 07:08:08 1999 -+++ config/Gnome.in Wed Sep 13 01:47:51 2000 +--- config/Gnome.in.orig Fri Apr 20 18:34:37 2001 ++++ config/Gnome.in Fri Apr 20 18:34:53 2001 @@ -1,4 +1,4 @@ -#!/bin/bash -login +#!/bin/sh for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER" do -@@ -13,6 +13,6 @@ - if [ -x "$HOME/.gnomerc" ]; then - exec "$HOME/.gnomerc" - else -- exec "@sysconfdir@/gnomerc" -+ exec "@sysconfdir@/gdm/gnomerc" - fi - diff --git a/x11/gdm2/files/patch-ad b/x11/gdm2/files/patch-ad deleted file mode 100644 index 03274f60f5e0..000000000000 --- a/x11/gdm2/files/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $ - ---- gui/gdmlogin.c.orig Thu Sep 30 00:56:35 1999 -+++ gui/gdmlogin.c Wed Nov 10 01:30:54 1999 -@@ -1007,7 +1007,7 @@ - gint cols, rows; - struct stat statbuf; - -- if(GdmGtkRC) -+ if(*GdmGtkRC) - gtk_rc_parse (GdmGtkRC); - - rootwin = gdk_window_foreign_new (GDK_ROOT_WINDOW ()); -@@ -1083,7 +1083,7 @@ - gtk_widget_show (GTK_WIDGET (item)); - } - -- if (GdmIcon) { -+ if (*GdmIcon) { - if (access (GdmIcon, R_OK)) { - syslog (LOG_WARNING, _("Can't open icon file: %s. Suspending iconify feature!"), GdmIcon); - } diff --git a/x11/gdm2/files/patch-ae b/x11/gdm2/files/patch-ae deleted file mode 100644 index 4a2ce86886be..000000000000 --- a/x11/gdm2/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $ - ---- po/Makefile.in.in.orig Thu Sep 30 01:14:23 1999 -+++ po/Makefile.in.in Tue Nov 9 23:30:28 1999 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/x11/gdm2/files/patch-af b/x11/gdm2/files/patch-af deleted file mode 100644 index 5f1ca5623479..000000000000 --- a/x11/gdm2/files/patch-af +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-af,v 1.4 1999/11/11 11:57:20 tron Exp $ - ---- daemon/slave.c.orig Thu Sep 30 00:56:35 1999 -+++ daemon/slave.c Thu Nov 11 12:30:39 1999 -@@ -300,8 +300,8 @@ - setegid (GdmGroupId); - seteuid (0); - -- session = gdm_slave_greeter_ctl (GDM_SESS, usrsess); -- language = gdm_slave_greeter_ctl (GDM_LANG, usrlang); -+ session = gdm_slave_greeter_ctl (GDM_SESS, usrsess ? usrsess : ""); -+ language = gdm_slave_greeter_ctl (GDM_LANG, usrlang ? usrlang : ""); - - if (strlen (gdm_slave_greeter_ctl (GDM_SSESS, ""))) - savesess = TRUE; -@@ -331,11 +331,11 @@ - setenv ("DISPLAY", d->name, TRUE); - setenv ("LOGNAME", login, TRUE); - setenv ("USER", login, TRUE); -- setenv ("USERNAME", login, TRUE); - setenv ("HOME", pwent->pw_dir, TRUE); - setenv ("GDMSESSION", session, TRUE); - setenv ("SHELL", pwent->pw_shell, TRUE); -- putenv ("MAIL"); -+ unsetenv ("GROUP"); -+ unsetenv ("MAIL"); - - /* Special PATH for root */ - if(pwent->pw_uid == 0) -@@ -385,6 +385,9 @@ - if (setgid (pwent->pw_gid) < 0) - gdm_remanage (_("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid); - -+ if (setlogin (login) < 0) -+ gdm_remanage (_("gdm_slave_session_start: Could not set login name %s. Aborting."), login); -+ - if (initgroups (login, pwent->pw_gid) < 0) - gdm_remanage (_("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login); - -@@ -423,7 +426,7 @@ - /* Restore sigmask inherited from init */ - sigprocmask (SIG_SETMASK, &sysmask, NULL); - -- execl (sesspath, NULL); -+ execl (sesspath, sesspath, NULL); - - gdm_error (_("gdm_slave_session_start: Could not start session `%s'"), sesspath); - diff --git a/x11/gdm2/files/patch-ak b/x11/gdm2/files/patch-ak deleted file mode 100644 index 7112d743b98f..000000000000 --- a/x11/gdm2/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- daemon/gdm.c.orig Wed Sep 13 01:04:25 2000 -+++ daemon/gdm.c Wed Sep 13 01:05:17 2000 -@@ -271,18 +271,12 @@ - else - GdmUserId = pwent->pw_uid; - -- if (GdmUserId==0) -- gdm_fail (_("gdm_config_parse: The gdm user should not be root. Aborting!")); -- - grent = getgrnam (GdmGroup); - - if (!grent) - gdm_fail (_("gdm_config_parse: Can't find the gdm group (%s). Aborting!"), GdmGroup); - else - GdmGroupId = grent->gr_gid; -- -- if (GdmGroupId==0) -- gdm_fail (_("gdm_config_parse: The gdm group should not be root. Aborting!")); - - setegid (GdmGroupId); /* gid remains `gdm' */ - seteuid (GdmUserId); diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al index 6e29fc365ec6..1a731f39fddf 100644 --- a/x11/gdm2/files/patch-al +++ b/x11/gdm2/files/patch-al @@ -1,8 +1,8 @@ ---- config/gnomerc.in.orig Sat Sep 16 10:20:11 2000 -+++ config/gnomerc.in Sat Sep 16 10:20:25 2000 +--- config/gnomerc.in.orig Thu Feb 15 19:41:46 2001 ++++ config/gnomerc.in Fri Apr 20 18:48:24 2001 @@ -1 +1,4 @@ --@bindir@/gnome-session +-@EXPANDED_BINDIR@/gnome-session +#!/bin/csh + +unsetenv LC_CTYPE -+exec @bindir@/gnome-session ++exec @EXPANDED_BINDIR@/gnome-session diff --git a/x11/gdm2/files/patch-ao b/x11/gdm2/files/patch-ao new file mode 100644 index 000000000000..4b0854226adb --- /dev/null +++ b/x11/gdm2/files/patch-ao @@ -0,0 +1,21 @@ +--- config/Makefile.in.orig Fri Apr 20 20:32:57 2001 ++++ config/Makefile.in Fri Apr 20 20:33:15 2001 +@@ -139,7 +139,7 @@ + + noinst_DATA = gdm.conf + +-EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Xsession Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat ++EXTRA_DIST = gdm.conf.in Gnome.in gnomerc.in Failsafe.in gdm locale.alias Default PostSession PreSession Default.redhat Failsafe.redhat + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -270,9 +270,6 @@ + if test '!' -d $(sessdir); then \ + $(mkinstalldirs) $(sessdir); \ + chmod 755 $(sessdir); \ +- fi +- if test '!' -f $(sessdir)/Xsession; then \ +- $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ + fi + if test '!' -f $(sessdir)/Gnome; then \ + $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \ diff --git a/x11/gdm2/files/patch-ap b/x11/gdm2/files/patch-ap new file mode 100644 index 000000000000..e0d2990df5c8 --- /dev/null +++ b/x11/gdm2/files/patch-ap @@ -0,0 +1,14 @@ +--- config/locale.alias.orig Fri Apr 20 20:46:35 2001 ++++ config/locale.alias Fri Apr 20 20:47:30 2001 +@@ -43,9 +43,8 @@ + hungarian hu_HU.ISO-8859-2 + icelandic is_IS.ISO-8859-1 + italian it_IT.ISO-8859-1 +-japanese ja_JP.SJIS +-japanese.euc ja_JP.eucJP +-korean ko_KR.eucKR ++japanese ja_JP.EUC ++korean ko_KR.EUC + lithuanian lt_LT.ISO-8859-13 + norwegian no_NO.ISO-8859-1 + polish pl_PL.ISO-8859-2 diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message index 2c30bd5a239f..9e2cea3c0699 100644 --- a/x11/gdm2/pkg-message +++ b/x11/gdm2/pkg-message @@ -1,6 +1,7 @@ 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. diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index a7dc23a587df..26d156127e15 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -1,14 +1,18 @@ bin/gdm bin/gdmchooser +bin/gdmconfig bin/gdmlogin etc/gdm/Init/Default etc/gdm/PostSession/Default etc/gdm/PreSession/Default +etc/gdm/Sessions/Failsafe etc/gdm/Sessions/Gnome -etc/gdm/Sessions/Xsession etc/gdm/gdm.conf etc/gdm/gnomerc etc/gdm/locale.alias +share/gnome/apps/System/gdmconfig.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 @@ -23,16 +27,37 @@ share/gnome/help/gdm/C/x69.html share/gnome/pixmaps/gdm.xpm share/gnome/pixmaps/nobody.png share/gnome/pixmaps/nohost.png +share/locale/az/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/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/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_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/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 -- cgit v1.2.3