summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Abela <kristofru@gmail.com>2012-11-25 20:41:40 -0600
committerdsomero <xgizzmo@slackbuilds.org>2012-12-11 16:20:48 -0500
commitdfb782844d895d93cc8abb8bb326d85487b01e16 (patch)
treedf649250683435fd4768a04b8270b763ab2eb8e2
parent4ed01224d9fc8d361d37e0ecd91a1f4df9f909b9 (diff)
downloadslackbuilds-dfb782844d895d93cc8abb8bb326d85487b01e16.tar.gz
network/xinetd: Updated for version 2.3.15.
Also create /var/lock/subsys/ in rc.xinetd instead of putting it inside the package; this handles the case where a sysadmin puts /var/lock as tmpfs (e.g. /var/lock -> /run/lock) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--network/xinetd/rc.xinetd2
-rw-r--r--network/xinetd/xinetd-add_destdir.patch (renamed from network/xinetd/xinetd-2.3.14-add_destdir.patch)0
-rw-r--r--network/xinetd/xinetd.SlackBuild10
-rw-r--r--network/xinetd/xinetd.info8
4 files changed, 9 insertions, 11 deletions
diff --git a/network/xinetd/rc.xinetd b/network/xinetd/rc.xinetd
index 44f153b1ba..17ee20df28 100644
--- a/network/xinetd/rc.xinetd
+++ b/network/xinetd/rc.xinetd
@@ -17,6 +17,8 @@ start(){
LC_COLLATE=en_US
export LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY LC_COLLATE
unset HOME MAIL USER USERNAME
+ # Make sure /var/lock/subsys exists
+ mkdir -p /var/lock/subsys
/usr/sbin/xinetd -stayalive -reuse -pidfile /var/run/xinetd.pid
RETVAL=$?
[ "$RETVAL" = 0 ] && touch /var/lock/subsys/xinetd
diff --git a/network/xinetd/xinetd-2.3.14-add_destdir.patch b/network/xinetd/xinetd-add_destdir.patch
index 6504ef07d6..6504ef07d6 100644
--- a/network/xinetd/xinetd-2.3.14-add_destdir.patch
+++ b/network/xinetd/xinetd-add_destdir.patch
diff --git a/network/xinetd/xinetd.SlackBuild b/network/xinetd/xinetd.SlackBuild
index 7298ba7179..7abc64fce7 100644
--- a/network/xinetd/xinetd.SlackBuild
+++ b/network/xinetd/xinetd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xinetd
-# Copyright 2010 Chris Abela <chris.abela@maltats.com>
+# Copyright 2012 Chris Abela, Malta
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xinetd
-VERSION=${VERSION:-2.3.14}
+VERSION=${VERSION:-2.3.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,7 +71,7 @@ find . \
-exec chmod 644 {} \;
# Add DESTDIR support
-patch -p1 < $CWD/xinetd-2.3.14-add_destdir.patch
+patch -p1 < $CWD/xinetd-add_destdir.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -100,10 +100,6 @@ mkdir -p $PKG/etc/rc.d
cat $CWD/rc.xinetd > $PKG/etc/rc.d/rc.xinetd.new
chmod 0755 $PKG/etc/rc.d/rc.xinetd.new
-# Make sure /var/lock/subsys exists and keeps correct permissions
-mkdir -p $PKG/var/lock/subsys
-chmod 1777 $PKG/var/lock
-
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/network/xinetd/xinetd.info b/network/xinetd/xinetd.info
index 9652c4ecc6..8e31efd7bd 100644
--- a/network/xinetd/xinetd.info
+++ b/network/xinetd/xinetd.info
@@ -1,10 +1,10 @@
PRGNAM="xinetd"
-VERSION="2.3.14"
+VERSION="2.3.15"
HOMEPAGE="http://xinetd.org"
-DOWNLOAD="http://xinetd.org/xinetd-2.3.14.tar.gz"
-MD5SUM="567382d7972613090215c6c54f9b82d9"
+DOWNLOAD="http://xinetd.org/xinetd-2.3.15.tar.gz"
+MD5SUM="77358478fd58efa6366accae99b8b04c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Chris Abela"
-EMAIL="chris.abela@maltats.com"
+EMAIL="kristofru@gmail.com"