summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2016-08-08 17:19:00 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-13 07:22:49 +0700
commit744fb04ef3f5d8c8f32adb5f90476d0ef69cf188 (patch)
treeee233aad7eb25e6db71e6ab8cd9b6d655cd8b0db /network
parentb3c224122509dbc30515a01a38b8c962dc083cc9 (diff)
downloadslackbuilds-744fb04ef3f5d8c8f32adb5f90476d0ef69cf188.tar.gz
network/nbd: Updated for version 3.14
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'network')
-rw-r--r--network/nbd/010_no-systemd.diff25
-rw-r--r--network/nbd/nbd.SlackBuild14
-rw-r--r--network/nbd/nbd.info6
3 files changed, 37 insertions, 8 deletions
diff --git a/network/nbd/010_no-systemd.diff b/network/nbd/010_no-systemd.diff
new file mode 100644
index 0000000000..9e43376642
--- /dev/null
+++ b/network/nbd/010_no-systemd.diff
@@ -0,0 +1,25 @@
+--- configure.ac.orig 2016-06-24 00:15:55.000000000 +1000
++++ configure.ac 2016-08-08 16:53:47.075986217 +1000
+@@ -232,8 +232,6 @@
+ man/nbd-server.1.sh
+ man/nbd-trdump.1.sh
+ man/nbdtab.5.sh
+- systemd/Makefile
+- systemd/nbd@.service.sh
+ ])
+ AC_OUTPUT
+
+--- Makefile.am.orig 2016-06-24 00:15:55.000000000 +1000
++++ Makefile.am 2016-08-08 17:03:26.635959597 +1000
+@@ -1,4 +1,4 @@
+-SUBDIRS = . man doc tests systemd gznbd
++SUBDIRS = . man doc tests gznbd
+ bin_PROGRAMS = nbd-server nbd-trdump
+ sbin_PROGRAMS = @NBD_CLIENT_NAME@
+ EXTRA_PROGRAMS = nbd-client make-integrityhuge
+--- /dev/null 2016-08-08 16:48:51.867999776 +1000
++++ support/genver.sh 2016-08-08 17:07:50.087947496 +1000
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++echo "3.14"
diff --git a/network/nbd/nbd.SlackBuild b/network/nbd/nbd.SlackBuild
index cc72e77af8..6ba059af09 100644
--- a/network/nbd/nbd.SlackBuild
+++ b/network/nbd/nbd.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for NBD (Network Block Device)
# Previously maintained by Stu Miller <slackbuilds@go4it2day.com>
-# Currently maintained by Christoph Willing <chris.willing@linux.com"
+# Maintained 2013-2016 by Christoph Willing <chris.willing@linux.com>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -32,13 +32,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nbd
-VERSION=${VERSION:-3.13}
+VERSION=${VERSION:-3.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -49,8 +49,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,6 +71,8 @@ cd $TMP
rm -rf $TMP/$PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
+patch -p0 <$CWD/010_no-systemd.diff
+chmod a+x support/genver.sh
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,6 +80,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+autoreconf -fiv
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/nbd/nbd.info b/network/nbd/nbd.info
index 7e07ad2a78..180d26d0ac 100644
--- a/network/nbd/nbd.info
+++ b/network/nbd/nbd.info
@@ -1,8 +1,8 @@
PRGNAM="nbd"
-VERSION="3.13"
+VERSION="3.14"
HOMEPAGE="http://nbd.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/nbd/nbd-3.13.tar.xz"
-MD5SUM="784be37497cc2f9a53c67c8c77d1676d"
+DOWNLOAD="http://downloads.sourceforge.net/nbd/nbd-3.14.tar.xz"
+MD5SUM="fa29f57ca752e363edc15f0e35f0a95f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""