summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2011-07-11 02:55:11 (GMT)
committerBritney Fransen <brfransen@gmail.com>2011-07-11 02:55:11 (GMT)
commita70ac378c70ce2ad383c07eb41615df9536ff32d (patch)
treef8994835ea26a057bee7c5859c8c2e9c7ef98e08
parente6d753321e2ce4749cbe12b0f9d18dc6c6b5e0dd (diff)
downloadlinhes_pkgbuild-a70ac378c70ce2ad383c07eb41615df9536ff32d.zip
linhes_pkgbuild-a70ac378c70ce2ad383c07eb41615df9536ff32d.tar.gz
linhes_pkgbuild-a70ac378c70ce2ad383c07eb41615df9536ff32d.tar.bz2
webmin:Bumped to latest
-rw-r--r--abs/extra/webmin/PKGBUILD31
-rw-r--r--abs/extra/webmin/changelog3
-rw-r--r--abs/extra/webmin/webmin.install4
3 files changed, 22 insertions, 16 deletions
diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index 713451c..24834e1 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 89523 2010-09-01 14:17:33Z tpowa $
+# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
-pkgver=1.520
-pkgrel=2
+pkgver=1.550
+pkgrel=1
pkgdesc="a web-based interface for system administration"
arch=(i686 x86_64)
license=('custom:webmin')
@@ -86,7 +86,9 @@ 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.rc
+ run)
+options=(!strip)
build() {
# NOTE: USE --asroot build option to avoid fakeroot error!
@@ -192,9 +194,16 @@ build() {
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
- echo 'allow=127.0.0.1' >> $startdir/pkg/etc/webmin/miniserv.conf
+ # 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
+
# install pacman menu
cd $startdir/src/webmin-pacman/config
cp -rfp * $startdir/pkg/etc/webmin/pacman
@@ -209,11 +218,9 @@ build() {
# install license
install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
}
-md5sums=('4b87fcc5e3881a8aa825ea531e60d8c1'
- 'da6bea412a5be8cf82a813078fec5847'
- '4cf1139093ea59044be42a4f173fb8aa'
- '0673e51af0e81418b4a6c1e205f7e5cd')
-md5sums=('4b87fcc5e3881a8aa825ea531e60d8c1'
+
+md5sums=('d892599a6e3e6f102a8261d2804fb1b5'
'da6bea412a5be8cf82a813078fec5847'
'bfebb75bb94029b48c46b7f1ba1aa811'
- '0673e51af0e81418b4a6c1e205f7e5cd')
+ '0673e51af0e81418b4a6c1e205f7e5cd'
+ 'bc578b249e2090deb84119a626c53c48')
diff --git a/abs/extra/webmin/changelog b/abs/extra/webmin/changelog
new file mode 100644
index 0000000..68b499a
--- /dev/null
+++ b/abs/extra/webmin/changelog
@@ -0,0 +1,3 @@
+7/10/11 Britney Fransen
+-Added runit support to PKGBUILD
+-Added private networks to PKGBUILD
diff --git a/abs/extra/webmin/webmin.install b/abs/extra/webmin/webmin.install
index ce5da6c..efdd929 100644
--- a/abs/extra/webmin/webmin.install
+++ b/abs/extra/webmin/webmin.install
@@ -33,7 +33,3 @@ pre_remove() {
# uninstall unzipped files
rm -r /opt/webmin/man
}
-
-op=$1
-shift
-$op $*