Update to 1.710

3 files changed, 18 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca56813a554c..edd3f36257be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = usermin
-	pkgdesc = A web-based interface for users
-	pkgver = 1.701
-	pkgrel = 2
+	pkgdesc = A web-based user account administration interface
+	pkgver = 1.710
+	pkgrel = 1
 	url = http://www.webmin.com/
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = usermin
 	depends = perl
 	depends = perl-net-ssleay
 	depends = perl-authen-pam
+	depends = perl-encode-detect
+	depends = openssl
 	optdepends = webmin: A web-based interface for system administration
 	options = !strip
 	options = !zipman
@@ -50,18 +52,19 @@ pkgbase = usermin
 	backup = etc/usermin/tunnel/config
 	backup = etc/usermin/updown/config
 	backup = etc/usermin/usermount/config
+	backup = etc/logrotate.d/usermin
 	backup = etc/pam.d/usermin
-	source = http://downloads.sourceforge.net/sourceforge/webadmin/usermin-1.701.tar.gz
+	source = http://downloads.sourceforge.net/sourceforge/webadmin/usermin-1.710.tar.gz
 	source = setup-pre.sh
 	source = setup-post.sh
 	source = usermin-config.tar.bz2
 	source = usermin.pam
 	source = usermin.logrotate
 	source = usermin.service
-	sha256sums = 93a1be3cee975dd3d4e64d27b09cf252750949eaad7b62f5d5bb88d4edb2da28
+	sha256sums = ca2365ef67f78dca75f1b58af5ab53983c2892ab5164fe14cae58bb6bb18a5ca
 	sha256sums = 366e0315307c89bb0ec10d76c22352de93b92ca556f7f7bb6e34eb1b17d26a9c
 	sha256sums = 17102b3583190f64fae039ca5270ae823cae90ed60fdb2dd49aba95496bff559
-	sha256sums = a05c4d471977282736ac89f4d4d379a91b70678348b1a1b91ce23ebff3c8bfce
+	sha256sums = c0ff7f1dfdbe7c4265ebae5a7033d46e2a3f729f092f2c975b05ae7ef4034d6d
 	sha256sums = a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d
 	sha256sums = 73b47189419d107e3be2cce131123c73e4d1c954c14f53c223f332da0348681c
 	sha256sums = 6f40dfcd8f1530639b7a8db2cd5401be74d1416ce1116b8f36b0542a85c8d3cf
diff --git a/PKGBUILD b/PKGBUILD
index a05fe2629dc8..d45570228329 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Amish <contact at via dot aur>
 
 pkgname=usermin
-pkgver=1.701
-pkgrel=2
-pkgdesc="A web-based interface for users"
+pkgver=1.710
+pkgrel=1
+pkgdesc="A web-based user account administration interface"
 arch=(i686 x86_64)
 license=('custom:webmin')
 url="http://www.webmin.com/"
-depends=('perl' 'perl-net-ssleay' 'perl-authen-pam')
+depends=('perl' 'perl-net-ssleay' 'perl-authen-pam' 'perl-encode-detect' 'openssl')
 optdepends=('webmin: A web-based interface for system administration')
 backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' \
 'etc/usermin/config' 'etc/usermin/webmin.acl' 'etc/usermin/user.acl' \
@@ -44,6 +44,7 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' \
 'etc/usermin/tunnel/config' \
 'etc/usermin/updown/config' \
 'etc/usermin/usermount/config' \
+'etc/logrotate.d/usermin' \
 'etc/pam.d/usermin' )
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
         setup-pre.sh
@@ -61,43 +62,20 @@ prepare() {
     rm -r caldera usermin-init usermin-daemon install-module.pl
 
     # remove config files for other distros, make Arch linux related additions
-    find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*' -exec rm '{}' \+
+    find . ! -name 'config-generic-linux' ! -name 'config-ALL-linux' ! -name 'config-lib.pl' -name 'config-*' -exec rm '{}' \+
     echo 'Archlinux	Any version	generic-linux	*	-d "/etc/pacman.d"' > os_list.txt
     cp -rp "$srcdir"/usermin-config/* "$srcdir"/$pkgname-$pkgver/
     install -m 700 "$srcdir"/setup-{pre,post}.sh "$srcdir"/$pkgname-$pkgver/
-
-    # fix setup.sh
-    sed -i -e 's:exit 13::g' "$srcdir"/$pkgname-$pkgver/setup.sh
 }
 
 package() {
     # create basic directories
     mkdir -p "$pkgdir"/{etc,opt,var/log}
 
-    config_dir="$pkgdir"/etc/usermin
-    var_dir="$pkgdir"/var/log/usermin
-    perl=/usr/bin/perl
-    autoos=1
-    port=20000
-    ssl=1
-    atboot=0
-    nostart=1
-    nochown=1
-    autothird=1
-    nouninstall=1
-    atbootyn=n
-    tempdir="$pkgdir"/tmp
-    pam=usermin
-    export config_dir var_dir perl autoos port ssl atboot nostart nochown autothird nouninstall atbootyn tempdir pam
+    export archpkgdir="$pkgdir"
     cd "$srcdir"/$pkgname-$pkgver
     "$srcdir"/$pkgname-$pkgver/setup.sh "$pkgdir"/opt/usermin
 
-    # more logging, other config changes and use pam
-    sed -i -e 's:^theme=.*$:theme=authentic-theme:' "$pkgdir"/etc/usermin/config
-    echo -e 'logfiles=1\nlogfullfiles=1\ngotoone=1\nnoremember=1\nshowlogin=1' >> "$pkgdir"/etc/usermin/config
-    sed -i -e 's:^pidfile=.*$:pidfile=/run/usermin.pid:' -e 's:^preroot=.*$:preroot=authentic-theme:' "$pkgdir"/etc/usermin/miniserv.conf
-    echo -e 'syslog=1\npam_only=1\npam_end=1\npam_conv=\nno_pam=0\nlogouttime=10\nuser_mapping_reverse=1' >> "$pkgdir"/etc/usermin/miniserv.conf
-
     # fix the config files to use their real locations
     find "$pkgdir"/etc/usermin -type f -exec sed -i -e "s:$pkgdir::g" {} \+
 
@@ -113,10 +91,10 @@ package() {
 }
 
 
-sha256sums=('93a1be3cee975dd3d4e64d27b09cf252750949eaad7b62f5d5bb88d4edb2da28'
+sha256sums=('ca2365ef67f78dca75f1b58af5ab53983c2892ab5164fe14cae58bb6bb18a5ca'
             '366e0315307c89bb0ec10d76c22352de93b92ca556f7f7bb6e34eb1b17d26a9c'
             '17102b3583190f64fae039ca5270ae823cae90ed60fdb2dd49aba95496bff559'
-            'a05c4d471977282736ac89f4d4d379a91b70678348b1a1b91ce23ebff3c8bfce'
+            'c0ff7f1dfdbe7c4265ebae5a7033d46e2a3f729f092f2c975b05ae7ef4034d6d'
             'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d'
             '73b47189419d107e3be2cce131123c73e4d1c954c14f53c223f332da0348681c'
             '6f40dfcd8f1530639b7a8db2cd5401be74d1416ce1116b8f36b0542a85c8d3cf')
diff --git a/usermin-config.tar.bz2 b/usermin-config.tar.bz2
index 89b45cdf8959..a9edb977af92 100644
--- a/usermin-config.tar.bz2
+++ b/usermin-config.tar.bz2