Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a3f59f96d690c46c3e370ef96f59da81f871e10c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a3f59f96d690c46c3e370ef96f59da81f871e10c)
  • Date: Mon, 5 Nov 2007 07:22:43 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

dev/null |binary
utils/vlock/BUILD | 6 +++++-
utils/vlock/DEPENDS | 15 ++++-----------
utils/vlock/DETAILS | 11 +++--------
utils/vlock/HISTORY | 8 ++++++++
utils/vlock/INSTALL | 6 ++----
utils/vlock/PRE_BUILD | 11 -----------
utils/vlock/vlock-1.3.tar.gz.sig | 0
utils/vlock/vlock-2.1.tar.gz.sig |binary
9 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit a3f59f96d690c46c3e370ef96f59da81f871e10c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

vlock: updated to newest stable and spent some QuAlity time with it

diff --git a/utils/vlock/BUILD b/utils/vlock/BUILD
index 8f58e6d..29ea58e 100755
--- a/utils/vlock/BUILD
+++ b/utils/vlock/BUILD
@@ -1 +1,5 @@
-make
+if is_depends_enabled $SPELL linux-pam; then
+ make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=pam USE_PAM=y
+else
+ make PREFIX="$INSTALL_ROOT/usr" AUTH_METHOD=shadow USE_PAM=n
+fi
diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index 59c8634..5c38206 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1,16 +1,9 @@
optional_depends linux-pam "YES_PAM" "NO_PAM" \
"use pam for authentication and disable native shadow support" &&
-# only in devel sorcery (?)
-if declare -f is_depends_enabled &> /dev/null
+
+# only ask if no pam selected
+if ! is_depends_enabled $SPELL linux-pam
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
+ "Set vlock binary suid root for non-root users and shadow passwords?" n
fi
diff --git a/utils/vlock/DETAILS b/utils/vlock/DETAILS
index 35d0271..87b4140 100755
--- a/utils/vlock/DETAILS
+++ b/utils/vlock/DETAILS
@@ -1,21 +1,16 @@
SPELL=vlock
- VERSION=1.3
+ VERSION=2.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/$SOURCE
- WEB_SITE=http://freshmeat.net/projects/vlock/
+ SOURCE_URL[0]=http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$SOURCE
+ WEB_SITE=http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
SOURCE_GPG=gurus.gpg:$SOURCE.sig
ENTERED=20020815
- UPDATED=20030810
- PATCHLEVEL=1
KEYWORDS="utils"
SHORT="vlock locks virtual consoles, as well as normal TTYs."
-
cat << EOF
-
vlock locks virtual consoles, as well as normal TTYs. It can prevent console
switching, and it supports PAM authentication by default. Ideal for work
environments, lan parties, or anywhere you'll want to be able to walk away
from
your computer while leaving things running.
-
EOF
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index a6254b9..5ae1df3 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,11 @@
+2007-11-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: removed
+ * BUILD: pass some flags to make it build
+ * INSTALL: use make install, it works now
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed WEB_SITE
+ updated spell to 2.1
+
2006-10-19 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, PRE_BUILD, INSTALL: added optional suid install and
added $INSTALL_ROOT in INSTALL, removed some question marks
diff --git a/utils/vlock/INSTALL b/utils/vlock/INSTALL
index 5a0f2f8..3bb7287 100755
--- a/utils/vlock/INSTALL
+++ b/utils/vlock/INSTALL
@@ -1,7 +1,5 @@
-install vlock "$INSTALL_ROOT/usr/bin" &&
+make install PREFIX="$INSTALL_ROOT/usr" &&
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"
+fi
diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
deleted file mode 100755
index e81e5bb..0000000
--- a/utils/vlock/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "s/-O2/$CFLAGS/" Makefile &&
-if list_find "$OPTS" "NO_PAM"
-then
- 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
diff --git a/utils/vlock/vlock-1.3.tar.gz.sig
b/utils/vlock/vlock-1.3.tar.gz.sig
deleted file mode 100644
index c9688ba..0000000
Binary files a/utils/vlock/vlock-1.3.tar.gz.sig and /dev/null differ
diff --git a/utils/vlock/vlock-2.1.tar.gz.sig
b/utils/vlock/vlock-2.1.tar.gz.sig
new file mode 100644
index 0000000..91216f1
Binary files /dev/null and b/utils/vlock/vlock-2.1.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a3f59f96d690c46c3e370ef96f59da81f871e10c), Jaka Kranjc, 11/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page