diff options
Diffstat (limited to 'source/l/ConsoleKit')
-rwxr-xr-x | source/l/ConsoleKit/ConsoleKit.SlackBuild | 161 | ||||
-rw-r--r-- | source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch | 28 | ||||
-rw-r--r-- | source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch | 65 | ||||
-rw-r--r-- | source/l/ConsoleKit/consolekit-0.4.2-revert.patch | 210 | ||||
-rw-r--r-- | source/l/ConsoleKit/doinst.sh | 27 | ||||
-rw-r--r-- | source/l/ConsoleKit/pam-foreground-compat.ck | 16 | ||||
-rw-r--r-- | source/l/ConsoleKit/rc.consolekit | 34 | ||||
-rw-r--r-- | source/l/ConsoleKit/slack-desc | 19 |
8 files changed, 0 insertions, 560 deletions
diff --git a/source/l/ConsoleKit/ConsoleKit.SlackBuild b/source/l/ConsoleKit/ConsoleKit.SlackBuild deleted file mode 100755 index b3d7869d6..000000000 --- a/source/l/ConsoleKit/ConsoleKit.SlackBuild +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/sh - -# Slackware build script for ConsoleKit - -# Copyright 2009 Robby Workman, Northport, Alabama, USA -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=ConsoleKit -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:--j6} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Clean up at_console compat files, bug #257761 -zcat $CWD/consolekit-0.2.10-cleanup_console_tags.patch.gz | patch -p1 || exit 1 - -# ck-history: don't truncate --frequent output to 8 chars -# GDM screenscrapes the output and so we need the full username. -# https://bugzilla.gnome.org/show_bug.cgi?id=650330 -zcat $CWD/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz | patch -p1 || exit 1 - -# Revert "Only set sessions to be is-local=true if set by a trusted party" -# http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c -# Here are the bug reports: -# http://bugs.gentoo.org/show_bug.cgi?id=336634 -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597937 -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598150 -# https://bugs.freedesktop.org/show_bug.cgi?id=28377 -# This is neither ideal nor maintainable long-term, but I don't know what else -# we can reasonably do right now... --rworkman -zcat $CWD/consolekit-0.4.2-revert.patch.gz | patch -p1 || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --with-pid-file=/var/run/ConsoleKit/pid \ - --enable-docbook-docs \ - --enable-pam-module=no \ - --disable-static \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/lib/ConsoleKit/run-session.d -cat $CWD/pam-foreground-compat.ck > \ - $PKG/usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck -chmod 0755 $PKG/usr/lib/ConsoleKit/run-session.d/pam-foreground-compat.ck - -# Let's not clobber config files -mv $PKG/etc/ConsoleKit/seats.d/00-primary.seat \ - $PKG/etc/ConsoleKit/seats.d/00-primary.seat.new - -# Add an init script -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.consolekit > $PKG/etc/rc.d/rc.consolekit.new -chmod 0755 $PKG/etc/rc.d/rc.consolekit.new - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING HACKING INSTALL NEWS README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch b/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch deleted file mode 100644 index 89b11d086..000000000 --- a/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 803cbdfbd78b66b17ead45b1584d65a258e785bf Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Tue, 24 May 2011 20:58:10 -0400 -Subject: [PATCH] ck-history: don't truncate --frequent output to 8 chars - -GDM screenscrapes the output and so we need the full username. - -https://bugzilla.gnome.org/show_bug.cgi?id=650330 ---- - tools/ck-history.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/ck-history.c b/tools/ck-history.c -index d02caaa..85d9e6f 100644 ---- a/tools/ck-history.c -+++ b/tools/ck-history.c -@@ -804,7 +804,7 @@ generate_report_frequent (int uid, - data = user_counts->data; - - username = get_user_name_for_uid (data->uid); -- g_print ("%-8.8s %u\n", username, data->count); -+ g_print ("%-8s %u\n", username, data->count); - g_free (data); - user_counts = g_list_delete_link (user_counts, user_counts); - g_free (username); --- -1.7.9.4 - diff --git a/source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch b/source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch deleted file mode 100644 index d1699d900..000000000 --- a/source/l/ConsoleKit/consolekit-0.2.10-cleanup_console_tags.patch +++ /dev/null @@ -1,65 +0,0 @@ -# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/ ---- a/src/main.c 2008-07-25 03:19:34.000000000 +0200 -+++ b/src/main.c 2008-07-26 00:25:13.000000000 +0200 -@@ -149,6 +149,43 @@ - unlink (CONSOLE_KIT_PID_FILE); - } - -+#define CONSOLE_TAGS_DIR "/var/run/console" -+ -+static void -+delete_console_tags (void) -+{ -+ GDir *dir; -+ GError *error = NULL; -+ const gchar *name; -+ -+ g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR); -+ -+ dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error); -+ if (dir == NULL) { -+ g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR, -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ while ((name = g_dir_read_name (dir)) != NULL) { -+ gchar *file; -+ file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL); -+ -+ g_debug ("Removing tag file: %s", file); -+ if (unlink (file) == -1) { -+ g_warning ("Couldn't delete tag file: %s", file); -+ } -+ g_free (file); -+ } -+} -+ -+static void -+cleanup (void) -+{ -+ delete_console_tags (); -+ delete_pid (); -+} -+ - /* copied from nautilus */ - static int debug_log_pipes[2]; - -@@ -229,7 +266,7 @@ - snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ()); - written = write (pf, pid, strlen (pid)); - close (pf); -- g_atexit (delete_pid); -+ g_atexit (cleanup); - } else { - g_warning ("Unable to write pid file %s: %s", - CONSOLE_KIT_PID_FILE, -@@ -312,6 +349,8 @@ - - g_debug ("initializing console-kit-daemon %s", VERSION); - -+ delete_console_tags (); -+ - create_pid_file (); - - manager = ck_manager_new (); diff --git a/source/l/ConsoleKit/consolekit-0.4.2-revert.patch b/source/l/ConsoleKit/consolekit-0.4.2-revert.patch deleted file mode 100644 index cb1f461de..000000000 --- a/source/l/ConsoleKit/consolekit-0.4.2-revert.patch +++ /dev/null @@ -1,210 +0,0 @@ -Revert upstream http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c -which renders ConsoleKit unusable. - -diff -ur ConsoleKit-0.4.2.orig/src/ck-manager.c ConsoleKit-0.4.2/src/ck-manager.c ---- ConsoleKit-0.4.2.orig/src/ck-manager.c 2010-09-03 16:54:31.000000000 +0300 -+++ ConsoleKit-0.4.2/src/ck-manager.c 2010-09-10 00:02:32.000000000 +0300 -@@ -1660,175 +1660,12 @@ - dbus_g_method_return (context, cookie); - } - --enum { -- PROP_STRING, -- PROP_BOOLEAN, --}; -- --#define CK_TYPE_PARAMETER_STRUCT (dbus_g_type_get_struct ("GValueArray", \ -- G_TYPE_STRING, \ -- G_TYPE_VALUE, \ -- G_TYPE_INVALID)) -- --static gboolean --_get_parameter (GPtrArray *parameters, -- const char *name, -- int prop_type, -- gpointer *value) --{ -- gboolean ret; -- int i; -- -- if (parameters == NULL) { -- return FALSE; -- } -- -- ret = FALSE; -- -- for (i = 0; i < parameters->len && ret == FALSE; i++) { -- gboolean res; -- GValue val_struct = { 0, }; -- char *prop_name; -- GValue *prop_val; -- -- g_value_init (&val_struct, CK_TYPE_PARAMETER_STRUCT); -- g_value_set_static_boxed (&val_struct, g_ptr_array_index (parameters, i)); -- -- res = dbus_g_type_struct_get (&val_struct, -- 0, &prop_name, -- 1, &prop_val, -- G_MAXUINT); -- if (! res) { -- g_debug ("Unable to extract parameter input"); -- goto cont; -- } -- -- if (prop_name == NULL) { -- g_debug ("Skipping NULL parameter"); -- goto cont; -- } -- -- if (strcmp (prop_name, name) != 0) { -- goto cont; -- } -- -- switch (prop_type) { -- case PROP_STRING: -- if (value != NULL) { -- *value = g_value_dup_string (prop_val); -- } -- break; -- case PROP_BOOLEAN: -- if (value != NULL) { -- *(gboolean *)value = g_value_get_boolean (prop_val); -- } -- break; -- default: -- g_assert_not_reached (); -- break; -- } -- -- ret = TRUE; -- -- cont: -- g_free (prop_name); -- if (prop_val != NULL) { -- g_value_unset (prop_val); -- g_free (prop_val); -- } -- } -- -- return ret; --} -- --static gboolean --_verify_login_session_id_is_local (CkManager *manager, -- const char *login_session_id) --{ -- GHashTableIter iter; -- const char *id; -- CkSession *session; -- -- g_return_val_if_fail (CK_IS_MANAGER (manager), FALSE); -- -- /* If any local session exists for the given login session id -- then that means a trusted party has vouched for the -- original login */ -- -- g_debug ("Looking for local sessions for login-session-id=%s", login_session_id); -- -- session = NULL; -- g_hash_table_iter_init (&iter, manager->priv->sessions); -- while (g_hash_table_iter_next (&iter, (gpointer *)&id, (gpointer *)&session)) { -- if (session != NULL) { -- gboolean is_local; -- char *sessid; -- -- sessid = NULL; -- g_object_get (session, -- "login-session-id", &sessid, -- "is-local", &is_local, -- NULL); -- if (g_strcmp0 (sessid, login_session_id) == 0 && is_local) { -- g_debug ("CkManager: found is-local=true on %s", id); -- return TRUE; -- } -- } -- } -- -- return FALSE; --} -- --static void --add_param_boolean (GPtrArray *parameters, -- const char *key, -- gboolean value) --{ -- GValue val = { 0, }; -- GValue param_val = { 0, }; -- -- g_value_init (&val, G_TYPE_BOOLEAN); -- g_value_set_boolean (&val, value); -- g_value_init (¶m_val, CK_TYPE_PARAMETER_STRUCT); -- g_value_take_boxed (¶m_val, -- dbus_g_type_specialized_construct (CK_TYPE_PARAMETER_STRUCT)); -- dbus_g_type_struct_set (¶m_val, -- 0, key, -- 1, &val, -- G_MAXUINT); -- g_value_unset (&val); -- -- g_ptr_array_add (parameters, g_value_get_boxed (¶m_val)); --} -- - static void - verify_and_open_session_for_leader (CkManager *manager, - CkSessionLeader *leader, -- GPtrArray *parameters, -+ const GPtrArray *parameters, - DBusGMethodInvocation *context) - { -- /* Only allow a local session if originating from an existing -- local session. Effectively this means that only trusted -- parties can create local sessions. */ -- -- g_debug ("CkManager: verifying session for leader"); -- -- if (parameters != NULL && ! _get_parameter (parameters, "is-local", PROP_BOOLEAN, NULL)) { -- gboolean is_local; -- char *login_session_id; -- -- g_debug ("CkManager: is-local has not been set, will inherit from existing login-session-id if available"); -- -- is_local = FALSE; -- -- if (_get_parameter (parameters, "login-session-id", PROP_STRING, (gpointer *) &login_session_id)) { -- is_local = _verify_login_session_id_is_local (manager, login_session_id); -- g_debug ("CkManager: found is-local=%s", is_local ? "true" : "false"); -- } -- -- add_param_boolean (parameters, "is-local", is_local); -- } -- - open_session_for_leader (manager, - leader, - parameters, -diff -ur ConsoleKit-0.4.2.orig/tools/ck-collect-session-info.c ConsoleKit-0.4.2/tools/ck-collect-session-info.c ---- ConsoleKit-0.4.2.orig/tools/ck-collect-session-info.c 2010-09-03 16:54:31.000000000 +0300 -+++ ConsoleKit-0.4.2/tools/ck-collect-session-info.c 2010-09-10 00:06:30.000000000 +0300 -@@ -274,7 +274,8 @@ - si->x11_display_device = ck_process_stat_get_tty (xorg_stat); - ck_process_stat_free (xorg_stat); - -- /* don't set is-local here - let the daemon do that */ -+ si->is_local = TRUE; -+ si->is_local_is_set = TRUE; - - g_free (si->remote_host_name); - si->remote_host_name = NULL; -@@ -303,6 +304,13 @@ - - fill_x11_info (si); - -+ if (! si->is_local_is_set) { -+ /* FIXME: how should we set this? */ -+ /* non x11 sessions must be local I guess */ -+ si->is_local = TRUE; -+ si->is_local_is_set = TRUE; -+ } -+ - res = ck_unix_pid_get_login_session_id (si->pid, &si->login_session_id); - if (! res) { - si->login_session_id = NULL; diff --git a/source/l/ConsoleKit/doinst.sh b/source/l/ConsoleKit/doinst.sh deleted file mode 100644 index c13a36e3e..000000000 --- a/source/l/ConsoleKit/doinst.sh +++ /dev/null @@ -1,27 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - -config etc/ConsoleKit/seats.d/00-primary.seat.new -preserve_perms etc/rc.d/rc.consolekit.new - diff --git a/source/l/ConsoleKit/pam-foreground-compat.ck b/source/l/ConsoleKit/pam-foreground-compat.ck deleted file mode 100644 index 979127272..000000000 --- a/source/l/ConsoleKit/pam-foreground-compat.ck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "${CK_SESSION_USER_UID}" ] || exit 1 - -TAGFILE="${TAGDIR}/$(getent passwd ${CK_SESSION_USER_UID} | cut -f 1 -d:)" - -if [ "$1" = "session_added" ]; then - mkdir -p "${TAGDIR}" - echo "${CK_SESSION_ID}" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "${TAGFILE}" - [ -s "${TAGFILE}" ] || rm -f "${TAGFILE}" -fi diff --git a/source/l/ConsoleKit/rc.consolekit b/source/l/ConsoleKit/rc.consolekit deleted file mode 100644 index a1937569c..000000000 --- a/source/l/ConsoleKit/rc.consolekit +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/rc.consolekit -# -# Start/stop consolekit-kit daemon. -# -# This daemon is used by polkit's console auth agent. - -# Start consolekit: -ck_start() { - echo "Starting ConsoleKit daemon: /usr/sbin/console-kit-daemon" - /usr/sbin/console-kit-daemon -} - -# Stop consolekit: -ck_stop() { - if [ -r /var/run/ConsoleKit/pid ]; then - kill -HUP $(cat /var/run/ConsoleKit/pid) - rm -f /var/run/ConsoleKit/pid - else - killall -HUP -q console-kit-daemon - fi -} - -case "$1" in -'start') - ck_start - ;; -'stop') - ck_stop - ;; -*) - echo "Usage: $0 start|stop" -esac diff --git a/source/l/ConsoleKit/slack-desc b/source/l/ConsoleKit/slack-desc deleted file mode 100644 index 63326799d..000000000 --- a/source/l/ConsoleKit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -ConsoleKit: ConsoleKit (user, login, and seat tracking framework) -ConsoleKit: -ConsoleKit: ConsoleKit is a framework for defining and tracking users, login -ConsoleKit: sessions, and seats. -ConsoleKit: -ConsoleKit: -ConsoleKit: -ConsoleKit: -ConsoleKit: -ConsoleKit: Homepage: http://freedesktop.org/wiki/Software/ConsoleKit -ConsoleKit: |