diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-05-09 20:02:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-05-09 20:02:38 +0000 |
| commit | e7ed58ff639624232743d1f8f26441edf2797edc (patch) | |
| tree | 73681fd5040b2bf03b66f7de173ff2bbd78dd357 /x11/gnome-session | |
| parent | - Update to version 8.1.3 (diff) | |
Allow users other than root to shutdown and restart the computer from logout.
Now, any user in the operator group (users that can normally run
/sbin/shutdown) will be able to shutdown the computer during logout.
Notes
Notes:
svn path=/head/; revision=108754
Diffstat (limited to 'x11/gnome-session')
| -rw-r--r-- | x11/gnome-session/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_logout.c | 36 |
2 files changed, 39 insertions, 0 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 6a9d22c54c35..ab0d5fae2220 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomesession PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://people.FreeBSD.org/~marcus/:local \ @@ -26,6 +27,8 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=13 +CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ + --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c new file mode 100644 index 000000000000..f82aefdc7d2e --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_logout.c @@ -0,0 +1,36 @@ +--- gnome-session/logout.c.orig Sun May 9 15:45:34 2004 ++++ gnome-session/logout.c Sun May 9 15:48:29 2004 +@@ -37,12 +37,20 @@ + + static gchar *halt_command[] = + { ++#ifdef __FreeBSD__ ++ HALT_COMMAND, "-p", "now", NULL ++#else + HALT_COMMAND, NULL ++#endif + }; + + static gchar *reboot_command[] = + { ++#ifdef __FreeBSD__ ++ REBOOT_COMMAND, "-r", "now", NULL ++#else + REBOOT_COMMAND, NULL ++#endif + }; + + /* What action to take upon shutdown */ +@@ -401,8 +409,12 @@ + */ + s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL); + t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL); ++#ifndef __FreeBSD__ + if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) && + access (halt_command[0], X_OK) == 0) ++#else ++ if (access (halt_command[0], X_OK) == 0) ++#endif + { + GtkWidget *title, *spacer; + GtkWidget *action_vbox, *hbox; |