From 78460fad3803d01509c58ea0150424c9f23e949f Mon Sep 17 00:00:00 2001
From: Dave Woodfall <dave@slackbuilds.org>
Date: Sat, 26 Feb 2022 18:40:19 +0000
Subject: network/kea: Updated for version 2.1.3.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
---
 network/kea/doinst.sh      |  2 --
 network/kea/kea.SlackBuild | 13 +++++++------
 network/kea/kea.info       |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'network')

diff --git a/network/kea/doinst.sh b/network/kea/doinst.sh
index 52f28b475f0be..1ab6bfac50ed8 100644
--- a/network/kea/doinst.sh
+++ b/network/kea/doinst.sh
@@ -23,5 +23,3 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.kea.new
-config etc/kea/kea.conf.new
-config etc/kea/keactrl.conf.new
diff --git a/network/kea/kea.SlackBuild b/network/kea/kea.SlackBuild
index 32f5b4b8d506c..22712266b817d 100644
--- a/network/kea/kea.SlackBuild
+++ b/network/kea/kea.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kea
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -82,7 +82,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CPPFLAGS="-std=gnu++11" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -103,9 +102,6 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-mv $PKG/etc/kea/kea.conf $PKG/etc/kea/kea.conf.new
-mv $PKG/etc/kea/keactrl.conf $PKG/etc/kea/keactrl.conf.new
-
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.kea > $PKG/etc/rc.d/rc.kea.new
 
@@ -121,5 +117,10 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# add any configs found to doinst.sh
+find $PKG/etc/kea -name "*.conf" | xargs -I{} mv '{}' '{}'.new
+find $PKG/etc/kea -name "*.new" | xargs -I'{}' echo '{}' | cut -d/ -f5- |
+  sed "s,^,config ," >> $PKG/install/doinst.sh
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/kea/kea.info b/network/kea/kea.info
index c70b7d4c1a093..9c7f7366ed54a 100644
--- a/network/kea/kea.info
+++ b/network/kea/kea.info
@@ -1,8 +1,8 @@
 PRGNAM="kea"
-VERSION="1.2.0"
+VERSION="2.1.3"
 HOMEPAGE="http://kea.isc.org/"
-DOWNLOAD="http://ftp.isc.org/isc/kea/1.2.0/kea-1.2.0.tar.gz"
-MD5SUM="7e3f2b23052105c82991663261259c5b"
+DOWNLOAD="http://ftp.isc.org/isc/kea/2.1.3/kea-2.1.3.tar.gz"
+MD5SUM="f049d0c6bc86c5605bfe99ee9e64e5ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="log4cplus"
-- 
cgit v1.2.3