{user,web}min: updating version and remove rc.d file

4 files changed, 10 insertions, 110 deletions

diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 7d594cdcd..ce9e8735d 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 185710 2013-05-17 13:08:03Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.540
-pkgrel=1.1
+pkgver=1.550
+pkgrel=1
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
 license=('custom:usermin')
@@ -44,7 +44,6 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/co
 )
 install=usermin.install
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	usermin.rc 
 	usermin.service
 	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
 
@@ -119,16 +118,12 @@ package() {
 
   #install systemd service file
   install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
- 
- #install rc file
-  install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin
 
   # delete temp dir
   rm -r "$pkgdir"/tmp
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('d29c9fdebab14c168c33bde8906efe21'
-         'cfef4490cd1ef9517c0b39a7bd75c968'
+md5sums=('ba764af4b40a7e11be69985e19a81562'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
-         'ec37a79f948f778224550930d2a7ca07')
+         '23be2b673f35a3a0be1bde250f6300e1')
diff --git a/libre/usermin/usermin.rc b/libre/usermin/usermin.rc
deleted file mode 100644
index af365780a..000000000
--- a/libre/usermin/usermin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/usermin/start
-stop=/etc/usermin/stop
-lockfile=/var/lock/usermin
-
-case "$1" in
-'start')
-     stat_busy "Starting Usermin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Usermin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $stop && $start
-     RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 094f14b34..c575fffc1 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 185708 2013-05-17 13:04:19Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.620
-pkgrel=1.1
-pkgdesc="a web-based interface for system administration, Parabola rebranded"
+pkgver=1.630
+pkgrel=1
+pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
 license=('custom:webmin')
 url="http://www.webmin.com/"
@@ -86,7 +86,6 @@ install=webmin.install
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
 	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
 	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.rc
 	webmin.service) 
 options=(!strip)
 
@@ -201,9 +200,6 @@ package() {
   cd "$srcdir"/webmin-pacman/config
   cp -rfp * "$pkgdir"/etc/webmin/pacman
 
-  #install rc file
-  install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin
-
   # install systemd files
   install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
 
@@ -214,8 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044'
+md5sums=('c52551ed405fcb67ea9d383ac6a32658'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'bfebb75bb94029b48c46b7f1ba1aa811'
-         'c77dfcd621b417a7826d25f56a1e60ae'
          'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/libre/webmin/webmin.rc b/libre/webmin/webmin.rc
deleted file mode 100644
index 6aac8941d..000000000
--- a/libre/webmin/webmin.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/webmin/start
-stop=/etc/webmin/stop
-lockfile=/var/lock/webmin
-
-case "$1" in
-'start')
-     stat_busy "Starting Webmin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     add_daemon webmin
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Webmin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     rm_daemon webmin
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $0 stop
-     $0 start
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file