pmount: => 0.9.23

9 files changed, 55 insertions, 29 deletions

diff --git a/disk/pmount/BUILD b/disk/pmount/BUILD
index 482831a85b..7e7f955590 100755
--- a/disk/pmount/BUILD
+++ b/disk/pmount/BUILD
@@ -1,4 +1,5 @@
-if [[ $CRYPT  == "y" ]]; then
-	sed -i -e "s|/sbin/cryptsetup|`which cryptsetup`|" src/policy.h
-fi  &&
+if is_depends_enabled $SPELL cryptsetup-luks; then
+  OPTS="--with-cryptsetup-prog=`which cryptsetup` $OPTS"
+fi &&
+
 default_build
diff --git a/disk/pmount/CONFIGURE b/disk/pmount/CONFIGURE
deleted file mode 100755
index 4635f88cea..0000000000
--- a/disk/pmount/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query PMOUNT "Enable usage of pmount by hal instead of fstab definitions (answer 'n' if you use gnome-volume-manager) " y &&
-config_query CRYPT  "Enable prompting for passphrases of encrypted partitions" n
diff --git a/disk/pmount/DEPENDS b/disk/pmount/DEPENDS
index f3bf70869f..22e765978b 100755
--- a/disk/pmount/DEPENDS
+++ b/disk/pmount/DEPENDS
@@ -1,6 +1,15 @@
-depends			dbus							&&
-depends			hal							&&
-depends			sysfsutils						&&
-if [[ $CRYPT  == "y" ]]; then
-	depends		cryptsetup-luks
-fi
+depends util-linux &&
+depends which &&
+
+optional_depends hal \
+                 "--enable-hal" \
+                 "--disable-hal" \
+                 "to build pmount-hal frontend" &&
+
+if is_depends_enabled $SPELL hal; then
+  depends dbus
+fi &&
+
+optional_depends cryptsetup-luks "" "" "to enable prompting for passphrases of encrypted partitions" &&
+
+suggest_depends ntfs-3g "" "" "for ability to mount NTFS volumes"
diff --git a/disk/pmount/DETAILS b/disk/pmount/DETAILS
index 5dd04a1836..c771c42956 100755
--- a/disk/pmount/DETAILS
+++ b/disk/pmount/DETAILS
@@ -1,17 +1,14 @@
            SPELL=pmount
-         VERSION=0.9.20
-          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
-         SOURCE2=${SPELL}_${VERSION}-3.diff.gz
-     SOURCE_HASH=sha512:94bb65f5690605fa8857bda942728bfaa59d7dc519c2cd80fead273da8fa21945e1f4c3eac6319a00e61e9f24be2fc180420f245b5dba56eb0e87b943d9c56e3
-    SOURCE2_HASH=sha512:bc040d7e0547943f825b2c32ba10dacd2fa0c24d7f2f723eb01043cee95c1fcea5516f8cc6fe860add71176b21b83c408d510d0cc3bd0c3aa25ce83aed824eb0
+         VERSION=0.9.23
+          SOURCE=${SPELL}_${VERSION}.orig.tar.bz2
+     SOURCE_HASH=sha512:a9d762fb9bd3f525d52b29a33c09c10a09f90fabdeed8f3658cb3fe8cbdbf237b2c9165b7c93a7170b9de5c65c513c1629b1fca638563a66d091c518782db92d
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE
-  SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/p/pmount/$SOURCE2
+   SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/$SPELL/$SOURCE
         WEB_SITE=http://packages.debian.org/unstable/source/pmount
          ENTERED=20050512
       LICENSE[0]=GPL
         KEYWORDS="disk"
-           SHORT="Wrapper around the standard mount program"
+           SHORT="wrapper around the standard mount program"
 cat << EOF
 pmount is a wrapper around the standard mount program which permits normal
 users to mount removable devices without a matching /etc/fstab entry. This
diff --git a/disk/pmount/FINAL b/disk/pmount/FINAL
new file mode 100755
index 0000000000..4fb2187783
--- /dev/null
+++ b/disk/pmount/FINAL
@@ -0,0 +1,5 @@
+if [[ ! -d "$INSTALL_ROOT/media" ]]; then
+  install -vd "$INSTALL_ROOT/media"
+fi &&
+
+message "\n${MESSAGE_COLOR}Don't forget to add the users allowed to pmount in plugdev group${DEFAULT_COLOR}\n"
diff --git a/disk/pmount/HISTORY b/disk/pmount/HISTORY
index 18d2367c54..4b55b94869 100644
--- a/disk/pmount/HISTORY
+++ b/disk/pmount/HISTORY
@@ -1,3 +1,16 @@
+2013-09-24 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.9.23; updated source url and source
+	  extension; fixed short description
+	* BUILD: removed dirty hacks
+	* DEPENDS: hal and dbus are optional; removed obsolete sysfsutils
+	  dependency; added ntfs-3g suggest dependency; added missing generic
+	  dependencies; removed tabs
+	* CONFIGURE: dropped, not needed anymore
+	* INSTALL: removed tabs
+	* PRE_BUILD: removed patching with the non-required 2nd source
+	* PRE_INSTALL: changed hal condition
+	* FINAL: added, to install /media directory and show post-cast message
+
 2010-02-27 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: updated to 0.9.20
 
diff --git a/disk/pmount/INSTALL b/disk/pmount/INSTALL
index 69c96a56c7..ccbb595f47 100755
--- a/disk/pmount/INSTALL
+++ b/disk/pmount/INSTALL
@@ -1,7 +1,11 @@
-make PREFIX=$INSTALL_ROOT/usr install		&&
+make PREFIX=$INSTALL_ROOT/usr install &&
+
 chgrp plugdev ${INSTALL_ROOT}/usr/bin/pmount \
-	${INSTALL_ROOT}/usr/bin/pmount-hal \
-	${INSTALL_ROOT}/usr/bin/pumount  	&&			
+              ${INSTALL_ROOT}/usr/bin/pumount &&
+
+if is_depends_enabled $SPELL hal; then
+  chgrp plugdev ${INSTALL_ROOT}/usr/bin/pmount-hal
+fi &&
+
 chmod 4750 ${INSTALL_ROOT}/usr/bin/pmount \
-	   ${INSTALL_ROOT}/usr/bin/pumount &&
-message "\nDon't forget to add the users allowed to pmount in plugdev group\n"
+           ${INSTALL_ROOT}/usr/bin/pumount
diff --git a/disk/pmount/PRE_BUILD b/disk/pmount/PRE_BUILD
index df515b46b4..8d6a8dc6c1 100755
--- a/disk/pmount/PRE_BUILD
+++ b/disk/pmount/PRE_BUILD
@@ -1,5 +1,3 @@
 default_pre_build                             &&
 cd $SOURCE_DIRECTORY                          &&
-unpack_file 2                                 &&
-gunzip -c $SOURCE_CACHE/$SOURCE2 | patch -p0  &&
 patch -p1 < $SCRIPT_DIRECTORY/pmount-0.9.13-no_close.patch
diff --git a/disk/pmount/PRE_INSTALL b/disk/pmount/PRE_INSTALL
index bbb69296d4..7cd79a5938 100755
--- a/disk/pmount/PRE_INSTALL
+++ b/disk/pmount/PRE_INSTALL
@@ -1,6 +1,7 @@
-default_pre_install                                &&
-create_group plugdev				&&
-if [ "$PMOUNT" == "y" ]; then
+default_pre_install &&
+create_group plugdev &&
+
+if is_depends_enabled $SPELL hal; then
    usermod -G plugdev -a haldaemon                   &&
    mkdir -p ${INSTALL_ROOT}/etc/hal/device.d                         &&
    ln -sfn ${INSTALL_ROOT}/usr/bin/pmount-hal ${INSTALL_ROOT}/etc/hal/device.d/60-pmount.hal