network/znc: Updated for version 0.076

6 files changed, 51 insertions, 20 deletions

diff --git a/network/znc/README b/network/znc/README
index 7a352cbed298a..b2c3953f3dd4d 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
@@ -15,9 +15,15 @@ simply run the build script like this:
 IPv6 support is also enabled by default; to disable it, run the script as:
 	WITH_IPV6=no ./znc.SlackBuild
 
+New since version 0.074 is the ability to use the 'c-ares' library. This
+package is available on SBo and will slightly increase performance
+by being able to do asynchronous DNS requests. By default this option
+is off, to enable it run the script as:
+WITH_CARES=yes ./znc.SlackBuild
+
 This is intended to be run as a nonprivileged user - by default, the
 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.SBo for configuration information.
+See README.SLACKWARE for configuration information.
diff --git a/network/znc/README.SBo b/network/znc/README.SLACKWARE
index a9972a7b5ca6e..25e686201df39 100644
--- a/network/znc/README.SBo
+++ b/network/znc/README.SLACKWARE
@@ -1,8 +1,8 @@
-znc README.SBo
+znc README.SLACKWARE
 
 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'
+  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.
diff --git a/network/znc/rc.znc b/network/znc/rc.znc
index 85d58929ceb81..6fe3405415f06 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
@@ -21,7 +21,8 @@ znc_start() {
       echo "running, then remove the lock and try again."
       return 1
    else
-      su - $ZNC_USER -c '/usr/bin/znc --datadir /etc/znc' && touch /var/lock/znc
+      su - $ZNC_USER -c '/usr/bin/znc --datadir /etc/znc'
+      touch /var/lock/znc
       return 0
    fi
 }
diff --git a/network/znc/slack-desc b/network/znc/slack-desc
index 73aa1730126a9..28b1fad15931b 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 063ce59755134..3fdacedec2723 100644
--- a/network/znc/znc.SlackBuild
+++ b/network/znc/znc.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=znc
-VERSION=0.062
+VERSION=0.076
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -31,6 +31,7 @@ TAG=${TAG:-_SBo}
 ZNC_USER=${ZNC_USER:-znc}
 WITH_SSL=${WITH_SSL:-yes}
 WITH_IPV6=${WITH_IPV6:-yes}
+WITH_CARES=${WITH_CARES:-no}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -38,9 +39,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+   SLKCFLAGS="-O2 -fPIC"
+   LIBDIRSUFFIX="64"
 fi
 
 # Bail if user and/or group isn't valid on your system
@@ -76,27 +82,43 @@ else
   do_ipv6="--enable-ipv6"
 fi
 
+if [ "$WITH_CARES" != "yes" ]; then
+  do_cares="--disable-c-ares"
+else
+  do_cares="--enable-c-ares"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
+  --enable-extra \
   $do_openssl \
-  $do_ipv6
+  $do_ipv6 \
+  $do_cares
 
 make all
 make install DESTDIR=$PKG
 
+( cd $PKG
+  find . -exec file {} + | sed -n '/ELF.*executable\|shared object/s/:.*$//p' | \
+  	xargs strip --strip-unneeded 2> /dev/null || true
+  find . -exec file {} + | sed -n '/current ar archive/s/:.*$//p' | \
+  	xargs strip --strip-debug 2> /dev/null || true
+)
+
 # Change the ownership of the configuration directory
 mkdir -p $PKG/etc/znc
 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
@@ -104,12 +126,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.SBo > \
-  $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
+sed s/@ZNC_USER@/$ZNC_USER/g $CWD/README.SLACKWARE > \
+  $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/znc/znc.info b/network/znc/znc.info
index 64b6ed7c11ec0..3f4969abf01fc 100644
--- a/network/znc/znc.info
+++ b/network/znc/znc.info
@@ -1,8 +1,10 @@
 PRGNAM="znc"
-VERSION="0.062"
+VERSION="0.076"
 HOMEPAGE="http://en.znc.in/wiki/ZNC"
-DOWNLOAD="http://downloads.sourceforge.net/znc/znc-0.062.tar.gz"
-MD5SUM="692b8e65a7363ac3fc0e10a0cb3cd1aa"
+DOWNLOAD="http://downloads.sourceforge.net/znc/znc-0.076.tar.gz"
+MD5SUM="03c2804b91225e83884f06078f6db568"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Sean Donner"
 EMAIL="sean.donner at gmail dot com"
 APPROVED="rworkman"