summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 12 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f957ab6194ac..3f62670d9f91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = webmin
pkgdesc = A web-based administration interface for Unix systems
pkgver = 2.105
- pkgrel = 1
+ pkgrel = 2
url = http://www.webmin.com/
install = webmin.install
arch = any
@@ -120,7 +120,7 @@ pkgbase = webmin
backup = etc/webmin/xterm/config
backup = etc/logrotate.d/webmin
backup = etc/pam.d/webmin
- source = http://downloads.sourceforge.net/sourceforge/webadmin/webmin-2.105.tar.gz
+ source = https://github.com/webmin/webmin/releases/download/2.105/webmin-2.105.tar.gz
source = setup-pre.sh
source = setup-post.sh
source = webmin-config.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index 14354e484e9a..407ef75e19aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=webmin
pkgver=2.105
-pkgrel=1
+pkgrel=2
pkgdesc="A web-based administration interface for Unix systems"
arch=(any)
license=('custom:webmin')
@@ -114,7 +114,7 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' \
'etc/webmin/xterm/config' \
'etc/logrotate.d/webmin' \
'etc/pam.d/webmin' )
-source=("http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz"
+source=("https://github.com/webmin/webmin/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
setup-pre.sh
setup-post.sh
webmin-config.tar.bz2
@@ -161,6 +161,14 @@ package() {
# so is_installed() check fails, so we avoid it in setup.sh
mv firewall/install_check{,.tmp}.pl
mv firewall6/install_check{,.tmp}.pl
+
+ # Disable background collection setup script due to UNKNOWN bug introduced in webmin-2.104
+ # which made /etc/webmin/system-status/config as a directory instead of regular file.
+ # This DOES NOT FIX THE BUG but its just a (temporary) workaround.
+ # Starting point to DEBUG this can be enable-collection.pl script
+ sed -i -e "/^# Enable background collection/,/^fi/ s/^/#/" "$srcdir"/$pkgname-$pkgver/setup.sh
+
+ # Run webmin setup script
"$srcdir"/$pkgname-$pkgver/setup.sh "$pkgdir"/opt/webmin
# move the files back in place