Remove modules that are really not supported

PKGBUILD clean up and improvements

1 files changed, 120 insertions, 90 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f9bc58b56481..c937e4914f7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Daniel Milde <daniel at milde dot cz>
+# Maintainer: Amish <contact at via dot aur>
+# Contributor: Daniel Milde <daniel at milde dot cz>
+# Contributor: Felix Schindler <ftschindler at aur dot archlinux>
 
 pkgname=webmin
 pkgver=1.831
@@ -9,75 +11,112 @@ license=('custom:webmin')
 url="http://www.webmin.com/"
 depends=('perl' 'perl-net-ssleay' 'perl-authen-pam')
 backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' \
-'etc/webmin/at/config' \
 'etc/webmin/acl/config' \
-'etc/webmin/lvm/config' \
-'etc/webmin/net/config' \
-'etc/webmin/nis/config' \
-'etc/webmin/pam/config' \
-'etc/webmin/cron/config' \
-'etc/webmin/file/config' \
-'etc/webmin/grub/config' \
-'etc/webmin/init/config' \
-'etc/webmin/ipfw/config' \
-'etc/webmin/proc/config' \
-'etc/webmin/raid/config' \
-'etc/webmin/spam/config' \
-'etc/webmin/sshd/config' \
-'etc/webmin/time/config' \
+'etc/webmin/adsl-client/config' \
+'etc/webmin/ajaxterm/config' \
+'etc/webmin/apache/config' \
+'etc/webmin/at/config' \
+'etc/webmin/backup-config/config' \
+'etc/webmin/bacula-backup/config' \
+'etc/webmin/bandwidth/config' \
+'etc/webmin/bind8/config' \
+'etc/webmin/burner/config' \
+'etc/webmin/change-user/config' \
+'etc/webmin/cluster-copy/config' \
+'etc/webmin/cluster-cron/config' \
 'etc/webmin/cluster-passwd/config' \
-'etc/webmin/software/config' \
-'etc/webmin/webminlog/config' \
+'etc/webmin/cluster-shell/config' \
+'etc/webmin/cluster-software/config' \
+'etc/webmin/cluster-useradmin/config' \
+'etc/webmin/cluster-usermin/config' \
 'etc/webmin/cluster-webmin/config' \
-'etc/webmin/bind8/config' \
+'etc/webmin/cron/config' \
+'etc/webmin/custom/config' \
 'etc/webmin/dhcpd/config' \
+'etc/webmin/dovecot/config' \
+'etc/webmin/exim/config' \
+'etc/webmin/exports/config' \
+'etc/webmin/fail2ban/config' \
 'etc/webmin/fdisk/config' \
+'etc/webmin/fetchmail/config' \
+'etc/webmin/file/config' \
+'etc/webmin/filemin/config' \
+'etc/webmin/filter/config' \
+'etc/webmin/firewall/config' \
+'etc/webmin/firewall6/config' \
+'etc/webmin/firewalld/config' \
+'etc/webmin/fsdump/config' \
+'etc/webmin/heartbeat/config' \
+'etc/webmin/htaccess-htpasswd/config' \
+'etc/webmin/idmapd/config' \
+'etc/webmin/init/config' \
+'etc/webmin/inittab/config' \
+'etc/webmin/ipsec/config' \
+'etc/webmin/iscsi-client/config' \
+'etc/webmin/iscsi-server/config' \
+'etc/webmin/iscsi-target/config' \
+'etc/webmin/iscsi-tgtd/config' \
+'etc/webmin/jabber/config' \
+'etc/webmin/krb5/config' \
+'etc/webmin/ldap-client/config' \
+'etc/webmin/ldap-server/config' \
+'etc/webmin/ldap-useradmin/config' \
+'etc/webmin/logrotate/config' \
+'etc/webmin/lpadmin/config' \
+'etc/webmin/lvm/config' \
+'etc/webmin/mailboxes/config' \
+'etc/webmin/mailcap/config' \
+'etc/webmin/man/config' \
+'etc/webmin/mon/config' \
 'etc/webmin/mount/config' \
 'etc/webmin/mysql/config' \
+'etc/webmin/net/config' \
+'etc/webmin/nis/config' \
+'etc/webmin/openslp/config' \
+'etc/webmin/pam/config' \
+'etc/webmin/pap/config' \
+'etc/webmin/passwd/config' \
+'etc/webmin/phpini/config' \
+'etc/webmin/postfix/config' \
+'etc/webmin/postgresql/config' \
+'etc/webmin/ppp-client/config' \
+'etc/webmin/pptp-client/config' \
+'etc/webmin/pptp-server/config' \
+'etc/webmin/proc/config' \
+'etc/webmin/procmail/config' \
+'etc/webmin/proftpd/config' \
+'etc/webmin/qmailadmin/config' \
 'etc/webmin/quota/config' \
+'etc/webmin/raid/config' \
 'etc/webmin/samba/config' \
+'etc/webmin/sarg/config' \
+'etc/webmin/sendmail/config' \
+'etc/webmin/servers/config' \
 'etc/webmin/shell/config' \
+'etc/webmin/shorewall/config' \
+'etc/webmin/shorewall6/config' \
+'etc/webmin/smart-status/config' \
+'etc/webmin/spam/config' \
 'etc/webmin/squid/config' \
-'etc/webmin/adsl-client/config' \
-'etc/webmin/servers/config' \
-'etc/webmin/cluster-shell/config' \
-'etc/webmin/bandwidth/config' \
-'etc/webmin/ppp-client/config' \
-'etc/webmin/lpadmin/config' \
-'etc/webmin/apache/config' \
-'etc/webmin/firewall/config' \
-'etc/webmin/stunnel/config' \
-'etc/webmin/burner/config' \
-'etc/webmin/exports/config' \
-'etc/webmin/backup-config/config' \
-'etc/webmin/custom/config' \
-'etc/webmin/htaccess-htpasswd/config' \
-'etc/webmin/logrotate/config' \
-'etc/webmin/format/config' \
-'etc/webmin/fsdump/config' \
-'etc/webmin/passwd/config' \
-'etc/webmin/cluster-useradmin/config' \
-'etc/webmin/cluster-software/config' \
-'etc/webmin/cluster-copy/config' \
-'etc/webmin/cluster-cron/config' \
-'etc/webmin/telnet/config' \
+'etc/webmin/sshd/config' \
 'etc/webmin/status/config' \
+'etc/webmin/stunnel/config' \
 'etc/webmin/syslog/config' \
+'etc/webmin/system-status/config' \
+'etc/webmin/tcpwrappers/config' \
+'etc/webmin/telnet/config' \
+'etc/webmin/time/config' \
+'etc/webmin/tunnel/config' \
 'etc/webmin/updown/config' \
+'etc/webmin/useradmin/config' \
 'etc/webmin/usermin/config' \
+'etc/webmin/vgetty/config' \
+'etc/webmin/webalizer/config' \
 'etc/webmin/webmin/config' \
+'etc/webmin/webmincron/config' \
+'etc/webmin/webminlog/config' \
+'etc/webmin/wuftpd/config' \
 'etc/webmin/xinetd/config' \
-'etc/webmin/openslp/config' \
-'etc/webmin/procmail/config' \
-'etc/webmin/fetchmail/config' \
-'etc/webmin/postgresql/config' \
-'etc/webmin/useradmin/config' \
-'etc/webmin/mailboxes/config' \
-'etc/webmin/inittab/config' \
-'etc/webmin/change-user/config' \
-'etc/webmin/postfix/config' \
-'etc/webmin/sendmail/config' \
-'etc/webmin/proftpd/config' \
 'etc/pam.d/webmin' )
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
         webmin-config.tar.bz2
@@ -85,49 +124,35 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t
         webmin.service)
 options=(!strip !zipman)
 
-package() {
+prepare() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  # delete stuff that's not needed
-  rm -f mount/freebsd-mounts*
-  rm -f mount/netbsd-mounts*
-  rm -f mount/openbsd-mounts*
-  rm -f mount/macos-mounts*
-
   # remove modules we do not support
-  rm -rf {bacula-backup,bsdexports,cpan,dfsadmin,heartbeat,hpuxexports,inetd,ipsec,jabber,ldap-useradmin,mon,pap,pptp-client,pptp-server,qmailadmin,sarg,sgiexports,shorewall,shorewall6,smart-status,vgetty,webalizer,wuftpd}
+  rm -r {bsdexports,bsdfdisk,cpan,dfsadmin,format,grub,hpuxexports,inetd,ipfilter,ipfw,package-updates,rbac,sgiexports,smf,software,syslog-ng,zones}
 
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
+  # delete stuff that's not needed
+  rm mount/freebsd-mounts* mount/netbsd-mounts* mount/openbsd-mounts* mount/macos-mounts*
+  rm webmin-gentoo-init webmin-init webmin-daemon
 
-  # remove caldera theme
-  rm -rf caldera
+  # remove config files from other distros add only Arch linux
+  find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*' -exec rm '{}' \+
+  echo 'Archlinux	Any version	generic-linux	*	-d "/etc/pacman.d"' > os_list.txt
 
-  # remove init-scripts from other distros
-  rm webmin-gentoo-init
-  rm webmin-init
-  rm webmin-daemon
+  # remove update stuff to avoid problems with updating webmin, modules and themes without pacman
+  rm {webmin,usermin}/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
 
-  # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
-  rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-  rm -f usermin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
+  # copy Arch linux config files
+  cp -rp "$srcdir"/webmin-config/* "$srcdir"/$pkgname-$pkgver/
+}
 
+package() {
   # create dirs
   mkdir -p "$pkgdir"/opt/webmin
   mkdir -p "$pkgdir"/var/log/webmin
   mkdir -p "$pkgdir"/etc/webmin
 
-  # install pam stuff
-  install -D -m 644 "$srcdir"/webmin.pam "$pkgdir"/etc/pam.d/webmin
-
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  echo 'Archlinux	Any version	generic-linux	*	-d "/etc/pacman.d"' > os_list.txt
-
   # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rp * "$pkgdir"/opt/webmin
-  cd "$srcdir"/webmin-config
-  cp -rfp * "$pkgdir"/opt/webmin
+  cp -rp "$srcdir"/$pkgname-$pkgver/* "$pkgdir"/opt/webmin
 
   # define parameters for setup.sh
   config_dir="$pkgdir"/etc/webmin
@@ -152,26 +177,31 @@ package() {
   sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
   "$pkgdir"/opt/webmin/setup.sh
 
+  # more logging and other config changes
+  echo -e 'logfiles=1\nlogfullfiles=1\ngotoone=1\nnoremember=1' >> "$pkgdir"/etc/webmin/config
+
   # Fixup the config files to use their real locations
-  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" {} \;
+  sed -i 's:^pidfile=.*$:pidfile=/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \+
 
   # Use pam
-  echo -e 'pam_only=1\npam_end=1\npam_conv=\nno_pam=0' >> "$pkgdir"/etc/webmin/miniserv.conf
+  echo -e 'pam_only=1\npam_end=1\npam_conv=\nno_pam=0\nlogouttime=10' >> "$pkgdir"/etc/webmin/miniserv.conf
 
   # install systemd files
   install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
 
+  # install pam stuff
+  install -D -m 644 "$srcdir"/webmin.pam "$pkgdir"/etc/pam.d/webmin
+
+  # install license
+  install -D -m 644 "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
+
   # delete temp dir
   rm -r "$pkgdir"/tmp
-  # change sticky bit
-  chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
-  # install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
 
 
 sha256sums=('b4cc63a369026e4e6d8f5af7501fe101dc122d9edbdd6bb20058f8f511694ce3'
-            '52a512ae2aa2fdf4e8a2a26e6bedd5a9cf9aa3cb6ab3c13e6f37d0dc71fe22b3'
+            'd326da95233341ed0a6d51c6c28d9b47b5bbe8c1ae8e03e2578c24191dd14383'
             'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d'
             'a1bdc68e3b0970a5c8e5063bd882b0469664ca782b34faecee22af5c6c30dd11')