network/geomyidae: Updated for version 0.69.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 52 insertions, 21 deletions

diff --git a/network/geomyidae/README b/network/geomyidae/README
index 8899a4b95eb92..7be0c3b445cfe 100644
--- a/network/geomyidae/README
+++ b/network/geomyidae/README
@@ -6,8 +6,18 @@ Features:
 * cgi support (.cgi files are executed)
 * search support in CGI files
 * logging (-l option) and loglevels (-v option)
+* optional TLS support
 
 An rc.geomyidae is included which takes its startup options
 from the $GEOMYIDAE_ARGS environmental variable. Read
 /usr/doc/geomyidae-$VERSION/README for a list of the full
 options.
+
+The gph.vim ftdetect and syntax files are now installed into
+/usr/share/vim/ so there is no need to copy them manually.
+
+OPTIONAL:
+
+libtls for TLS support and:
+
+  TLS=yes ./geomyidae.SlackBuild
diff --git a/network/geomyidae/geomyidae.SlackBuild b/network/geomyidae/geomyidae.SlackBuild
index 534e278ed9ddb..924012c8e4610 100644
--- a/network/geomyidae/geomyidae.SlackBuild
+++ b/network/geomyidae/geomyidae.SlackBuild
@@ -24,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=geomyidae
-VERSION=${VERSION:-v0.34}
+VERSION=${VERSION:-0.69}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,39 +68,60 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + \
+ -o \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# check libtls installed
+if pkg-config --exists libtls && [[ $TLS =~ YES|yes ]]; then
+  # extra flags for TLS
+  SLKCFLAGS="$SLKCFLAGS -I/opt/libressl/include"
+  SLKLDFLAGS=-L/opt/libressl/lib$LIBDIRSUFFIX
+  SLKPKG_CONFIG_PATH=/opt/libressl/lib$LIBDIRSUFFIX/pkgconfig:
+  SLKLD_LIBRARY_PATH=/opt/libressl/lib$LIBDIRSUFFIX:
+else
+  # comment out TLS flags
+  sed -i "s,^TLS_CFLAGS,#&," Makefile
+  sed -i "s,^TLS_LDFLAGS,#&," Makefile
+fi
 
 sed -i 's,PREFIX =.*,PREFIX = /usr,' Makefile
 sed -i 's,MANDIR = .*,MANDIR = ${PREFIX}/man/man8,' Makefile
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make
+LDFLAGS="$LDFLAGS $SLKLDFLAGS" \
+PKG_CONFIG_PATH="${SLKPKG_CONFIG_PATH}${PKG_CONFIG_PATH}" \
+LD_LIBRARY_PATH="${SLKLD_LIBRARY_PATH}${LD_LIBRARY_PATH}" \
+make PREFIX=/usr MANDIR=${PREFIX}/man/man8
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# install vim files
+for dir in ftdetect syntax; do
+  install -D -m 0644 gph/vim/$dir/gph.vim $PKG/usr/share/vim/$dir/gph.vim
+done
 
 mkdir -p $PKG/etc/rc.d
 cat rc.d/rc.geomyidae > $PKG/etc/rc.d/rc.geomyidae.new
 
-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
+strip --strip-unneeded $PKG/usr/bin/geomyidae
+gzip -9 $PKG/usr/man/man8/geomyidae.8
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  LICENSE README LINKS index.gph gph \
+  CGI.md LICENSE README LINKS index.gph gph/ docker/ \
+  haproxy/ patches/ cgi-examples/ \
+  tls-gen-selfsign-cert.sh \
+  xinetd-gopher-request-filter.conf \
+  xinetd-gopher-request-filter.sh \
+  geomyidae.svg \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod -c 644 '{}' +
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/geomyidae/geomyidae.info b/network/geomyidae/geomyidae.info
index ae6912169694b..b7325fc82c9b6 100644
--- a/network/geomyidae/geomyidae.info
+++ b/network/geomyidae/geomyidae.info
@@ -1,10 +1,10 @@
 PRGNAM="geomyidae"
-VERSION="v0.34"
+VERSION="0.69"
 HOMEPAGE="http://r-36.net/scm/geomyidae/log.html"
-DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz"
-MD5SUM="75c4e5864afc184514372b0a5922242d"
+DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.69.tar.gz"
+MD5SUM="a84ee793323acf83decef74a7601191d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/network/geomyidae/slack-desc b/network/geomyidae/slack-desc
index 5112a071f8ffa..f4cff64806498 100644
--- a/network/geomyidae/slack-desc
+++ b/network/geomyidae/slack-desc
@@ -14,6 +14,6 @@ geomyidae: * dir listings (if no index.gph was found)
 geomyidae: * cgi support (.cgi files are executed)
 geomyidae: * search support in CGI files
 geomyidae: * logging (-l option) and loglevels (-v option)
+geomyidae: * optional TLS support
 geomyidae:
 geomyidae: gopher://bitreich.org/1/scm/geomyidae/log.gph
-geomyidae: