aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/oidentd/doinst.sh15
-rw-r--r--network/oidentd/oidentd.SlackBuild10
-rw-r--r--network/oidentd/oidentd.info8
-rw-r--r--network/oidentd/slack-desc2
4 files changed, 27 insertions, 8 deletions
diff --git a/network/oidentd/doinst.sh b/network/oidentd/doinst.sh
new file mode 100644
index 000000000000..5154cf2bdd50
--- /dev/null
+++ b/network/oidentd/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+for i in etc/oidentd{_masq,}.conf.new ; do config $i ; done
+
diff --git a/network/oidentd/oidentd.SlackBuild b/network/oidentd/oidentd.SlackBuild
index b490e88eee66..0a0322060058 100644
--- a/network/oidentd/oidentd.SlackBuild
+++ b/network/oidentd/oidentd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for oidentd
-# Copyright 2012, 2015, 2017 Mario Preksavec, Zagreb, Croatia
+# Copyright 2012, 2015, 2017, 2018 Mario Preksavec, Zagreb, Croatia
# 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=oidentd
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -88,12 +88,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+for i in $PKG/etc/oidentd{_masq,}.conf ; do mv $i $i.new ; done
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* INSTALL ChangeLog* NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog INSTALL KERNEL_SUPPORT.md NEWS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/oidentd/oidentd.info b/network/oidentd/oidentd.info
index bb4469e4ff91..2cac4e927a1d 100644
--- a/network/oidentd/oidentd.info
+++ b/network/oidentd/oidentd.info
@@ -1,8 +1,8 @@
PRGNAM="oidentd"
-VERSION="2.1.0"
-HOMEPAGE="https://sourceforge.net/projects/oidentd/"
-DOWNLOAD="http://prdownloads.sourceforge.net/oidentd/oidentd-2.1.0.tar.gz"
-MD5SUM="44ea89cf7a9d2d449c5d3d904360a097"
+VERSION="2.3.1"
+HOMEPAGE="https://github.com/janikrabe/oidentd"
+DOWNLOAD="https://github.com/janikrabe/oidentd/releases/download/v2.3.1/oidentd-2.3.1.tar.gz"
+MD5SUM="8a8b6255bd4d402794e4705d1b17ea4b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/network/oidentd/slack-desc b/network/oidentd/slack-desc
index 3ae69a37294e..2760a21d5754 100644
--- a/network/oidentd/slack-desc
+++ b/network/oidentd/slack-desc
@@ -16,4 +16,4 @@ oidentd: completed. Oidentd supports IP masqueraded connections on Linux, and
oidentd: is able to forward requests to hosts that masq through the host on
oidentd: which oidentd runs.
oidentd:
-oidentd: Homepage: https://sourceforge.net/projects/oidentd/
+oidentd: Homepage: https://github.com/janikrabe/oidentd