webmin: update to 1.680. closes #965

runit-scripts: add webmin service

8 files changed, 63 insertions, 107 deletions

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 7bc5103..d97d14f 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.1
-pkgrel=14
+pkgrel=15
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/extra/webmin/run b/abs/core/runit-scripts/runitscripts/services/webmin/run
index 659c6cd..659c6cd 100644
--- a/abs/extra/webmin/run
+++ b/abs/core/runit-scripts/runitscripts/services/webmin/run
diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index f022902..bf05a4f 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.570
+pkgver=1.680
 pkgrel=1
 pkgdesc="a web-based interface for system administration"
 arch=(i686 x86_64)
 license=('custom:webmin')
 url="http://www.webmin.com/"
-depends=('perl')
+depends=('perl' 'perl-perl4-corelibs')
 makedepends=('perl-net-ssleay')
 backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
 'etc/webmin/pacman/config' \
@@ -83,18 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi
 'etc/webmin/pserver/config' \
 'etc/webmin/dnsadmin/config' )
 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
-	run) 
+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.service)
 options=(!strip)
 
-build() {
+package() {
   # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   # add patches from webmin.com
-  #for i in ../*.wbm 
+  #for i in ../*.wbm
   #do tar xvf $i
   #done
   #for i in ../*.wbt
@@ -104,13 +103,13 @@ build() {
   rm -f mount/freebsd-mounts*
   rm -f mount/openbsd-mounts*
   rm -f mount/macos-mounts*
-  
+
   # remove modules we do not support
   rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-  
+
   #remove config files from other distros
   rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
+
   # remove caldera theme
   rm -rf caldera
 
@@ -125,33 +124,33 @@ build() {
   rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
 
   # remove modules add because we don't want files installed without pacman control
-  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
+  rm -f webmin/{install_mod.cgi,delete_mod.cgi}
 
   # setting perl path
   (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
+
   # create dirs
-  mkdir -p $startdir/pkg/opt/webmin
-  mkdir -p $startdir/pkg/var/log/webmin
-  mkdir -p $startdir/pkg/etc/webmin
-  
+  mkdir -p "$pkgdir"/opt/webmin
+  mkdir -p "$pkgdir"/var/log/webmin
+  mkdir -p "$pkgdir"/etc/webmin
+
   # install pam stuff
-  install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin
-  
+  install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
+
   # remove other distros and add only Archlinux don't change next line else it will not work!
   rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
+  echo 'LinHES			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
+
   # Add rc.conf support to boot and shutdown menu and lock editing of this module
   cd init/
   sed -i -e 's:^local_down=.*:local_down=Archlinux RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
-  sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
+  sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
   sed -i -e 's:^index_downscript=.*:index_downscript=Archlinux RC.CONF:g' lang/*
   sed -i -e 's:^index_script=.*:index_script=Archlinux RC.LOCAL:g' lang/*
   sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
 
   # Add pacman menu
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   cp -rf custom/ pacman
   cp -rf mscstyle3/custom mscstyle3/pacman
   sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
@@ -162,14 +161,14 @@ build() {
   sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
 
   # copy stuff to right dirs
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rp * $startdir/pkg/opt/webmin
-  cd $startdir/src/webmin-config
-  cp -rfp * $startdir/pkg/opt/webmin
+  cd "$srcdir"/$pkgname-$pkgver
+  cp -rp * "$pkgdir"/opt/webmin
+  cd "$srcdir"/webmin-config
+  cp -rfp * "$pkgdir"/opt/webmin
 
   # define parameters for setup.sh
-  config_dir=$startdir/pkg/etc/webmin
-  var_dir=$startdir/pkg/var/log/webmin
+  config_dir="$pkgdir"/etc/webmin
+  var_dir="$pkgdir"/var/log/webmin
   perl=/usr/bin/perl
   autoos=1
   port=10000
@@ -183,44 +182,35 @@ build() {
   nouninstall=1
   noperlpath=1
   atbootyn=n
-  tempdir=$startdir/pkg/tmp
+  tempdir="$pkgdir"/tmp
   export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-  
+
   # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh
-  $startdir/pkg/opt/webmin/setup.sh
-  
+  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
+  "$pkgdir"/opt/webmin/setup.sh
+
   # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf
-  find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
-  
-  # make it only accessible by localhost and private networks
-  echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> $startdir/pkg/etc/webmin/miniserv.conf
-	
-  # Let's not fork this bad boy.  We need to control it w/ runit.
-  echo 'nofork=1' >> $startdir/pkg/etc/webmin/miniserv.conf
-  
-  # runit
-  mkdir -p $startdir/pkg/etc/sv/webmin/supervise
-  install -D -m 755 $startdir/src/run $startdir/pkg/etc/sv/webmin
+  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
+
+  # make it only accessible by localhost
+  echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> "$pkgdir"/etc/webmin/miniserv.conf
 
   # install pacman menu
-  cd $startdir/src/webmin-pacman/config
-  cp -rfp * $startdir/pkg/etc/webmin/pacman
+  cd "$srcdir"/webmin-pacman/config
+  cp -rfp * "$pkgdir"/etc/webmin/pacman
 
-  #install rc file
-  install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
+  # install systemd files
+  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
 
   # delete temp dir
-  rm -r $startdir/pkg/tmp
+  rm -r "$pkgdir"/tmp
   # change sticky bit
   chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
   # install license
-  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
+  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-
-md5sums=('20b4f488637366c39458b9b93162eff3'
-         'da6bea412a5be8cf82a813078fec5847'
+md5sums=('52654bd0fe36e9cace00fa74e49d41d8'
+         'b0b3e3fb231a12e60165b6b4d604dcfa'
          'bfebb75bb94029b48c46b7f1ba1aa811'
-         '0673e51af0e81418b4a6c1e205f7e5cd'
-         'bc578b249e2090deb84119a626c53c48')
+         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/abs/extra/webmin/__changelog b/abs/extra/webmin/__changelog
new file mode 100644
index 0000000..9f14075
--- /dev/null
+++ b/abs/extra/webmin/__changelog
@@ -0,0 +1,2 @@
+PKGBUILD: Added private networks
+PKGBUILD: Change OS name to LinHES
diff --git a/abs/extra/webmin/changelog b/abs/extra/webmin/changelog
deleted file mode 100644
index 68b499a..0000000
--- a/abs/extra/webmin/changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-7/10/11 Britney Fransen
--Added runit support to PKGBUILD
--Added private networks to PKGBUILD
diff --git a/abs/extra/webmin/webmin-config.tar.bz2 b/abs/extra/webmin/webmin-config.tar.bz2
index a51b43d..c7869ee 100644
--- a/abs/extra/webmin/webmin-config.tar.bz2
+++ b/abs/extra/webmin/webmin-config.tar.bz2
diff --git a/abs/extra/webmin/webmin.rc b/abs/extra/webmin/webmin.rc
deleted file mode 100644
index ee83fbe..0000000
--- a/abs/extra/webmin/webmin.rc
+++ /dev/null
@@ -1,44 +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
-     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
-     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/abs/extra/webmin/webmin.service b/abs/extra/webmin/webmin.service
new file mode 100644
index 0000000..a8a384a
--- /dev/null
+++ b/abs/extra/webmin/webmin.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Webmin
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/webmin/start
+ExecStop=/etc/webmin/stop
+
+[Install]
+WantedBy=multi-user.target