summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2012-09-30 09:58:18 -0400
committerRobby Workman <rworkman@slackbuilds.org>2012-09-30 20:01:06 -0500
commitbb333008c20a5b138c6cf23f15f73dc4f7871f98 (patch)
treee1411fd8d9e3fd23ddf8a26e75048d657eddfd08 /network
parentebc138379a8ff9c8f4d9a3baead9334dd0ead8f3 (diff)
downloadslackbuilds-bb333008c20a5b138c6cf23f15f73dc4f7871f98.tar.gz
network/3proxy: Fixed (Don't clobber configs or libproxy)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/3proxy/3proxy.SlackBuild11
-rw-r--r--network/3proxy/doinst.sh3
2 files changed, 11 insertions, 3 deletions
diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild
index 7f93f96034..5c960d9250 100644
--- a/network/3proxy/3proxy.SlackBuild
+++ b/network/3proxy/3proxy.SlackBuild
@@ -24,15 +24,13 @@
PRGNAM=3proxy
VERSION=${VERSION:-0.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -81,8 +79,15 @@ make install -f Makefile.Linux \
# I think I fixed all the references to /usr/local/etc and such in the
# source, but time will tell... :-) --rworkman
mv $PKG/usr/etc $PKG
+mv $PKG/etc/3proxy/bandlimiters $PKG/etc/3proxy/bandlimiters.new
+mv $PKG/etc/3proxy/counters $PKG/etc/3proxy/counters.new
+mv $PKG/etc/3proxy/passwd $PKG/etc/3proxy/passwd.new
cat $CWD/3proxy.cfg.sample > $PKG/etc/3proxy/3proxy.cfg.sample
+# /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy.
+mv $PKG/usr/bin/proxy $PKG/usr/bin/htproxy
+mv $PKG/usr/man/man8/proxy.8 $PKG/usr/man/man8/htproxy.8
+
mkdir -p $PKG/etc/rc.d
cat $CWD/rc.3proxy > $PKG/etc/rc.d/rc.3proxy.new
chmod 0755 $PKG/etc/rc.d/rc.3proxy.new
diff --git a/network/3proxy/doinst.sh b/network/3proxy/doinst.sh
index 6daab36402..1ca1f0b0ef 100644
--- a/network/3proxy/doinst.sh
+++ b/network/3proxy/doinst.sh
@@ -23,3 +23,6 @@ preserve_perms() {
}
preserve_perms etc/rc.d/rc.3proxy.new
+config etc/3proxy/bandlimiters.new
+config etc/3proxy/counters.new
+config etc/3proxy/passwd.new