system/davfs2: Updated for version 1.4.7

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 44 insertions, 60 deletions

diff --git a/system/davfs2/MINI_HOWTO b/system/davfs2/MINI_HOWTO
index e7f6914f51bc1..698c4151c9ebd 100644
--- a/system/davfs2/MINI_HOWTO
+++ b/system/davfs2/MINI_HOWTO
@@ -8,97 +8,83 @@ Amend as required for your choice of username.
 2. Define a davfs2 group and user:
 
 	# groupadd -g 230 davfs2
-	# useradd -u 230 -d /var/cache/davfs2 -g davfs2 davfs2
+	# useradd -u 230 -d /var/cache/davfs2 -g davfs2 -s /bin/false davfs2
 
-3. If (and only if) you have a Slack64 install;
-	# export ARCH=x86_64
-   
-4. You may want to set the Package type that you will build:
-	# export PKGTYPE=txz
-
-5. Build and install your package:
-	# tar xvf  davfs2.tar.gz
-	# cd davfs2
-	# wget http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.4.6.tar.gz
-	# ./davfs.SlackBuild 
-	# installpkg /tmp/davfs2-1.4.5-x86_64-2_SBo.txz
+3. Build and install davfs2 as usual.
 
-6. Add the user if not already defined. My user shall be called user, so:
+4. Add the user if not already defined. My user shall be called chris, so:
 
-	# adduser user
+	# adduser chris
    
    Read the Slackbook for more details on adduser, choose default settings BUT:
    with the default group list add also davfs2:
 
 	Press ENTER to continue without adding any additional groups
 	Or press the UP arrow to add/select/edit additional groups
-	:  audio cdrom floppy plugdev video power netdev davfs2
+        :  audio cdrom floppy plugdev video power netdev lp scanner davfs2
 
    If the user was already defined, then add davfs2 to the groups:
 	
-	# usermod -ga davfs2 user
+	# usermod -aG davfs2 chris
 
-7. Edit /etc/fstab with the following line:
+5. Edit /etc/fstab with the following line:
 	WEBDAV_SERVER_URL		mount_point		davfs	noauto,user	0	0
 	
 	For example:
-	https://example.org/user	/home/user/mnt/dav   	davfs   noauto,user	0	0
+	https://example.org/chris	/home/chris/mnt/dav   	davfs   noauto,user	0	0
 
-8. logout
+6. logout
 
-9. Login again as your davfs user ("user" in my case).
+7. Login again as your davfs user ("chris" in my case).
 
-10. 	$ mkdir -p $HOME/.davfs2/certs/private/ $HOME/mnt/dav
+8. 	$ mkdir -p $HOME/.davfs2/certs/private/ $HOME/mnt/dav
 
-11. Move the certificate to $HOME/davfs2/certs/private and restrict the permission to rw-------:
-    For example:
+9. Move the certificate to $HOME/davfs2/certs/private and restrict the permission to rw-------:
+        For example:
 
 	$ mv CERTIFICATE.pfx	$HOME/.davfs2/certs/private/
-	$ chmod 600 $HOME/.davfs2/certs/private/CERIFICATE.pfx
+	$ chmod 600 $HOME/.davfs2/certs/private/CERIFICATE.PFX
 
-12. Optionally: Switch user to root and copy the system configuration file. 
-    Then change ownership to the davfs user and exit back to the davfs user. There 
-    are a lot of interesting comments in these files that might be helpful.
+10. Optionally: Copy the system configuration file. There are a lot of
+    interesting comments in these files that might be helpful.
 
-	$ su -
-	# cp /etc/davfs2/davfs2.conf ~user/.davfs2/
-	# cp /etc/davfs2/secrets ~user/.davfs2/
-	# chown -R user:users ~user/.davfs2/
-	# exit
+	$ cp /usr/share/davfs2/* $HOME/.davfs2/
 
-13. Edit $HOME/.davfs2/davfs2.conf with the following line:
+11. Edit $HOME/.davfs2/davfs2.conf with the following line:
 
-	clientcert	~/.davfs2/certs/private/CERTIFICATE.pfx
+	clientcert	~/.davfs2/certs/private/CERTIFICATE.PFX
 
    Read: 
 
 	$ man davfs2.conf 
 
-   for all the details and options. Tests have shown that you do not need more
-   than the line above, but you may want to set many other interesting 
-   parameters.
+   for all the details and options. Tests have shown that you might need more
+   than the line above, so you may want to read about other interesting
+   parameters, e.g.:
+
+        add_header	Translate F
 
-14. Edit $HOME/.davfs2/secrets with the following 2 lines:
+12. Edit $HOME/.davfs2/secrets with the following 2 lines:
 
-	/home/user/mnt/dav		username	password
-	CERTIFICATE.pfx			passphrase
+	/home/chris/mnt/dav		username	password
+	CERTIFICATE.PFX			passphrase
 
     The username and password are relevant to the Webdav server, not for the
     local account.
     passphrase is the password for the PFX certificate
     You should obtain all these from the Webdav server Administrator
 
-15. Restrict permssion for $HOME/.davfs2/secrets to rw-------:
+13. Restrict permssion for $HOME/.davfs2/secrets to rw-------:
 
  	$ chmod 600 $HOME/.davfs2/secrets
 
-16. Mount the davfs service on $HOME/mnt/dav 
+14. Mount the davfs service on $HOME/mnt/dav 
 
 	$ mount https://example.org/user
 
     You should be able to see your WEBDAV server on $HOME/mnt/user 
 
-17. When you would like to disconnect:
+15. When you would like to disconnect:
 
 	$ umount $HOME/mnt/dav
 
diff --git a/system/davfs2/README b/system/davfs2/README
index d5611f7cdafe5..fb60cc77430a3 100644
--- a/system/davfs2/README
+++ b/system/davfs2/README
@@ -4,8 +4,8 @@ provides the ability to access such resources like a typical filesystem,
 allowing for use by standard applications with no built-in support for WebDAV.
 
 Before running this SlackBuild, define a davfs2 group and a davfs2 user. The 
-davfs2 user shall have davfs2 as its initial group, shall not have a shell and
-the home directory shall be /var/cache/davfs.  Examples:
+davfs2 user shall have davfs2 as its initial login group, shall not have a
+shell and the home directory shall be /var/cache/davfs. Examples:
 
 # groupadd -g 230 davfs2
-# useradd -u 230 -d /var/cache/davfs2 -g davfs2 davfs2
+# useradd -u 230 -d /var/cache/davfs2 -g davfs2 -s /bin/false davfs2
diff --git a/system/davfs2/davfs2.SlackBuild b/system/davfs2/davfs2.SlackBuild
index 6b88f56417343..8e5385ac5e86c 100644
--- a/system/davfs2/davfs2.SlackBuild
+++ b/system/davfs2/davfs2.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for davfs2
 
-# Copyright (c) 2008, Justin H Haynes <justin@justinhaynes.com> 
+# Copyright (c) 2012  Chris Abela, Malta
+# Copyright (c) 2008, Justin H Haynes <justin@justinhaynes.com>
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -19,19 +20,17 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=davfs2
-VERSION=${VERSION:-1.4.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DAVFS2_USER=${DAVFS2_USER:-davfs2}
 DAVFS2_GROUP=${DAVFS2_GROUP:-davfs2}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -54,7 +53,7 @@ fi
 if ! grep ^$DAVFS2_USER: /etc/passwd > /dev/null 2>&1; then
         echo "$0: Error: DAVFS2 user ($DAVFS2_USER) doesn't exist."
         echo "$0: Try creating one with: \
-	# useradd -u 230 -d /var/cache/davfs2 -g $DAVFS2_GROUP $DAVFS2_USER"
+	# useradd -u 230 -d /var/cache/davfs2 -g $DAVFS2_GROUP -s /bin/false $DAVFS2_USER"
         exit 1
 fi
 
@@ -108,11 +107,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Manpages go to the wrong place regardless of configure, so we'll move them:
 mv $PKG/usr/share/man $PKG/usr
 
-# Let's not clobber config files
+# Let's not clobber the system config files
 mv $PKG/etc/davfs2/davfs2.conf $PKG/etc/davfs2/davfs2.conf.new
 mv $PKG/etc/davfs2/secrets $PKG/etc/davfs2/secrets.new
 
-# --docdir is respected, but we'll add the build script
+cp -a ABOUT-NLS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # davfs2 autobuild places mount.davfs and umount.davfs in /usr/sbin
@@ -125,7 +124,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
   done
 )
 
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/davfs2/davfs2.info b/system/davfs2/davfs2.info
index 725cedb1d5a6c..3c7cac78e8e99 100644
--- a/system/davfs2/davfs2.info
+++ b/system/davfs2/davfs2.info
@@ -1,10 +1,10 @@
 PRGNAM="davfs2"
-VERSION="1.4.6"
+VERSION="1.4.7"
 HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
-DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.4.6.tar.gz"
-MD5SUM="c9e8aeb15daeba4b6283b40bb640e908"
+DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.4.7.tar.gz"
+MD5SUM="c75f9d7d260e7364362b89beba2b3186"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Chris Abela"
-EMAIL="chris.abela@maltats.com"
+EMAIL="kristofru@gmail.com"