Merge with ssh://jalasuutari@scm.sourcemage.org/smgl/grimoire.git#master

12 files changed, 32 insertions, 39 deletions

diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 280d0c4c5a..93d16352bb 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ntfs-3g
-         VERSION=1.1030
-     SOURCE_HASH=sha512:63128c82ddbe6704114d58f3d0846fa505933e2abc1ebb7c41248eee8f4df41e966e0b8ce541a654436309ec98356edbd829790aaec363d045fbd16c4b515cd2
+         VERSION=1.1104
+     SOURCE_HASH=sha512:b6f28c317700863fd1894358ff726b05129d05db792c13d2f22f3155e62638faadedb867b898eabf991656fdc6968ee45fb60768e268387e17d1168e33134a93
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.ntfs-3g.org/
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 5c6ad279a9..ca6a1244fc 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 1.1104
+
 2007-10-29 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.1030
 
diff --git a/graphics/xaralx/DETAILS b/graphics/xaralx/DETAILS
index 41aff93783..368f3ba257 100755
--- a/graphics/xaralx/DETAILS
+++ b/graphics/xaralx/DETAILS
@@ -1,7 +1,7 @@
            SPELL=xaralx
           SPELLX=XaraLX
-         VERSION=0.7r1780
-     SOURCE_HASH=sha512:8d5f24bfd6757a8f33837c9d1b5df8b7fb0e322bac970c7ca064e72813f0447a4f9c088f236bc6abd24d0afec7e69a185559cfcf0ee12813c862a196e3f2cc11
+         VERSION=0.7r1783
+     SOURCE_HASH=sha512:68ccb87a703dc5d4a380aa50260c2c47f5a44334126333492cc0fafabce74e1bc9cc46d9ba4a45222ff5f2ccc3282f3252f54a48c237e3d8d174200ac3eadf67
           SOURCE=${SPELLX}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
    SOURCE_URL[0]=http://downloads2.xara.com/opensource/$SOURCE
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index d7f13fcf1c..ff8f9ca744 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,6 @@
+2007-11-05 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.7r1783
+
 2007-09-04 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.7r1780
 
diff --git a/utils/vlock/BUILD b/utils/vlock/BUILD
index 8f58e6df93..29ea58eb29 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 59c8634b1d..5c38206b9f 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 35d027173e..87b41407db 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 a6254b9610..5ae1df3841 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,11 @@
+2007-11-05 Jaka Kranjc <lynxlynxlynx@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@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 5a0f2f856a..3bb728799b 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 e81e5bb35a..0000000000
--- 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 c9688baa29..0000000000
--- a/utils/vlock/vlock-1.3.tar.gz.sig
+++ /dev/null
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 0000000000..91216f10ab
--- /dev/null
+++ b/utils/vlock/vlock-2.1.tar.gz.sig