summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/webmin/doinst.sh16
-rw-r--r--system/webmin/webmin.SlackBuild22
-rw-r--r--system/webmin/webmin.info6
3 files changed, 21 insertions, 23 deletions
diff --git a/system/webmin/doinst.sh b/system/webmin/doinst.sh
index 64789063c8..74d778aaeb 100644
--- a/system/webmin/doinst.sh
+++ b/system/webmin/doinst.sh
@@ -11,12 +11,16 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
-# Keep same perms on rc.webmin.new:
-if [ -e etc/rc.d/rc.webmin ]; then
- cp -a etc/rc.d/rc.webmin etc/rc.d/rc.webmin.new.incoming
- cat etc/rc.d/rc.webmin.new > etc/rc.d/rc.webmin.new.incoming
- mv etc/rc.d/rc.webmin.new.incoming etc/rc.d/rc.webmin.new
-fi
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
# Signal the startup script to do some post install configuration
touch etc/webmin/FIRSTRUN
diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index 48816b914c..9691227750 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -23,11 +23,12 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=webmin
-VERSION=1.510
-ARCH=noarch
+VERSION=1.540
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+ARCH=noarch
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=${TMP}/package-${PRGNAM}
@@ -49,7 +50,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -108,28 +109,21 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
# Find config files and add the .new.
-# Used by the next block of code.
get_config_files() {
for i in $(ls -1 $1); do
if [ -d "$1/$i" ]; then
get_config_files "$1/$i"
else
- echo -n "$1/$i.new " | sed -e "s/^$(echo $PKG | sed -e 's/\//\\\//g')\///g"
+ echo "preserve_perms $1/$i.new " | sed -e "s#$PKG/##g" \
+ >> $PKG/install/doinst.sh
mv "$1/$i" "$1/$i.new"
fi
done
}
-# Finish the doinst.sh by adding the .new file list and config loop
+# Finish the doinst.sh by adding the .new file handler.
if [ -e $PKG/etc ]; then
- etc_files=$(get_config_files $PKG/etc)
-
-cat <<DOINST >> $PKG/install/doinst.sh
-for FILE in $etc_files
-do
- config \$FILE
-done
-DOINST
+ get_config_files $PKG/etc
fi
# Fix a few ownership issues
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index b09fc60cc7..9c8193091c 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,8 +1,8 @@
PRGNAM="webmin"
-VERSION="1.510"
+VERSION="1.540"
HOMEPAGE="http://www.webmin.com/"
-DOWNLOAD="http://downloads.sourceforge.net/webadmin/webmin-1.510.tar.gz"
-MD5SUM="cdcc09d71d85d81914a90413eaf21d3f"
+DOWNLOAD="http://downloads.sourceforge.net/webadmin/webmin-1.540.tar.gz"
+MD5SUM="8086fc60419937c4b2844796cfd2aea1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="David Somero"