[SM-Commit] GIT changes to master grimoire by Thomas Orgis (250ae38617aa68421c748f57aeb74597a8d29ff0)

Thomas Orgis scm at mail.sourcemage.org
Thu Oct 19 07:12:59 EDT 2006


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

 utils/vlock/DEPENDS   |   17 +++++++++++++++--
 utils/vlock/DETAILS   |    1 +
 utils/vlock/HISTORY   |    5 +++++
 utils/vlock/INSTALL   |   10 +++++++---
 utils/vlock/PRE_BUILD |   16 ++++------------
 5 files changed, 32 insertions(+), 17 deletions(-)

New commits:
commit 250ae38617aa68421c748f57aeb74597a8d29ff0
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    adding suid installation to vlock and tidying up a bit

diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index fa3b2a7..59c8634 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,3 +1,16 @@
 optional_depends linux-pam "YES_PAM" "NO_PAM" \
-"Use pam for authentication? (recommended)" 
-#optional_depends shadow "YES_SHADOW" "NO_SHADOW" "native shadow password support"
+"use pam for authentication and disable native shadow support"  &&
+# only in devel sorcery (?)
+if declare -f is_depends_enabled &> /dev/null
+then
+  # 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
+else
+  # always ask, even if meaningless
+  config_query VLOCK_SUID \
+  "Set vlock binary suid root for non-root users and shadow passwords (not with pam)?" n
+fi
diff --git a/utils/vlock/DETAILS b/utils/vlock/DETAILS
index abab057..35d0271 100755
--- a/utils/vlock/DETAILS
+++ b/utils/vlock/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
          ENTERED=20020815
          UPDATED=20030810
+      PATCHLEVEL=1
         KEYWORDS="utils"
            SHORT="vlock locks virtual consoles, as well as normal TTYs."
 
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index baa5264..e8487f1 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,8 @@
+2006-07-10 Thomas Orgis <sobukus at sourcemage.org>
+	* DEPENDS, PRE_BUILD, INSTALL: added optional suid install and
+	  added $INSTALL_ROOT in INSTALL, removed some question marks
+	* DETAILS: patchlevel up (because of suid)
+
 2006-10-17 Mathieu Lonjaret <lejatorn at sourcemage.org>
 	* DEPENDS, PRE_BUILD: set shadow and pam to be exclusive
 
diff --git a/utils/vlock/INSTALL b/utils/vlock/INSTALL
index 886696a..5a0f2f8 100755
--- a/utils/vlock/INSTALL
+++ b/utils/vlock/INSTALL
@@ -1,3 +1,7 @@
-install  vlock       /usr/bin             &&
-gzip -9  vlock.1                          &&
-install  vlock.1.gz  /usr/share/man/man1
+install  vlock       "$INSTALL_ROOT/usr/bin" &&
+if [[ "$VLOCK_SUID" == "y" ]]
+then
+  chmod u+s "$INSTALL_ROOT/usr/bin/vlock"
+fi &&
+gzip -9  vlock.1  &&
+install  vlock.1.gz  "$INSTALL_ROOT/usr/share/man/man1"
diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
index b32e871..e81e5bb 100755
--- a/utils/vlock/PRE_BUILD
+++ b/utils/vlock/PRE_BUILD
@@ -1,19 +1,11 @@
-#this is still wip as using shadow requires vlock to be setuid root
 default_pre_build                 &&
 cd $SOURCE_DIRECTORY              &&
 sedit  "s/-O2/$CFLAGS/"  Makefile &&
 if list_find "$OPTS" "NO_PAM"
 then
-  message "seding Makefile to disable PAM"                 &&
-  #sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1/' Makefile &&
+  message "seding Makefile to disable PAM and enable shadow" &&
+  # shadow code in vlock conflicts with pam code
+  # but it's fine with or without shadow passwords and current glibc
   sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1 -DSHADOW_PWD/' Makefile &&
   sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
-fi 
-#does this conflict with PAM?
-#->yes it does. ;-)
-#if list_find "$OPTS" "YES_SHADOW"
-#then
-#  message "seding Makefile to enable shadow"                 &&
-#  sedit 's/^\(CFLAGS =.*\)$/\1 -DSHADOW_PWD/' Makefile
-#fi
-
+fi



More information about the SM-Commit mailing list