network/gophernicus: Updated for version 2.5v101, new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

6 files changed, 110 insertions, 31 deletions

diff --git a/network/gophernicus/Makefile.patch b/network/gophernicus/Makefile.patch
index 2de81cdc9e..32fbe2a9c0 100644
--- a/network/gophernicus/Makefile.patch
+++ b/network/gophernicus/Makefile.patch
@@ -1,7 +1,7 @@
-diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
---- gophernicus-2.5.orig/Makefile	2017-06-24 17:54:48.000000000 +0200
-+++ gophernicus-2.5/Makefile	2017-08-05 11:37:14.145035221 +0200
-@@ -17,10 +17,10 @@
+diff -Naur gophernicus-2.5v101/Makefile gophernicus-2.5v101.patched/Makefile
+--- gophernicus-2.5v101/Makefile	2018-07-22 16:36:57.869250006 -0400
++++ gophernicus-2.5v101.patched/Makefile	2018-07-22 17:18:45.765186289 -0400
+@@ -20,10 +20,10 @@
  DOCS    = LICENSE README INSTALL TODO ChangeLog README.Gophermap gophertag
  
  INSTALL = PATH=$$PATH:/usr/sbin ./install-sh -o 0 -g 0
@@ -15,25 +15,34 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
  
  ROOT    = /var/gopher
  OSXROOT = /Library/GopherServer
-@@ -62,7 +62,7 @@
+@@ -51,7 +51,7 @@
+ #
+ # Platform support, compatible with both BSD and GNU make
+ #
+-all:
++all: headers
+ 	@case `uname` in \
+ 		Darwin)	$(MAKE) ROOT="$(OSXROOT)" DESTDIR="$(OSXDEST)" $(BINARY); ;; \
+ 		Haiku)	$(MAKE) EXTRA_LIBS="-lnetwork" $(BINARY); ;; \
+@@ -61,7 +61,7 @@
  generic: $(BINARY)
  
  withwrap:
--	$(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap" $(BINARY)
-+	$(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LDFLAGS="-lwrap -lnsl" $(BINARY)
+-	$(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LIBS="-lwrap" $(BINARY)
++	$(MAKE) EXTRA_CFLAGS="-DHAVE_LIBWRAP" EXTRA_LIBS="-lwrap -lnsl" $(BINARY)
  
  
  #
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
  $(NAME).c: $(NAME).h $(HEADERS)
  	
  $(BINARY): $(OBJECTS)
--	$(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJECTS) $(EXTRA_LDFLAGS) -o $@
+-	$(CC) $(LDFLAGS) $(EXTRA_LDFLAGS) $(OBJECTS) $(EXTRA_LIBS) -o $@
++	$(CC) $(LDFLAGS) $(OBJECTS) $(EXTRA_LDFLAGS) $(EXTRA_LIBS) -o $@
  
  .c.o:
  	$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DVERSION="\"$(VERSION)\"" -DCODENAME="\"$(CODENAME)\"" -DDEFAULT_ROOT="\"$(ROOT)\"" $< -o $@
-@@ -179,11 +179,10 @@
+@@ -180,12 +180,9 @@
  	@echo
  
  install-root:
@@ -42,14 +51,14 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
 -		$(INSTALL) -m 644 $(MAP) $(ROOT); \
 -		ln -s $(DOCDIR) $(ROOT)/docs; \
 -	fi
-+	@echo
+-	@echo
 +	mkdir -p $(DESTDIR)/$(ROOT)
 +	$(INSTALL) -m 644 $(MAP) $(DESTDIR)/$(ROOT)
 +	ln -s /usr/doc/$(PACKAGE)-$(VERSION) $(DESTDIR)/$(ROOT)/docs
- 	@echo
  
  install-inetd:
-@@ -201,10 +200,8 @@
+ 	@echo
+@@ -202,11 +199,8 @@
  	@echo
  
  install-xinetd:
@@ -57,8 +66,9 @@ diff -Naur gophernicus-2.5.orig/Makefile gophernicus-2.5/Makefile
 -		sed -e "s/@HOSTNAME@/`hostname`/g" $(NAME).xinetd > $(XINETD)/$(NAME); \
 -		[ -x /sbin/service ] && /sbin/service xinetd reload; \
 -	fi
+-	@echo
 +	mkdir -p $(DESTDIR)/$(XINETD)
 +	sed -e "s/@HOSTNAME@/`hostname`/g" $(NAME).xinetd > $(DESTDIR)/$(XINETD)/$(NAME).new
- 	@echo
  
  install-osx:
+ 	if [ -d "$(LAUNCHD)" -a ! -f "$(LAUNCHD)/$(PLIST)" ]; then \
diff --git a/network/gophernicus/README b/network/gophernicus/README
index ce23ba448a..1e1c73cb2e 100644
--- a/network/gophernicus/README
+++ b/network/gophernicus/README
@@ -1,3 +1,5 @@
+gophernicus (gopher server)
+
 Gophernicus is a modern full-featured (and hopefully) secure gopher
 daemon for inetd.
 
@@ -8,4 +10,4 @@ gopher  stream  tcp  nowait  nobody  /usr/sbin/in.gophernicus  in.gophernicus -h
 
 Alternatively, gophernicus can be configured to run under xinetd.
 This is done automatically when xinetd is present on the system at
-the build time.
+build time.
diff --git a/network/gophernicus/git2tarxz.sh b/network/gophernicus/git2tarxz.sh
new file mode 100644
index 0000000000..e4937ba1c4
--- /dev/null
+++ b/network/gophernicus/git2tarxz.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number. We don't include the git history in the tarball.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+PRGNAM=gophernicus
+CLONE_URL=https://github.com/kimholviala/$PRGNAM.git
+
+# Upstream stopped doing release tarballs, and switched to 'rolling
+# release', which seems to be a euphemism for 'no releases, we are in
+# perpetual alpha'. RELVER is the last release tarball.
+RELVER=2.5
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+# The 'rolling release' version numbers seem to increment with
+# every commit. Upstream's got this script to generate them, so
+# use it.
+./git2changelog > ChangeLog
+V=$( sed -n 's,.*\* (\(v[^)]*\).*,\1,p' ChangeLog | head -1 )
+
+VERSION=${RELVER}${V}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+cat <<EOF
+
+Archive created: $PRGNAM-$VERSION.tar.xz
+
+Update $PRGNAM.info with:
+
+VERSION="$VERSION"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz"
+MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )"
+
+Don't forget to upload the new source!
+EOF
diff --git a/network/gophernicus/gophernicus.SlackBuild b/network/gophernicus/gophernicus.SlackBuild
index fea7b7593a..ab8ca83fee 100644
--- a/network/gophernicus/gophernicus.SlackBuild
+++ b/network/gophernicus/gophernicus.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for Gophernicus
 
-# Copyright 2012-2015  Fridrich von Stauffenberg <cancellor2@gmail.com>
+# Copyright 2012-2015  Fridrich von Stauffenberg <email removed>
+# Copyright 2018 B. Watson <yalhcru@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20180722 bkw:
+# - Take over maintenance.
+# - Update for latest upstream 'rolling release' version.
+# - Port old Makefile.patch to latest release. Also fix it so
+#   parallel makes work (no more -j1).
+# - Change HOMEPAGE to a non-gopher URL (ugh).
+# - Don't install compile instructions in doc dir.
+# - Add git2tarxz.sh to make upgrading easier in the future.
+
 PRGNAM=gophernicus
-VERSION=${VERSION:-2.5}
+VERSION=${VERSION:-2.5v101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,23 +66,27 @@ fi
 
 set -e
 
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
+find -L . -perm /111 -exec chmod 755 {} + -o -exec chmod 644 {} +
 
 patch -p1 < $CWD/Makefile.patch
 
-make CFLAGS="$SLKCFLAGS" -j1
-make install DESTDIR=$PKG
+# 'make install' strips the binary already.
+make all CFLAGS="$SLKCFLAGS"
+make install DOCDIR="$PKGDOC" 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
+# Don't need this:
+rm -f $PKGDOC/INSTALL
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/gophernicus/gophernicus.info b/network/gophernicus/gophernicus.info
index 87d6889abc..8986cecfd3 100644
--- a/network/gophernicus/gophernicus.info
+++ b/network/gophernicus/gophernicus.info
@@ -1,10 +1,10 @@
 PRGNAM="gophernicus"
-VERSION="2.5"
-HOMEPAGE="gopher://gophernicus.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/gophernicus-2.5.tar.gz"
-MD5SUM="53ef0889e90f4fd3eca68914020b422d"
+VERSION="2.5v101"
+HOMEPAGE="https://github.com/kimholviala/gophernicus"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gophernicus-2.5v101.tar.xz"
+MD5SUM="a95b9c71bf67581b66703d979e5e3789"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/gophernicus/slack-desc b/network/gophernicus/slack-desc
index 8e4ad30379..07356b2de3 100644
--- a/network/gophernicus/slack-desc
+++ b/network/gophernicus/slack-desc
@@ -12,7 +12,7 @@ gophernicus: Gophernicus is a modern full-featured (and hopefully) secure gopher
 gophernicus: daemon for inetd.
 gophernicus:
 gophernicus: Homepage: gopher://gophernicus.org
-gophernicus:
+gophernicus:       or: https://github.com/kimholviala/gophernicus
 gophernicus:
 gophernicus:
 gophernicus: