From 71b43f2a32f4005814836f17cdf0fe6c530d6aae Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Sun, 4 Mar 2012 09:29:44 +0100
Subject: [PATCH] 1.3

---
 automount                                     |  40 +--
 port/distfiles/automount-1.3.tar.gz           | Bin 0 -> 3492 bytes
 port/distfiles/automount-1.3/automount        | 236 ++++++++++++++++++
 port/distfiles/automount-1.3/automount.conf   |   7 +
 .../automount-1.3/automount.conf.sample       |   5 +
 .../automount-1.3/automount_devd.conf         |  14 ++
 port/sysutils/automount/Makefile              |   2 +-
 port/sysutils/automount/distinfo              |   4 +-
 8 files changed, 287 insertions(+), 21 deletions(-)
 create mode 100644 port/distfiles/automount-1.3.tar.gz
 create mode 100755 port/distfiles/automount-1.3/automount
 create mode 100644 port/distfiles/automount-1.3/automount.conf
 create mode 100644 port/distfiles/automount-1.3/automount.conf.sample
 create mode 100644 port/distfiles/automount-1.3/automount_devd.conf

diff --git a/automount b/automount
index ed913cd..2d22d13 100755
--- a/automount
+++ b/automount
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -x
 
 # Copyright (c) 2012 Slawomir Wojciech Wojtczak (vermaden)
 # All rights reserved.
@@ -154,44 +154,45 @@ case ${2} in
     ADD=0
     MNT="${MNTPREFIX}/${1}"
     __check_already_mounted ${MNT}
-    __create_mount_point ${DEV}
     [ "${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
-        dd < ${DEV} count=1 2> /dev/null | strings | grep "FAT32" && {
-          fsck_msdosfs -y ${DEV}
-          mount_msdosfs -o large -D ${CODEPAGE} -L ${ENCODING} \
-                        -m 644 -M 755 ${DEV} ${MNT} && ADD=1
-          __log "${DEV}:mount (fat)"
-        }
+        __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
-        dd < ${DEV} count=1 2> /dev/null | strings | head -1 | grep "NTFS" && {
-          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)"
+        __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)"
@@ -199,6 +200,7 @@ case ${2} in
       (*)
         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)"
             ;;
@@ -221,12 +223,14 @@ case ${2} in
           TARGET=$( mount | grep -E "^${PROVIDER} " | awk '{print $3}' )
           __state_remove ${MNT}
           [ -z ${TARGET} ] && continue
-          umount -f ${TARGET} &
+					( # put entire umount and find/rm block into background
+            umount -f ${TARGET}
+            [ "${REMOVEDIRS}" = YES ] && find ${TARGET} -type d -empty -maxdepth 1 -exec rm -r {} '+'
+				  ) &
           unset TARGET
           __log "${DEV}:umount"
         done
     __log "${DEV}:detach"
-    [ "${REMOVEDIRS}" = YES ] && find ${MNTPREFIX} -type d -empty -maxdepth 1 -delete
     ;;
 
 esac
diff --git a/port/distfiles/automount-1.3.tar.gz b/port/distfiles/automount-1.3.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2f5a90eeadd4600892037c4c6696d6e3bea8aac9
GIT binary patch
literal 3492
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
Slv4ha<^KRibaht%Pyhh$-yI78

literal 0
HcmV?d00001

diff --git a/port/distfiles/automount-1.3/automount b/port/distfiles/automount-1.3/automount
new file mode 100755
index 0000000..2d22d13
--- /dev/null
+++ b/port/distfiles/automount-1.3/automount
@@ -0,0 +1,236 @@
+#! /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}
+}
+
+__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 "${PREFIX}/${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}
+            [ "${REMOVEDIRS}" = YES ] && find ${TARGET} -type d -empty -maxdepth 1 -exec rm -r {} '+'
+				  ) &
+          unset TARGET
+          __log "${DEV}:umount"
+        done
+    __log "${DEV}:detach"
+    ;;
+
+esac
diff --git a/port/distfiles/automount-1.3/automount.conf b/port/distfiles/automount-1.3/automount.conf
new file mode 100644
index 0000000..1ba5f6c
--- /dev/null
+++ b/port/distfiles/automount-1.3/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/automount.conf.sample b/port/distfiles/automount-1.3/automount.conf.sample
new file mode 100644
index 0000000..a2d89cd
--- /dev/null
+++ b/port/distfiles/automount-1.3/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/automount_devd.conf b/port/distfiles/automount-1.3/automount_devd.conf
new file mode 100644
index 0000000..2614c98
--- /dev/null
+++ b/port/distfiles/automount-1.3/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 7799df0..5a23225 100644
--- a/port/sysutils/automount/Makefile
+++ b/port/sysutils/automount/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=     automount
-PORTVERSION=  1.2.1
+PORTVERSION=  1.3
 CATEGORIES=   sysutils
 MASTER_SITES= https://github.com/vermaden/automount/port/distfiles/
 
diff --git a/port/sysutils/automount/distinfo b/port/sysutils/automount/distinfo
index 8337a25..b37b7d4 100644
--- a/port/sysutils/automount/distinfo
+++ b/port/sysutils/automount/distinfo
@@ -1,2 +1,2 @@
-SHA256 (automount-1.2.1.tar.gz) = cfb646a24c06630f29979a6834096587a0b564e2343502dcd0563c306d93b291
-SIZE (automount-1.2.1.tar.gz) = 3455
+SHA256 (automount-1.3.tar.gz) = 50f403681725f8bc59f35190c520dbce9c965608a8d61a46bcbef52f28d58d72
+SIZE (automount-1.3.tar.gz) = 3492