This commit is contained in:
parent
fc0e307a7c
commit
bdafe956cd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ff4bef13b15a1c54895eabcc37f7046fa13ca3bc449c9541c38e6993930fffa
|
||||
size 2244663
|
3
gdm-2.23.2.tar.bz2
Normal file
3
gdm-2.23.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7db2ef12ce40bca25e03e0d87e7a7f1032e6af794767eadd411b526ec1ae8b3
|
||||
size 2138828
|
@ -1,20 +0,0 @@
|
||||
--- gdm-2.22.0-pre/gui/simple-greeter/gdm-user.c 2008-04-17 22:29:26.000000000 -0500
|
||||
+++ gdm-2.22.0-post/gui/simple-greeter/gdm-user.c 2008-07-31 07:37:40.000000000 -0500
|
||||
@@ -750,11 +750,12 @@ render_icon_from_home (GdmUser *user,
|
||||
}
|
||||
filesystem_type = g_file_info_get_attribute_string (file_info,
|
||||
G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
|
||||
- is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
|
||||
- (strcmp (filesystem_type, "afs") != 0) &&
|
||||
- (strcmp (filesystem_type, "autofs") != 0) &&
|
||||
- (strcmp (filesystem_type, "unknown") != 0) &&
|
||||
- (strcmp (filesystem_type, "ncpfs") != 0));
|
||||
+ is_local = (filesystem_type == NULL ||
|
||||
+ ((strcmp (filesystem_type, "nfs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "afs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "autofs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "unknown") != 0) &&
|
||||
+ (strcmp (filesystem_type, "ncpfs") != 0)));
|
||||
g_object_unref (file_info);
|
||||
g_object_unref (file);
|
||||
}
|
105
gdm-libwrap.patch
Normal file
105
gdm-libwrap.patch
Normal file
@ -0,0 +1,105 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -631,42 +631,14 @@
|
||||
if test x$with_tcp_wrappers = xno ; then
|
||||
echo "TCP wrappers disabled"
|
||||
else
|
||||
- AC_MSG_CHECKING([whether to use TCP wrappers])
|
||||
LIBWRAP_PATH=""
|
||||
case "$host" in
|
||||
*-*-solaris*)
|
||||
if test -f /usr/sfw/lib/libwrap.so; then
|
||||
- LIBWRAP_PATH=/usr/sfw/lib/libwrap.so
|
||||
- echo "Found $LIBWRAP_PATH" 1>&5
|
||||
- fi
|
||||
- LIBWRAP_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lwrap"
|
||||
- ;;
|
||||
- *)
|
||||
- for I in $LDFLAGS $LIBS -L/usr/lib; do
|
||||
- case "$I" in
|
||||
- -L*)
|
||||
- THEFILE="`echo $I | sed -e 's,^-L,,'`"
|
||||
- echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
|
||||
- if test -f $THEFILE/libwrap.a; then
|
||||
- LIBWRAP_PATH=$THEFILE/libwrap.a
|
||||
- echo "Found $LIBWRAP_PATH" 1>&5
|
||||
- break
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
- done
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- if test -n "$LIBWRAP_PATH"; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- fi
|
||||
-
|
||||
- if test -n "$LIBWRAP_PATH"; then
|
||||
- nm $LIBWRAP_PATH | grep 'T setenv' && LIBWRAP_PATH=""
|
||||
- if test -z "$LIBWRAP_PATH"; then
|
||||
+ LIBWRAP_PATH=/usr/sfw/lib/libwrap.so
|
||||
+ echo "Found $LIBWRAP_PATH" 1>&5
|
||||
+ nm $LIBWRAP_PATH | grep 'T setenv' && LIBWRAP_PATH=""
|
||||
+ if test -z "$LIBWRAP_PATH"; then
|
||||
echo "*********************************************************"
|
||||
echo " You have a broken TCP wrappers library (setenv included)"
|
||||
echo " Please get the latest TCP wrappers package from your OS"
|
||||
@@ -675,28 +647,33 @@
|
||||
echo
|
||||
echo "Not using TCP wrappers after all."
|
||||
echo "*********************************************************"
|
||||
- else
|
||||
- AC_DEFINE(HAVE_TCPWRAPPERS)
|
||||
+ else
|
||||
+ LIBWRAP_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lwrap"
|
||||
+ AC_DEFINE(HAVE_TCPWRAPPERS)
|
||||
+ fi
|
||||
fi
|
||||
- fi
|
||||
-
|
||||
- case "$host" in
|
||||
- *-*-solaris*)
|
||||
- # No need for extra libwrap checking.
|
||||
;;
|
||||
*)
|
||||
- if test -n "$LIBWRAP_PATH"; then
|
||||
- AC_CHECK_LIB(wrap, hosts_ctl, [
|
||||
- LIBWRAP_LIBS="-lwrap"], [
|
||||
- LIBWRAP_LIBS="$LIBWRAP_PATH"])
|
||||
- fi
|
||||
+ AC_CHECK_LIB([wrap], [hosts_ctl], [
|
||||
+ LIBWRAP_LIBS="-lwrap"
|
||||
+ LIBWRAP_PATH=auto
|
||||
+ AC_DEFINE(HAVE_TCPWRAPPERS)])
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ AC_MSG_CHECKING([whether to use TCP wrappers])
|
||||
+ if test -n "$LIBWRAP_PATH"; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ fi
|
||||
|
||||
dnl find out if we need -lnsl or whatever
|
||||
LIB_NSL=
|
||||
if test -n "$LIBWRAP_PATH"; then
|
||||
AC_MSG_CHECKING(whether -lwrap also requires -lnsl)
|
||||
ORIG_LIBS="$LIBS"
|
||||
- LIBS="$EXTRA_DAEMON_LIBS $LIBS"
|
||||
+ LIBS="$EXTRA_DAEMON_LIBS $LIBS $LIBWRAP_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <tcpd.h>
|
||||
int allow_severity, deny_severity;
|
||||
@@ -719,8 +696,6 @@
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
- ;;
|
||||
- esac
|
||||
fi
|
||||
|
||||
AC_SUBST(LIBWRAP_LIBS)
|
23
gdm.changes
23
gdm.changes
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 20 15:16:55 CEST 2008 - sbrabec@suse.cz
|
||||
|
||||
- Updated to version 2.23.2:
|
||||
* Requires ConsoleKit 0.3.0
|
||||
* Keyboard layout selection from greeter
|
||||
* Save backup of ~/.xsession-errors
|
||||
* Add a GConf key for not showing the user list
|
||||
* Now support PostLogin, PreSession, and PostSession hooks
|
||||
* Add DisallowTCP back
|
||||
* Support PAM_XDISPLAY and PAM_XAUTHDATA
|
||||
* Add lang tags, to help Pango pick the right font
|
||||
* Set the initial user selection correctly
|
||||
* Add frame around user icons and make them larger
|
||||
* Write gdm screenshot output to /var/run/gdm instead of /tmp
|
||||
* Save one old copy of greeter log file
|
||||
* Set a minimum width for the login window
|
||||
* Fix check for /etc/gdm/Init/Default so it will actually be
|
||||
executed
|
||||
* Wait for ready from backend when cancelling from greeter
|
||||
* Use per session directories in /var/run/gdm for xauth databases
|
||||
* Move ConsoleKit registration into the worker
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 15 19:24:45 CEST 2008 - maw@suse.de
|
||||
|
||||
|
33
gdm.spec
33
gdm.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gdm (Version 2.22.0)
|
||||
# spec file for package gdm (Version 2.23.2)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
Name: gdm
|
||||
BuildRequires: docbook_4 fdupes gconf2-devel gnome-common gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libgnutls-devel librsvg-devel libwnck-devel pam-devel perl-XML-Parser pwdutils scrollkeeper tcpd-devel update-desktop-files xorg-x11-server xorg-x11-server-extra zenity
|
||||
BuildRequires: PolicyKit-gnome-devel check-devel docbook_4 fdupes gconf2-devel gnome-common gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libgnutls-devel librsvg-devel libwnck-devel libxklavier-devel pam-devel perl-XML-Parser pwdutils scrollkeeper tcpd-devel update-desktop-files xorg-x11-server xorg-x11-server-extra zenity
|
||||
PreReq: /usr/sbin/groupadd
|
||||
PreReq: /usr/sbin/useradd
|
||||
PreReq: /usr/sbin/usermod
|
||||
@ -29,8 +29,8 @@ PreReq: %fillup_prereq
|
||||
PreReq: %insserv_prereq
|
||||
License: GPL v2 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.22.0
|
||||
Release: 2
|
||||
Version: 2.23.2
|
||||
Release: 1
|
||||
Summary: The GNOME 2.x Display Manager
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gdm.pamd
|
||||
@ -40,9 +40,10 @@ Source3: SuSEconfig.gdm
|
||||
Source5: sysconfig.displaymanager-gdm
|
||||
Patch1: gdm-consolekit-helper-subdir.patch
|
||||
Patch2: gdm-2.21.9-no-fatal-warnings.patch
|
||||
Patch3: gdm-greeter-file-system-type-can-be-null.patch
|
||||
Patch4: gdm-2.21.5-vt7-temporary-hack.patch
|
||||
Patch28: gdm-X_SERVER.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-libwrap.patch bgo548676 sbrabec@suse.cz -- Find tcp_wrappers correctly on bi-arch x86_64
|
||||
Patch29: gdm-libwrap.patch
|
||||
Url: http://www.gnome.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
DocDir: %{_defaultdocdir}
|
||||
@ -97,9 +98,9 @@ Authors:
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch28
|
||||
%patch29
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
@ -202,6 +203,26 @@ fi
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%changelog
|
||||
* Wed Aug 20 2008 sbrabec@suse.cz
|
||||
- Updated to version 2.23.2:
|
||||
* Requires ConsoleKit 0.3.0
|
||||
* Keyboard layout selection from greeter
|
||||
* Save backup of ~/.xsession-errors
|
||||
* Add a GConf key for not showing the user list
|
||||
* Now support PostLogin, PreSession, and PostSession hooks
|
||||
* Add DisallowTCP back
|
||||
* Support PAM_XDISPLAY and PAM_XAUTHDATA
|
||||
* Add lang tags, to help Pango pick the right font
|
||||
* Set the initial user selection correctly
|
||||
* Add frame around user icons and make them larger
|
||||
* Write gdm screenshot output to /var/run/gdm instead of /tmp
|
||||
* Save one old copy of greeter log file
|
||||
* Set a minimum width for the login window
|
||||
* Fix check for /etc/gdm/Init/Default so it will actually be
|
||||
executed
|
||||
* Wait for ready from backend when cancelling from greeter
|
||||
* Use per session directories in /var/run/gdm for xauth databases
|
||||
* Move ConsoleKit registration into the worker
|
||||
* Fri Aug 15 2008 maw@suse.de
|
||||
- Fix the build on biarch platforms by listing files that end
|
||||
up in /usr/lib64 correctly
|
||||
|
Loading…
x
Reference in New Issue
Block a user