summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-22 18:42:06 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-22 18:42:06 +0800
commitb04b5ed1cc853deeb74d582281ec143fb69e651a (patch)
tree16de2abd1e79085b91ae9127a7405398a1ed4f53 /x11/gdm/files
parent07ae0074aac10c15d096db00cc33c430ba8d86fc (diff)
downloadmarcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar.gz
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar.bz2
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar.lz
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar.xz
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.tar.zst
marcuscom-ports-b04b5ed1cc853deeb74d582281ec143fb69e651a.zip
Update to 2.28.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12973 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
-rw-r--r--x11/gdm/files/patch-configure97
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c20
2 files changed, 95 insertions, 22 deletions
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index 4f46c6626..220aa1cb6 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,68 +1,137 @@
---- configure.orig 2009-08-25 09:31:58.000000000 +0200
-+++ configure 2009-08-25 09:34:28.000000000 +0200
-@@ -22627,15 +22637,18 @@
- if test -n "$PKG_CONFIG" && \
+--- configure.orig 2009-09-22 12:26:34.000000000 +0200
++++ configure 2009-09-22 12:29:51.000000000 +0200
+@@ -22494,10 +22494,12 @@
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+@@ -22519,10 +22521,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++ hal
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22530,6 +22534,7 @@
+ pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -22551,11 +22556,13 @@
+ COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>&1`
+ else
+ COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+@@ -22564,6 +22571,7 @@
+ { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ) were not met:
+
+ $COMMON_PKG_ERRORS
+@@ -22578,6 +22586,7 @@
+ echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ) were not met:
+
+ $COMMON_PKG_ERRORS
+@@ -22634,10 +22643,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++ hal
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22645,6 +22656,7 @@
pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>/dev/null`
else
pkg_failed=yes
-@@ -22649,15 +22662,18 @@
- if test -n "$PKG_CONFIG" && \
+@@ -22659,10 +22671,12 @@
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+@@ -22670,6 +22684,7 @@
pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>/dev/null`
else
pkg_failed=yes
-@@ -22678,10 +22694,12 @@
- if test $_pkg_short_errors_supported = yes; then
+@@ -22691,11 +22706,13 @@
DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>&1`
else
DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -22689,6 +22707,7 @@
-
+@@ -22704,6 +22721,7 @@
{ { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
$DAEMON_PKG_ERRORS
-@@ -22702,6 +22721,7 @@
- " >&5
+@@ -22718,6 +22736,7 @@
echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
index 0c56d5da4..362a116ea 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -1,5 +1,5 @@
---- daemon/gdm-session-worker.c.orig 2009-04-14 10:01:14.000000000 -0400
-+++ daemon/gdm-session-worker.c 2009-05-31 15:52:10.000000000 -0400
+--- daemon/gdm-session-worker.c.orig 2009-09-21 22:05:27.000000000 +0200
++++ daemon/gdm-session-worker.c 2009-09-22 12:33:59.000000000 +0200
@@ -31,6 +31,9 @@
#include <errno.h>
#include <grp.h>
@@ -8,9 +8,9 @@
+#include <login_cap.h>
+#endif
- #include <security/pam_appl.h>
-
-@@ -332,7 +335,7 @@ gdm_session_execute (const char *file,
+ #ifdef HAVE_LOGINDEVPERM
+ #include <libdevinfo.h>
+@@ -340,7 +343,7 @@ gdm_session_execute (const char *file,
* what to search if PATH is unset. POSIX may, dunno.
*/
@@ -19,8 +19,8 @@
}
len = strlen (file) + 1;
-@@ -1757,11 +1760,12 @@ gdm_session_worker_start_user_session (G
- char **environment;
+@@ -1995,15 +1998,16 @@ gdm_session_worker_start_user_session (G
+ char *cachedirname;
char *home_dir;
int fd;
+#ifdef HAVE_LOGINCAP
@@ -28,6 +28,10 @@
+ struct passwd *pwent = getpwnam (login);
+#endif
+ /* Make sure cachedir gets created before we drop to user */
+ cachedirname = gdm_session_worker_create_cachedir (worker);
+ g_free (cachedirname);
+
- if (setuid (worker->priv->uid) < 0) {
- g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
- _exit (1);
@@ -36,7 +40,7 @@
if (setsid () < 0) {
g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -1769,6 +1773,28 @@ gdm_session_worker_start_user_session (G
+@@ -2011,6 +2015,28 @@ gdm_session_worker_start_user_session (G
_exit (2);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 23:43:29 +0800