pool/gdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-01-12 15:12:54 +00:00 committed by Git OBS Bridge
parent 4a357dfffb
commit 39e685d0ab
6 changed files with 89 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SuSEconfig.gdm
View File

@ -13,8 +13,8 @@ type -p cmp &> /dev/null || {
}
# Read old values. We will need one for correct updating of
if test -f $r/etc/opt/gnome/gdm/gdm_sysconfig.conf ; then
. $r/etc/opt/gnome/gdm/gdm_sysconfig.conf
if test -f $r/etc/gdm/gdm_sysconfig.conf ; then
. $r/etc/gdm/gdm_sysconfig.conf
fi
export OLD_DISPLAYMANAGER_AUTOLOGIN="$DISPLAYMANAGER_AUTOLOGIN"
@ -57,11 +57,11 @@ if test -z "$r" ; then
fi
# Write new set of monitore variables.
echo -en "# custom.conf was last time updated with following sysconfig:\\nDISPLAYMANAGER_REMOTE_ACCESS=\"$DISPLAYMANAGER_REMOTE_ACCESS\"\\nDISPLAYMANAGER_ROOT_LOGIN_REMOTE=\"$DISPLAYMANAGER_ROOT_LOGIN_REMOTE\"\\nDISPLAYMANAGER_STARTS_XSERVER=\"$DISPLAYMANAGER_STARTS_XSERVER\"\\nDISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN=\"$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN\"\\nDISPLAYMANAGER_AUTOLOGIN=\"$DISPLAYMANAGER_AUTOLOGIN\"\\nDISPLAYMANAGER_PASSWORD_LESS_LOGIN=\"$DISPLAYMANAGER_PASSWORD_LESS_LOGIN\"\\nDISPLAYMANAGER_AD_INTEGRATION=\"$DISPLAYMANAGER_AD_INTEGRATION\"\\nDISPLAYMANAGER_SHUTDOWN=\"$DISPLAYMANAGER_SHUTDOWN\"\\nPERMISSION_SECURITY=\"$PERMISSION_SECURITY\"\\n" >$r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new
echo -en "# custom.conf was last time updated with following sysconfig:\\nDISPLAYMANAGER_REMOTE_ACCESS=\"$DISPLAYMANAGER_REMOTE_ACCESS\"\\nDISPLAYMANAGER_ROOT_LOGIN_REMOTE=\"$DISPLAYMANAGER_ROOT_LOGIN_REMOTE\"\\nDISPLAYMANAGER_STARTS_XSERVER=\"$DISPLAYMANAGER_STARTS_XSERVER\"\\nDISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN=\"$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN\"\\nDISPLAYMANAGER_AUTOLOGIN=\"$DISPLAYMANAGER_AUTOLOGIN\"\\nDISPLAYMANAGER_PASSWORD_LESS_LOGIN=\"$DISPLAYMANAGER_PASSWORD_LESS_LOGIN\"\\nDISPLAYMANAGER_AD_INTEGRATION=\"$DISPLAYMANAGER_AD_INTEGRATION\"\\nDISPLAYMANAGER_SHUTDOWN=\"$DISPLAYMANAGER_SHUTDOWN\"\\nPERMISSION_SECURITY=\"$PERMISSION_SECURITY\"\\n" >$r/etc/gdm/gdm_sysconfig.conf.new
# Are there any changes in monitored variables?
if cmp -s 2>/dev/null $r/etc/opt/gnome/gdm/gdm_sysconfig.conf $r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new ; then
rm $r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new
if cmp -s 2>/dev/null $r/etc/gdm/gdm_sysconfig.conf $r/etc/gdm/gdm_sysconfig.conf.new ; then
rm $r/etc/gdm/gdm_sysconfig.conf.new
exit
fi
@ -152,7 +152,7 @@ unset unset ${!last_of_*} ${!custom_conf_*}
# Parse configuration file and record all items to environment values.
eval "$(
awk <$r/etc/opt/gnome/gdm/custom.conf '
awk <$r/etc/gdm/custom.conf '
BEGIN {
section="BEGIN";
section_last_line=0;
@ -207,7 +207,7 @@ END {
)"
# And now set what is required.
awk <$r/etc/opt/gnome/gdm/custom.conf >$r/etc/opt/gnome/gdm/custom.conf.new '
awk <$r/etc/gdm/custom.conf >$r/etc/gdm/custom.conf.new '
# Prepare array from variable.
function gdm_prepare_var(var) {
gdm_conf_var[var]=ENVIRON[var];
@ -220,7 +220,7 @@ function update_item(section, item) {
print item"="gdm_conf_var[section"_"item];
if (ENVIRON["GDM_IS_RUNNING"] == "true")
# FIXME: If gdm is running and no session is active, command is executed too early.
system("$r/opt/gnome/bin/gdmflexiserver --command=\"UPDATE_CONFIG "section"/"item"\"")
system("$r/usr/bin/gdmflexiserver --command=\"UPDATE_CONFIG "section"/"item"\"")
return "DONE";
} else
return "KEEP_ORIG";
@ -255,7 +255,7 @@ BEGIN {
/^enable=/ {
if (section == "xdmcp") {
# Remove old gdm_sysconfig.conf to force update of custom.conf.
system("rm -f $r/etc/opt/gnome/gdm/gdm_sysconfig.conf");
system("rm -f $r/etc/gdm/gdm_sysconfig.conf");
process_unseen();
next;
}
@ -302,5 +302,5 @@ BEGIN {
next;
}
'
mv $r/etc/opt/gnome/gdm/custom.conf.new $r/etc/opt/gnome/gdm/custom.conf
mv $r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new $r/etc/opt/gnome/gdm/gdm_sysconfig.conf
mv $r/etc/gdm/custom.conf.new $r/etc/gdm/custom.conf
mv $r/etc/gdm/gdm_sysconfig.conf.new $r/etc/gdm/gdm_sysconfig.conf

4
gdm-2.8.0.7-domain-entry.patch
View File

@ -32,12 +32,12 @@ diff -upr gdm-2.16.1-pre/config/gdm.conf.in.orig gdm-2.16.1-post/config/gdm.conf
# This value will be overridden with the value from /etc/default/login if it
# contains "ROOT=<pathvalue>".
#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
# Default path for root. The profile scripts will likely override this value.
# This value will be overridden with the value from /etc/default/login if it
# contains "SUROOT=<pathvalue>".
#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
# If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is

4
gdm-conf.patch
View File

@ -18,12 +18,12 @@
# This value will be overridden with the value from /etc/default/login if it
# contains "ROOT=<pathvalue>".
#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
# Default path for root. The profile scripts will likely override this value.
# This value will be overridden with the value from /etc/default/login if it
# contains "SUROOT=<pathvalue>".
#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin
# If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is

11
gdm.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jan 4 15:47:47 CET 2007 - sbrabec@suse.cz
- All references to /opt/gnome moved to /usr.
- Spec file cleanup.
-------------------------------------------------------------------
Thu Jan 4 15:47:09 CET 2007 - maw@suse.de
- Move to /usr.
-------------------------------------------------------------------
Thu Dec 28 17:42:47 CET 2006 - jhargadon@suse.de

137
gdm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gdm (Version 2.16.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -11,9 +11,9 @@
# norootforbuild
Name: gdm
BuildRequires: gnome-common gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity
%define prefix /opt/gnome
%define sysconfdir /etc%{prefix}
BuildRequires: docbook_4 gnome-common gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity
# only for directory ownership:
BuildRequires: gnome-icon-theme
PreReq: /usr/sbin/groupadd
PreReq: /usr/sbin/useradd
PreReq: /usr/sbin/usermod
@ -22,11 +22,12 @@ License: GNU General Public License (GPL)
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.16.1
Release: 44
Release: 49
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
Source2: gdm-autologin.pamd
# FIXME: See FIXME in the script.
Source3: SuSEconfig.gdm
Source4: init.earlygdm
Source5: sysconfig.displaymanager-gdm
@ -101,41 +102,31 @@ gnome-patch-translation-prepare
gnome-patch-translation-update
%build
libtoolize --force
aclocal -I .
automake --add-missing -c
autoreconf
export ac_aux_dir=$RPM_BUILD_DIR/gdm-%{version}
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
LDFLAGS=-L/usr/%_lib \
./configure \
--prefix=%prefix \
--libdir=%prefix/%_lib \
--sysconfdir=%sysconfdir \
--mandir=%prefix/share/man \
--localstatedir=/var/lib \
--enable-ipv6 \
--libexecdir=/opt/gnome/%_lib/gdm \
--enable-secureremote
make %{?jobs:-j %jobs}
autoreconf -f -i
# gdm-2.16.1: greeter_canvas_text.c:98: warning: dereferencing type-punned pointer will break strict-aliasing rules
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# FIXME: Build as root modifies system!
# gdm-2.16.1: --disable-scrollkeeper does not work properly.
%configure\
--libexecdir=%{_prefix}/lib/gdm\
--localstatedir=%{_localstatedir}/lib\
--enable-ipv6\
--disable-scrollkeeper\
--enable-secureremote
make %{?jobs:-j%jobs}
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make -i install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
make install DESTDIR=$RPM_BUILD_ROOT
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{prefix}/sbin/gdm-binary $RPM_BUILD_ROOT%{prefix}/sbin/gdm
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
# Install PAM files and remove examples.
mkdir -p $RPM_BUILD_ROOT/etc/pam.d
cp %{S:1} $RPM_BUILD_ROOT/etc/pam.d/gdm
cp %{S:2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
rm -f $RPM_BUILD_ROOT/etc/opt/gnome/pam.d/gdm
rm -f $RPM_BUILD_ROOT/etc/opt/gnome/pam.d/gdm-autologin
rmdir $RPM_BUILD_ROOT/etc/opt/gnome/pam.d
# Install earlygdm init script.
install -D -m 0744 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/earlygdm
# Install PostLogin script.
mv $RPM_BUILD_ROOT/etc/opt/gnome/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT/etc/opt/gnome/gdm/PostLogin/Default
mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default
# Install SuSEconfig script.
mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
cp %{S:3} $RPM_BUILD_ROOT/sbin/conf.d
@ -144,30 +135,24 @@ chmod +x $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.gdm
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates
%endif
touch $RPM_BUILD_ROOT/etc/opt/gnome/gdm/gdm_sysconfig.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/gdm/gdm_sysconfig.conf
# gnome.desktop should be in gnome-session, ssh.desktop doesn't work
rm $RPM_BUILD_ROOT%{prefix}/share/xsessions/ssh.desktop
rm $RPM_BUILD_ROOT%{prefix}/share/xsessions/gnome.desktop
mkdir -p $RPM_BUILD_ROOT/usr/share
mv $RPM_BUILD_ROOT%{prefix}/share/xsessions $RPM_BUILD_ROOT/usr/share/
rmdir $RPM_BUILD_ROOT/etc%{prefix}/dm
gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.?
for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/gdm/*/gdm.xml; do
rm $RPM_BUILD_ROOT%{_datadir}/xsessions/ssh.desktop
rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/dm
for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/gdm/*/gdm.xml; do
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
done
%suse_update_desktop_file gdmsetup SystemSetup
%suse_update_desktop_file -G "" gdmphotosetup SystemSetup
%suse_update_desktop_file -G "" gdmflexiserver RemoteAccess
%suse_update_desktop_file -G "" gdmflexiserver-xnest RemoteAccess
echo DocPath=gdm >> $RPM_BUILD_ROOT%{prefix}/share/applications/gdmsetup.desktop
echo DocPath=gdm >> $RPM_BUILD_ROOT%{prefix}/share/applications/gdmphotosetup.desktop
echo DocPath=gdm >> $RPM_BUILD_ROOT%{_datadir}/applications/gdmsetup.desktop
echo DocPath=gdm >> $RPM_BUILD_ROOT%{_datadir}/applications/gdmphotosetup.desktop
mkdir -p $RPM_BUILD_ROOT/var/log/gdm
%find_lang %{name}
ln -s ../sbin/gdm $RPM_BUILD_ROOT%{prefix}/bin/gdm
rm $RPM_BUILD_ROOT%{prefix}/%_lib/gtk-2.0/modules/libdwellmouselistener.a
rm $RPM_BUILD_ROOT%{prefix}/%_lib/gtk-2.0/modules/libdwellmouselistener.la
rm $RPM_BUILD_ROOT%{prefix}/%_lib/gtk-2.0/modules/libkeymouselistener.a
rm $RPM_BUILD_ROOT%{prefix}/%_lib/gtk-2.0/modules/libkeymouselistener.la
ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
@ -176,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
# Remove old logs (#56205).
rm -f var/lib/gdm/*.log*
# Remove old gdm_sysconfig.conf to update custom.conf from sysconfig settings.
rm -f etc/opt/gnome/gdm/gdm_sysconfig.conf
rm -f etc/gdm/gdm_sysconfig.conf
/usr/sbin/groupadd -r gdm 2> /dev/null || :
/usr/sbin/useradd -r -o -g gdm -s /bin/false \
-c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || :
@ -191,40 +176,37 @@ rm -f etc/opt/gnome/gdm/gdm_sysconfig.conf
%insserv_cleanup
%endif
%files -f %files -f %{name}.lang
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%dir %config /etc/opt/gnome/gdm
%dir %{prefix}/share/omf/gdm
/opt/gnome/share/locale/si
/opt/gnome/share/locale/si/LC_MESSAGES
%config /etc/%{prefix}/gdm/[IPXl]*
#%config(noreplace) /etc/%{prefix}/gdm/gdm.conf
%config(noreplace) /etc/%{prefix}/gdm/custom.conf
#/etc/%{prefix}/gdm/factory-gdm.conf
#/etc/%{prefix}/gdm/custom.conf
/etc/%{prefix}/gdm/Xsession
%ghost /etc/%{prefix}/gdm/gdm_sysconfig.conf
%dir %config /etc/%{prefix}/gdm/modules
%config /etc/%{prefix}/gdm/modules/A*
/etc/%{prefix}/gdm/modules/factory*
%dir %config %{_sysconfdir}/gdm
%dir %{_datadir}/omf/gdm
%config %{_sysconfdir}/gdm/[IPXl]*
#%config(noreplace) %{_sysconfdir}/gdm/gdm.conf
%config(noreplace) %{_sysconfdir}/gdm/custom.conf
#%{_sysconfdir}/gdm/factory-gdm.conf
#%{_sysconfdir}/gdm/custom.conf
%{_sysconfdir}/gdm/Xsession
%ghost %{_sysconfdir}/gdm/gdm_sysconfig.conf
%dir %config %{_sysconfdir}/gdm/modules
%config %{_sysconfdir}/gdm/modules/A*
%{_sysconfdir}/gdm/modules/factory*
%{_datadir}/omf/gdm/gdm-*.omf
%{_sbindir}/*
%{_bindir}/*
%{_datadir}/gdm
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/faces
%{_datadir}/icons/*/*/*/*.*
%{_libdir}/gtk-2.0/modules/*
%doc %{_mandir}/man1/*.*
%{_prefix}/lib/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm
/etc/init.d/earlygdm
%{prefix}/share/omf/gdm/gdm-*.omf
%{prefix}/sbin/*
%{prefix}/bin/*
%{prefix}/share/gdm
%{prefix}/share/applications/*.desktop
%{prefix}/share/pixmaps/*.png
%{prefix}/share/icons/*
%{prefix}/%_lib/gtk-2.0/modules/*
%dir %{prefix}/%_lib/gdm
%{prefix}/%_lib/gdm/*
%doc %{prefix}/share/man/man1/*.*
%attr(750,gdm,gdm) %dir /var/lib/gdm
%attr(750,gdm,gdm) %dir /var/log/gdm
%config /etc/pam.d/*
/sbin/conf.d/SuSEconfig.gdm
%{prefix}/share/pixmaps/faces
%if %suse_version <1010
/var/adm/fillup-templates/*
%endif
@ -232,6 +214,11 @@ rm -f etc/opt/gnome/gdm/gdm_sysconfig.conf
%dir /usr/share/xsessions
%changelog -n gdm
* Thu Jan 04 2007 - sbrabec@suse.cz
- All references to /opt/gnome moved to /usr.
- Spec file cleanup.
* Thu Jan 04 2007 - maw@suse.de
- Move to /usr.
* Thu Dec 28 2006 - jhargadon@suse.de
- added klogd to Requires (#214295)
* Tue Dec 12 2006 - sbrabec@suse.cz

2
init.earlygdm
View File

@ -101,7 +101,7 @@ check()
}
# default
if test -z "$DISPLAYMANAGER" && test -x /opt/gnome/bin/gdm; then
if test -z "$DISPLAYMANAGER" && test -x /usr/bin/gdm; then
DISPLAYMANAGER=gdm
fi