[SM-Commit] GIT changes to master grimoire by Thomas Orgis (235675ceb36ed2663f938db1439e7e31cc79bedb)

Thomas Orgis scm at sourcemage.org
Sun Jun 8 04:37:34 EDT 2008


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 utils/vlock/BUILD   |   14 +++++++-------
 utils/vlock/DEPENDS |   11 ++---------
 utils/vlock/DETAILS |    1 +
 utils/vlock/HISTORY |    3 +++
 utils/vlock/INSTALL |    7 ++-----
 5 files changed, 15 insertions(+), 21 deletions(-)

New commits:
commit 1b98281ab788a8853d7dbfc6303fd732dd121fef
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    vlock: fixup; make shadow work again

diff --git a/utils/vlock/BUILD b/utils/vlock/BUILD
index 9d58565..25d2b18 100755
--- a/utils/vlock/BUILD
+++ b/utils/vlock/BUILD
@@ -5,12 +5,12 @@ then
    VLOCK_CACA_MODULE="caca.so"
 else
    VLOCK_CACA_MODULE=""
-fi
-
-./configure --with-modules="all.so new.so nosysrq.so $VLOCK_CACA_MODULE"  &&
-
+fi &&
 if is_depends_enabled $SPELL linux-pam; then
-  make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=pam USE_PAM=y
+  AUTH_METHOD=pam
 else
-  make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=shadow USE_PAM=n
-fi
+  AUTH_METHOD=shadow
+fi &&
+# The module path derived from prefix has to work at runtime.
+./configure --prefix="/usr" --enable-$AUTH_METHOD --with-modules="all.so new.so nosysrq.so $VLOCK_CACA_MODULE" &&
+make
diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index a39011c..7b7e3b5 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,11 +1,4 @@
 optional_depends libcaca "" "" "for screensaver module"  &&
 
-optional_depends linux-pam "YES_PAM" "NO_PAM" \
-"use pam for authentication and disable native shadow support"  &&
-
-# only ask if no pam selected
-if ! is_depends_enabled $SPELL linux-pam
-then
-  config_query VLOCK_SUID \
-    "Set vlock binary suid root for non-root users and shadow passwords?" n
-fi
+optional_depends linux-pam "" "" \
+"use pam for authentication and disable native shadow support"
diff --git a/utils/vlock/DETAILS b/utils/vlock/DETAILS
index a795c38..c6063fa 100755
--- a/utils/vlock/DETAILS
+++ b/utils/vlock/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
      SOURCE_HASH=sha512:694da52fba3a73f342c4217f6e3556e8c49cab6a991f0a3b96f6adfdb4a718e8e66ce9b5cc83f74475675a9d31d3956545acd11decf9e3b2db61df53ae863b52
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
          ENTERED=20020815
+STAGED_INSTALL=off
         KEYWORDS="utils"
            SHORT="vlock locks virtual consoles, as well as normal TTYs."
 cat << EOF
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index 9da5c6d..ca6f97e 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,6 @@
+2008-06-08 Thomas Orgis <sobukus at sourcemage.org>
+	* DEPENDS, BUILD, INSTALL: Fix the spell, mainly for non-PAM.
+
 2008-05-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.2.2
 	* DEPENDS: added optional_depends libcaca
diff --git a/utils/vlock/INSTALL b/utils/vlock/INSTALL
index 3bb7287..4f9a431 100755
--- a/utils/vlock/INSTALL
+++ b/utils/vlock/INSTALL
@@ -1,5 +1,2 @@
-make install PREFIX="$INSTALL_ROOT/usr" &&
-if [[ "$VLOCK_SUID" == "y" ]]
-then
-  chmod u+s "$INSTALL_ROOT/usr/bin/vlock"
-fi
+# Full INSTALL_ROOT + TRACK_ROOT play would need hacking the Makefiles.
+make install DESTDIR="$INSTALL_ROOT/"



More information about the SM-Commit mailing list