network/znc: Updated for version 0.076.

6 files changed, 30 insertions, 15 deletions

diff --git a/network/znc/README b/network/znc/README
index b2c3953f3d..b1b643f379 100644
--- a/network/znc/README
+++ b/network/znc/README
@@ -1,4 +1,4 @@
-ZNC is an advanced IRC bouncer.
+ZNC is an advanced IRC bouncer
 
 ZNC will remain connected to an IPv4 or IPv6 IRC server even while you
 are offline. You can reattach your client at a later time and catch up
@@ -26,4 +26,4 @@ build script uses "znc" as the user.  If you wish to change it, e.g.
 to use the "nobody" user, then run the script as follows:
 	ZNC_USER=nobody ./znc.SlackBuild
 
-See README.SLACKWARE for configuration information.
+See README.SBo for configuration information.
diff --git a/network/znc/README.SBo b/network/znc/README.SBo
new file mode 100644
index 0000000000..a9972a7b5c
--- /dev/null
+++ b/network/znc/README.SBo
@@ -0,0 +1,18 @@
+znc README.SBo
+
+Once the package is installed, you should create your config file using
+znc's own interactive utility; run the following command: 
+  su - _ZNC_USER_ -c '/usr/bin/znc --makeconf --datadir /etc/znc'
+
+Since znc is configured to run as a nonprivileged user by default in 
+this build script, you must choose a listening port higher than 1024.
+
+Once you have answered all the questions, your znc.conf file will be 
+located at /etc/znc/configs/znc.conf
+
+It should be noted that by default (if run without any arguments), ZNC 
+will look for its configuation file in ~/.znc (which is /etc/znc/.znc
+as suggested by the build script).  This is irrelevant if you are using
+the init script supplied with the package, but it might be worth knowing
+just in case.
+
diff --git a/network/znc/rc.znc b/network/znc/rc.znc
index 6fe3405415..bdc68e9a60 100644
--- a/network/znc/rc.znc
+++ b/network/znc/rc.znc
@@ -4,7 +4,7 @@
 
 # User account under which ZNC should run; only change this if you 
 # know what you are doing :-)
-ZNC_USER="@ZNC_USER@"
+ZNC_USER="_ZNC_USER_"
 
 # First, a sanity check
 if [[ ! -e /etc/znc/configs/znc.conf ]]; then
diff --git a/network/znc/slack-desc b/network/znc/slack-desc
index 28b1fad159..73aa173012 100644
--- a/network/znc/slack-desc
+++ b/network/znc/slack-desc
@@ -7,13 +7,13 @@
 
      |-----handy-ruler------------------------------------------------------|
 znc: ZNC (an advanced IRC bouncer)
-znc:
+znc: 
 znc: ZNC will remain connected to an IPv4 or IPv6 IRC server even while you 
 znc: are offline. You can reattach your client at a later time and catch up
 znc: with what happened while you were gone via the history buffer. You can
 znc: add additional users under one running process, useful for public shells
 znc: that limit background processes. ZNC also supports the dynamic loading
 znc: of C++ and Perl modules.
-znc:
+znc: 
 znc: Homepage: http://en.znc.in/wiki/ZNC
-znc:
+znc: 
diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild
index 3fdacedec2..3b5388be8f 100644
--- a/network/znc/znc.SlackBuild
+++ b/network/znc/znc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Slackware build script for ZNC
 
@@ -59,8 +59,6 @@ if ! grep -q "^$ZNC_USER:" /etc/passwd; then
   exit 1
 fi
 
-set -e
-
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -92,7 +90,6 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -118,7 +115,7 @@ chown -R $ZNC_USER $PKG/etc/znc
 
 # Install an init script 
 mkdir -p $PKG/etc/rc.d
-sed -e "s/@ZNC_USER@/$ZNC_USER/g" -e "s/@VERSION@/$VERSION/g" $CWD/rc.znc \
+sed -e "s/_ZNC_USER_/$ZNC_USER/g" -e "s/_VERSION_/$VERSION/g" $CWD/rc.znc \
   > $PKG/etc/rc.d/rc.znc.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -126,12 +123,12 @@ cp -a \
   AUTHORS LICENSE* README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-sed s/@ZNC_USER@/$ZNC_USER/g $CWD/README.SLACKWARE > \
-  $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+sed s/_ZNC_USER_/$ZNC_USER/g $CWD/README.SBo > \
+  $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/znc/znc.info b/network/znc/znc.info
index 3f4969abf0..25293974fb 100644
--- a/network/znc/znc.info
+++ b/network/znc/znc.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Sean Donner"
 EMAIL="sean.donner at gmail dot com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"