summaryrefslogtreecommitdiffstats
path: root/deps/ConsoleKit2
diff options
context:
space:
mode:
Diffstat (limited to 'deps/ConsoleKit2')
-rwxr-xr-xdeps/ConsoleKit2/ConsoleKit2.SlackBuild4
-rw-r--r--deps/ConsoleKit2/doinst.sh27
-rw-r--r--deps/ConsoleKit2/doinst.sh.gzbin353 -> 0 bytes
3 files changed, 29 insertions, 2 deletions
diff --git a/deps/ConsoleKit2/ConsoleKit2.SlackBuild b/deps/ConsoleKit2/ConsoleKit2.SlackBuild
index b1712ac..c57eea6 100755
--- a/deps/ConsoleKit2/ConsoleKit2.SlackBuild
+++ b/deps/ConsoleKit2/ConsoleKit2.SlackBuild
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=ConsoleKit2
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.1}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -145,7 +145,7 @@ fi
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/deps/ConsoleKit2/doinst.sh b/deps/ConsoleKit2/doinst.sh
new file mode 100644
index 0000000..c13a36e
--- /dev/null
+++ b/deps/ConsoleKit2/doinst.sh
@@ -0,0 +1,27 @@
+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/deps/ConsoleKit2/doinst.sh.gz b/deps/ConsoleKit2/doinst.sh.gz
deleted file mode 100644
index f981ef1..0000000
--- a/deps/ConsoleKit2/doinst.sh.gz
+++ /dev/null
Binary files differ