From 9d275e6e88e480d7ec77a3da3d67b44c706fa349 Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Sun, 4 Mar 2012 10:48:00 +0100
Subject: [PATCH] 1.3.1

---
 README                                        | 189 +++++++-------
 automount                                     |  16 +-
 port/distfiles/automount-1.3.1.tar.gz         | Bin 0 -> 3532 bytes
 port/distfiles/automount-1.3.1/automount      | 244 ++++++++++++++++++
 port/distfiles/automount-1.3.1/automount.conf |   7 +
 .../automount-1.3.1/automount.conf.sample     |   5 +
 .../automount-1.3.1/automount_devd.conf       |  14 +
 port/sysutils/automount/Makefile              |   2 +-
 port/sysutils/automount/distinfo              |   4 +-
 9 files changed, 378 insertions(+), 103 deletions(-)
 create mode 100644 port/distfiles/automount-1.3.1.tar.gz
 create mode 100755 port/distfiles/automount-1.3.1/automount
 create mode 100644 port/distfiles/automount-1.3.1/automount.conf
 create mode 100644 port/distfiles/automount-1.3.1/automount.conf.sample
 create mode 100644 port/distfiles/automount-1.3.1/automount_devd.conf

diff --git a/README b/README
index 4c93d51..760074d 100644
--- a/README
+++ b/README
@@ -1,101 +1,27 @@
-AUTOMOUNT is a devd(8) based flexible yet very simple automounter for FreeBSD.
+VERSION 1.3.1
 
-Currently it supports these file systems:
- -- NTFS requires sysutils/fusefs-ntfs for R/W
- -- FAT/FAT32
- -- exFAT requires sysutils/fusefs-exfat
- -- EXT2
- -- EXT3
- -- EXT4 requires sysutils/fusefs-ext4fuse
- -- UFS
-
-It keeps state of the mounted devices at /var/run/automount.state and logs
-all activities to /var/log/automount.log file.
-
-The place for the script is at /usr/local/sbin/automount.sh executable.
-
-The only additional configuration it requires is to add these lines as
-/usr/local/etc/devd/automount_devd.conf file, which would allow it to work.
-
-Remember to restart /etc/rc.d/devd daemon after adding
-/usr/local/etc/devd/automount_devd.conf file.
-
-INSTALL:
-
-# cp automount.sh        /usr/local/sbin/automount.sh
-# cp automount.conf      /usr/local/etc/automount.conf
-# cp automount_devd.conf /usr/local/etc/devd/automount_devd.conf
-# /etc/rc.d/devd restart
-
-Now plugin Your USB thumb drive ;)
-
-Have Fun ;)
-vermaden
+Fixed the 'detach' section (s/PREFIX/MNTPREFIX/g).
+Fixed removing directories of manually (properly) unmounted filesystems.
 
 -------------------------------------------------------------------------------
 
-Latest changes ...
+VERSION 1.3
 
-I removed the state_lock and stat_unlock mechanisms as they appeared to be not
-needed, I have shufled with 3 drives all the time and the 'integrity' has not
-been lost, at it was a lot faster, because the lock always had to wait for the
-'slowest' drive (in term of initializing the device, like USB hard drive).
-
-I simplified the 'attach' section a lot, now each filesystem contains only
-check/fsck (if possible), mount and log info.
-
-I also simplified and improved the 'detach' section a little.
-
-I added an option to automatically launch the set-up in config file manager.
-
-These are options that I currently successfully use for NAUTILUS file manager,
-You need to set-up all three of them to make it work.
-
-| POPUP=YES
-| FM="nautilus --browser --no-desktop"
-| USER=vermaden
-
-My whole config looks like that now:
-
-| USERUMOUNT=YES
-| POPUP=YES
-| FM="nautilus --browser --no-desktop"
-| USER=vermaden
-| ENCODING=pl_PL.ISO8859-2
-| CODEPAGE=cp852
-
-All latest updates are available at GITHUB repository:
-https://github.com/vermaden/automount
-
-Regards,
-vermaden
+Fixed inproper exFAT detection, now mounts fine.
+Fixed creating mount dirs for attached devices no matter if needed or not.
+Revised 'detach' section, now removes only directory that is unmounted.
+Simplified FAT/NTFS sections, removed additional checks as they break
+  some MP3 players automount.
 
 -------------------------------------------------------------------------------
 
-Latest changes ...
+VERSION 1.2.1
 
-FAT/NTFS detection improvements.
-The 'chown' now uses sets user's group.
-MSDOS filesystem is now mounted with -m 644 -M 755 options by default.
-Removed POPUP=YES option, just use USER + FM for simplicity.
-NTFS filesystem, when mounted by mount_ntfs(8) uses -u and -g options by default.
-Even more simplified 'detach' section.
+Added the --help page.
+Removed some small bugs.
+Added more options to configure features.
 
-Regards,
-vermaden
 
--------------------------------------------------------------------------------
-
-Latest changes ...
-
-Added PORT ;)
-
-Regards,
-vermaden
-
--------------------------------------------------------------------------------
-
-Added the --help page, removed some bugs, added options to configure features.
 
 % automount --help
 AUTOMOUNT is a devd(8) based automounter for FreeBSD.
@@ -168,17 +94,88 @@ REMOVEDIRS (set to NO by default)
 
   example: REMOVEDIRS="YES"
 
-Regards,
-vermaden
-
 -------------------------------------------------------------------------------
 
-Fixed bug about inproper exFAT detection, now mounts fine.
-Fixed bug about creating mount dirs for all attached devices no matter if needed or not.
-Revised 'detach' section, now removes only directory that is unmounted (if enabled of course).
-Simplified FAT/NTFS sections, removed additional check as it break some MP3 players default filesystems automount.
+VERSION 1.2
 
-Regards,
+FAT/NTFS detection improvements.
+The 'chown' now uses sets user's group.
+MSDOS filesystem is now mounted with -m 644 -M 755 options by default.
+Removed POPUP=YES option, just use USER + FM for simplicity.
+NTFS filesystem, when mounted by mount_ntfs(8) uses -u and -g options.
+Even more simplified 'detach' section.
+
+------------------------------------------------------------------------------
+
+VERSION 1.1
+
+I removed the state_lock and stat_unlock mechanisms as they appeared to be
+not needed, I have shufled with 3 drives all the time and the 'integrity'
+has not been lost, at it was a lot faster, because the lock always had to
+wait for the 'slowest' drive (in term of initializing the device, like USB
+hard drive).
+
+I simplified the 'attach' section a lot, now each filesystem contains only
+check/fsck (if possible), mount and log info.
+
+I also simplified and improved the 'detach' section a little.
+
+I added an option to automatically launch the set-up in config file manager.
+
+These are options that I currently successfully use for NAUTILUS file
+manager. You need to set-up all three of them to make it work.
+
+| POPUP=YES
+| FM="nautilus --browser --no-desktop"
+| USER=vermaden
+
+My whole config looks like that now:
+
+| USERUMOUNT=YES
+| POPUP=YES
+| FM="nautilus --browser --no-desktop"
+| USER=vermaden
+| ENCODING=pl_PL.ISO8859-2
+| CODEPAGE=cp852
+
+All latest updates are available at GITHUB repository:
+https://github.com/vermaden/automount
+
+------------------------------------------------------------------------------
+
+VERSION 1.0
+
+AUTOMOUNT is devd(8) based flexible yet very simple automounter for FreeBSD.
+
+Currently it supports these file systems:
+ -- NTFS requires sysutils/fusefs-ntfs for R/W
+ -- FAT/FAT32
+ -- exFAT requires sysutils/fusefs-exfat
+ -- EXT2
+ -- EXT3
+ -- EXT4 requires sysutils/fusefs-ext4fuse
+ -- UFS
+
+It keeps state of the mounted devices at /var/run/automount.state and logs
+all activities to /var/log/automount.log file.
+
+The place for the script is at /usr/local/sbin/automount.sh executable.
+
+The only additional configuration it requires is to add these lines as
+/usr/local/etc/devd/automount_devd.conf file, which would allow it to work.
+
+Remember to restart /etc/rc.d/devd daemon after adding
+/usr/local/etc/devd/automount_devd.conf file.
+
+INSTALL:
+
+# cp automount.sh        /usr/local/sbin/automount.sh
+# cp automount.conf      /usr/local/etc/automount.conf
+# cp automount_devd.conf /usr/local/etc/devd/automount_devd.conf
+# /etc/rc.d/devd restart
+
+Now plugin Your USB thumb drive ;)
+
+Have Fun ;)
 vermaden
 
-
diff --git a/automount b/automount
index 2d22d13..88acda9 100755
--- a/automount
+++ b/automount
@@ -143,6 +143,11 @@ __state_remove() { # 1=MNT
   sed -i '' "/${BSMNT}\$/d" ${STATE}
 }
 
+__remove_dir() { # 1=TARGET
+  [ "${REMOVEDIRS}" = YES ] \
+    && find "${1}" -type d -empty -maxdepth 1 -exec rm -r {} '+'
+}
+
 __log() { # @=MESSAGE
   echo $( date +"${DATEFMT}" ) ${@} >> ${LOG}
 }
@@ -217,20 +222,23 @@ case ${2} in
     ;;
 
   (detach)
-    grep -E "${PREFIX}/${1}$" ${STATE} \
+    grep -E "${MNTPREFIX}/${1}$" ${STATE} \
       | while read DEV PROVIDER MNT
         do
           TARGET=$( mount | grep -E "^${PROVIDER} " | awk '{print $3}' )
           __state_remove ${MNT}
           [ -z ${TARGET} ] && continue
-					( # put entire umount and find/rm block into background
+          ( # put entire umount and find/rm block into background
             umount -f ${TARGET}
-            [ "${REMOVEDIRS}" = YES ] && find ${TARGET} -type d -empty -maxdepth 1 -exec rm -r {} '+'
-				  ) &
+            __remove_dir "${TARGET}"
+            __log "${DEV}:removed '${TARGET}'"
+          ) &
           unset TARGET
           __log "${DEV}:umount"
         done
     __log "${DEV}:detach"
+    __remove_dir "${MNTPREFIX}/${1}"
+    __log "${DEV}:removed '${MNTPREFIX}/${1}'"
     ;;
 
 esac
diff --git a/port/distfiles/automount-1.3.1.tar.gz b/port/distfiles/automount-1.3.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b8e10b65a6e9ae6af25f7e356f406d6aa0e27836
GIT binary patch
literal 3532
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
GPyhff@BefF

literal 0
HcmV?d00001

diff --git a/port/distfiles/automount-1.3.1/automount b/port/distfiles/automount-1.3.1/automount
new file mode 100755
index 0000000..88acda9
--- /dev/null
+++ b/port/distfiles/automount-1.3.1/automount
@@ -0,0 +1,244 @@
+#! /bin/sh -x
+
+# Copyright (c) 2012 Slawomir Wojciech Wojtczak (vermaden)
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that following conditions are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS '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 OR CONTRIBUTORS 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.
+
+PATH=${PATH}:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+
+__usage() {
+    cat << EOF
+AUTOMOUNT is a devd(8) based automounter for FreeBSD.
+
+It supports following file systems:
+UFS/FAT/exFAT/NTFS/EXT2/EXT3/EXT4
+
+It needs these ports to mount NTFS/exFAT/EXT4 respectively:
+ o sysutils/fusefs-ntfs
+ o sysutils/fusefs-exfat
+ o sysutils/fusefs-ext4fuse
+
+By default it mounts/unmounts all removable media but
+it is possible to set some additional options at the
+/usr/local/etc/automount.conf config file.
+
+Below is a list of possible options with description.
+
+MNTPREFIX (set to /media by default)
+  With this options You can alter the default root
+  for mounting the removable media, for example to
+  the /mnt directory.
+
+  example: MNTPREFIX="/media"
+
+ENCODING (set to en_US.ISO8859-1 by default)
+  Only used with FAT32 mounts, specifies which
+  encoding to use at the mount.
+
+  example: ENCODING="pl_PL.ISO8859-2"
+
+CODEPAGE (set to cp437 by default)
+  Only used with FAT32 mounts, specifies which
+  code page to use at the mount.
+
+  example: CODEPAGE="cp852"
+
+USER (unset by default)
+  If set to some username, the mount command will
+  chown(1) the mount directory with the user and
+  its primary user group. If used with FM option
+  allows to launch the specified file manager after
+  a successful mount.
+
+  example: USER="vermaden"
+
+FM (unset by default)
+  If set to file manager command, the mount will
+  launch the specified command after successful
+  mount. Works only if USER parameter is also set.
+
+  example: FM="nautilus --browser --no-desktop"
+
+USERUMOUNT (set to NO by default)
+  When set to YES it will 'chmod +s /sbin/umount'
+  which would allow an USER to unmount the file
+  system with their selected file manager.
+
+  example: USERUMOUNT="YES"
+
+ATIME (set to YES by default)
+  When set to NO it will mount filesystems with
+  noatime options when possible.
+
+  example: ATIME="NO"
+
+REMOVEDIRS (set to NO by default)
+  When set to YES it will remove empty directories
+  under the used ${MNTPREFIX} after device detach.
+
+  example: REMOVEDIRS="YES"
+
+EOF
+  exit 0
+}
+
+[ "${1}" = "-h" -o "${1}" = "--help" -o ${#} -eq 0 -o ${#} -eq 1 ] && __usage
+
+[ -f /usr/local/etc/automount.conf ] && . /usr/local/etc/automount.conf
+
+: ${MNTPREFIX="/media"}               # mount prefix
+: ${LOG="/var/log/automount.log"}     # log file
+: ${STATE="/var/run/automount.state"} # current state file
+: ${ENCODING="en_US.ISO8859-1"}       # US/Canada
+: ${CODEPAGE="cp437"}                 # US/Canada
+: ${DATEFMT="%Y-%m-%d %H:%M:%S"}      # 2012-02-20 07:49:09
+: ${USERUMOUNT="NO"}                  # when YES add suid bit to umount(8)
+: ${ATIME="YES"}                      # when NO mount with noatime
+: ${REMOVEDIRS="NO"}                  # remove empty dirs under ${MNTPREFIX}
+: ${USER="0"}                         # which user to use for popup
+: ${FM="0"}                           # which file manager to use
+
+[ "${USERUMOUNT}" = YES ] && chmod u+s /sbin/umount # WHEEL group member
+
+__create_mount_point() { # 1=DEV
+  mkdir -p ${MNT}
+  [ "${USER}" = 0 ] || chown ${USER}:$( id -g -n ${USER} ) ${MNT}
+}
+
+__check_already_mounted() { # 1=MNT
+  mount | grep " ${1} " 1> /dev/null 2> /dev/null && {
+    __log "${DEV}:already mounted (ntfs)"
+    exit 0
+  }
+}
+
+__state_add() { # 1=DEV 2=PROVIDER 3=MNT
+  grep -E "${3}$" ${STATE} 1> /dev/null 2> /dev/null && {
+    __log "${1}:duplicated '${STATE}'"
+    exit 0
+  }
+  echo "${1} ${2} ${3}" >> ${STATE}
+}
+
+__state_remove() { # 1=MNT
+  BSMNT=$( echo ${1} | sed 's/\//\\\//g' ) # backslash the slashes ;)
+  sed -i '' "/${BSMNT}\$/d" ${STATE}
+}
+
+__remove_dir() { # 1=TARGET
+  [ "${REMOVEDIRS}" = YES ] \
+    && find "${1}" -type d -empty -maxdepth 1 -exec rm -r {} '+'
+}
+
+__log() { # @=MESSAGE
+  echo $( date +"${DATEFMT}" ) ${@} >> ${LOG}
+}
+
+DEV=/dev/${1}
+
+case ${2} in
+  (attach)
+    ADD=0
+    MNT="${MNTPREFIX}/${1}"
+    __check_already_mounted ${MNT}
+    [ "${ATIME}" = NO ] && OPTS="noatime"
+    case $( file -b -L -s ${DEV} | sed -E 's/label:\ \".*\"//g' ) in
+      (*FAT*) # must be before NTFS section: newfs_msdos -O NTFS -L NTFS
+        __create_mount_point ${DEV}
+        fsck_msdosfs -y ${DEV}
+        mount_msdosfs -o large -D ${CODEPAGE} -L ${ENCODING} \
+                      -m 644 -M 755 ${DEV} ${MNT} && ADD=1
+        __log "${DEV}:mount (fat)"
+        ;;
+      (*NTFS*) # must be after FAT section: newfs_msdos -O NTFS -L NTFS
+        __create_mount_point ${DEV}
+        which ntfs-3g 1> /dev/null 2> /dev/null && {
+          ntfs-3g -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ntfs
+        } || {
+          [ "${USER}" = 0 ] || OPTS="-u ${USER} -g $( id -g -n ${USER} )"
+          mount_ntfs ${OPTS} -o noatime ${DEV} ${MNT} && ADD=1
+        }
+        __log "${DEV}:mount (ntfs)"
+        ;;
+      (*ext2*)
+        __create_mount_point ${DEV}
+        fsck.ext2 -y ${DEV}
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
+        __log "${DEV}:mount (ext2)"
+        ;;
+      (*ext3*)
+        __create_mount_point ${DEV}
+        fsck.ext3 -y ${DEV}
+        mount -t ext2fs -o ${OPTS} ${DEV} ${MNT} && ADD=1
+        __log "${DEV}:mount (ext3)"
+        ;;
+      (*ext4*)
+        __create_mount_point ${DEV}
+        fsck.ext4 -y ${DEV}
+        ext4fuse ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-ext4fuse
+        __log "${DEV}:mount (ext4)"
+        ;;
+      (*Unix\ Fast\ File*)
+        __create_mount_point ${DEV}
+        fsck_ufs -C -y ${DEV}
+        mount -o ${OPTS} ${DEV} ${MNT} && ADD=1
+        __log "${DEV}:mount (ufs)"
+        ;;
+      (*)
+        case $( dd < ${DEV} count=1 2> /dev/null | strings | head -1 ) in
+          (*EXFAT*)
+            __create_mount_point ${DEV}
+            mount.exfat -o ${OPTS} ${DEV} ${MNT} && ADD=1 # sysutils/fusefs-exfat
+            __log "${DEV}:mount (exfat)"
+            ;;
+        esac
+        ;;
+    esac
+    [ ${ADD} -eq 1 ] && {
+      ADD=0
+      PROVIDER=$( mount | grep -m 1 " ${MNT} " | awk '{printf $1}' )
+      __state_add ${DEV} ${PROVIDER} ${MNT}
+      [ "${USER}" != 0 ] && [ "${FM}" != 0 ] \
+        && su - ${USER} -c "env DISPLAY=:0 ${FM} ${MNT} &"
+    }
+    ;;
+
+  (detach)
+    grep -E "${MNTPREFIX}/${1}$" ${STATE} \
+      | while read DEV PROVIDER MNT
+        do
+          TARGET=$( mount | grep -E "^${PROVIDER} " | awk '{print $3}' )
+          __state_remove ${MNT}
+          [ -z ${TARGET} ] && continue
+          ( # put entire umount and find/rm block into background
+            umount -f ${TARGET}
+            __remove_dir "${TARGET}"
+            __log "${DEV}:removed '${TARGET}'"
+          ) &
+          unset TARGET
+          __log "${DEV}:umount"
+        done
+    __log "${DEV}:detach"
+    __remove_dir "${MNTPREFIX}/${1}"
+    __log "${DEV}:removed '${MNTPREFIX}/${1}'"
+    ;;
+
+esac
diff --git a/port/distfiles/automount-1.3.1/automount.conf b/port/distfiles/automount-1.3.1/automount.conf
new file mode 100644
index 0000000..1ba5f6c
--- /dev/null
+++ b/port/distfiles/automount-1.3.1/automount.conf
@@ -0,0 +1,7 @@
+USERUMOUNT=YES
+ATIME=NO
+REMOVEDIRS=YES
+FM="nautilus --browser --no-desktop"
+USER=vermaden
+ENCODING=pl_PL.ISO8859-2
+CODEPAGE=cp852
diff --git a/port/distfiles/automount-1.3.1/automount.conf.sample b/port/distfiles/automount-1.3.1/automount.conf.sample
new file mode 100644
index 0000000..a2d89cd
--- /dev/null
+++ b/port/distfiles/automount-1.3.1/automount.conf.sample
@@ -0,0 +1,5 @@
+USERUMOUNT=YES
+FM="nautilus --browser --no-desktop"
+USER=vermaden
+ENCODING=pl_PL.ISO8859-2
+CODEPAGE=cp852
diff --git a/port/distfiles/automount-1.3.1/automount_devd.conf b/port/distfiles/automount-1.3.1/automount_devd.conf
new file mode 100644
index 0000000..2614c98
--- /dev/null
+++ b/port/distfiles/automount-1.3.1/automount_devd.conf
@@ -0,0 +1,14 @@
+notify 100 {
+  match "system" "DEVFS";
+  match "type" "CREATE";
+  match "cdev" "(da|mmcsd)[0-9]+";
+  action "/usr/local/sbin/automount $cdev attach";
+};
+
+notify 100 {
+  match "system" "DEVFS";
+  match "type" "DESTROY";
+  match "cdev" "(da|mmcsd)[0-9]+";
+  action "/usr/local/sbin/automount $cdev detach";
+};
+
diff --git a/port/sysutils/automount/Makefile b/port/sysutils/automount/Makefile
index 5a23225..cac09f4 100644
--- a/port/sysutils/automount/Makefile
+++ b/port/sysutils/automount/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=     automount
-PORTVERSION=  1.3
+PORTVERSION=  1.3.1
 CATEGORIES=   sysutils
 MASTER_SITES= https://github.com/vermaden/automount/port/distfiles/
 
diff --git a/port/sysutils/automount/distinfo b/port/sysutils/automount/distinfo
index b37b7d4..c1949e3 100644
--- a/port/sysutils/automount/distinfo
+++ b/port/sysutils/automount/distinfo
@@ -1,2 +1,2 @@
-SHA256 (automount-1.3.tar.gz) = 50f403681725f8bc59f35190c520dbce9c965608a8d61a46bcbef52f28d58d72
-SIZE (automount-1.3.tar.gz) = 3492
+SHA256 (automount-1.3.1.tar.gz) = 3f37c223d33d6e830f693d3ff57a516d14dbd32a0ee854beb1e2a1d848528663
+SIZE (automount-1.3.1.tar.gz) = 3532