5 files changed, 75 insertions, 45 deletions
diff --git a/system/pmount/README b/system/pmount/README
index 9ee69cc23f432..7db295dc0c369 100644
--- a/system/pmount/README
+++ b/system/pmount/README
@@ -1,18 +1,13 @@
-mount removable devices as normal user
+pmount is a wrapper around the standard mount program which permits
+normal users to mount removable devices without a matching
+/etc/fstab entry.
 
-pmount is a wrapper around the standard mount program which permits normal
-users to mount removable devices without a matching /etc/fstab entry. This
-provides a robust basis for automounting frameworks like GNOME's Utopia
-project and confines the amount of code that runs as root to a minimum.
+The program also includes "pmount-hal" which reads information from
+hal (device labels, mount options) and passes them to pmount.
+Note that this pmoumt SlackBuild by default uses --enable-hal since
+hal is included in Slackware 12.0.
 
-This package also contains a wrapper "pmount-hal" which reads some
-information like device labels and mount options from hal and passes them
-to pmount. Install the package "hal" if you want to use this feature.
+After installing pmount, you've to be sure the users you want to be
+able to use it are in "plugdev" group.
 
-If a LUKS capable cryptsetup package is installed, pmount is able to
-transparently mount encrypted volumes.
-
-This requires ivman and HAL, both of which are available at SlackBuilds.org.
-
-The user executing 'pmount' probably via 'ivman-launch' must be a member 
-of the 'plugdev' system group (which is required by HAL).
+You can read pmount's man page if you want detailed information.
diff --git a/system/pmount/doinst.sh b/system/pmount/doinst.sh
index e7c14965b1b0d..3b82b97e99b4d 100644
--- a/system/pmount/doinst.sh
+++ b/system/pmount/doinst.sh
@@ -1,10 +1,12 @@
+#!/bin/sh
+
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  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
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
diff --git a/system/pmount/pmount.SlackBuild b/system/pmount/pmount.SlackBuild
index e7531876617f3..0cd834f0e2e9d 100644
--- a/system/pmount/pmount.SlackBuild
+++ b/system/pmount/pmount.SlackBuild
@@ -1,21 +1,41 @@
 #!/bin/sh
 
 # Slackware build script for pmount
-# Written by Menno E. Duursma <druiloor@zonnet.nl>
-# Modified by the SlackBuilds.org project
 
-# Exit on most errors
+# Copyright 2007 by Guillermo Bonvehi (gbonvehi@gmail.com)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by Robby Workman  <http://rlworkman.net>
+# No additional license terms added.
+
 set -e
 
 PRGNAM=pmount
-VERSION=0.9.13
+VERSION=0.9.16
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -27,7 +47,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || ( echo "Cannot find sources file: $PRGNAM-$VERSION.tar.gz"; exit 1; )
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -39,26 +59,31 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-static=no
+  --enable-hal
 
 make
 make install-strip DESTDIR=$PKG
 
-# Change goup ownership of the binary as it's suid
-# This means 'hotpluggin' users need to be in that group!
-chgrp plugdev $PKG/usr/bin/pmount
-chmod 4750 $PKG/usr/bin/pmount
+# Give pmount/pumount suid bit.
+chown root.plugdev $PKG/usr/bin/pmount $PKG/usr/bin/pumount
+chmod 4750 $PKG/usr/bin/pmount $PKG/usr/bin/pumount
 
-# Let's not clobber an existing ACL file
+# Let's not clobber the config file
 mv $PKG/etc/pmount.allow $PKG/etc/pmount.allow.new
 
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS README COPYING ChangeLog INSTALL NEWS TODO README.devel \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/pmount/pmount.info b/system/pmount/pmount.info
index 9aa4b5ac57dcf..74f0e950c0dd2 100644
--- a/system/pmount/pmount.info
+++ b/system/pmount/pmount.info
@@ -1,8 +1,8 @@
 PRGNAM="pmount"
-VERSION="0.9.13"
-HOMEPAGE="http://packages.debian.org/unstable/utils/pmount"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/p/pmount/pmount_0.9.13.orig.tar.gz"
-MD5SUM="978d1c996fb7f74e8bb953d5674ab691"
-MAINTAINER="Menno E. Duursma"
-EMAIL="druiloor@zonnet.nl"
+VERSION="0.9.16"
+HOMEPAGE="http://pmount.alioth.debian.org/"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/2057/pmount-0.9.16.tar.gz"
+MD5SUM="25fafae5d7ad3cb81bcc2131b1698f45"
+MAINTAINER="Guillermo Bonvehi"
+EMAIL="gbonvehi@gmail.com"
 APPROVED="rworkman"
diff --git a/system/pmount/slack-desc b/system/pmount/slack-desc
index 4f6e207232fc1..fa28dfe187e06 100644
--- a/system/pmount/slack-desc
+++ b/system/pmount/slack-desc
@@ -1,11 +1,19 @@
-pmount: mount removable devices as normal user
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+pmount: pmount (mount removable devices as normal project!)
+pmount:
+pmount: pmount is a wrapper around the standard mount program which 
+pmount: permits normal users to mount removable devices without a
+pmount: matching entry in /etc/fstab.
+pmount:
+pmount: Homepage: http://pmount.alioth.debian.org/
+pmount:
 pmount:
-pmount: a wrapper around the standard mount program which permits
-pmount: users to mount removable devices without a matching normal
-pmount: /etc/fstab entry.
 pmount:
-pmount: This provides a basis for automounting frameworks like GNOME's
-pmount: Utopia project and confines the amount of code that runs
-pmount: as root to a minimum. pmount works together with hal/ivman.
 pmount:
-pmount: pmount is maintained by Martin Pitt