summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libssh2/libssh2.SlackBuild20
-rw-r--r--libraries/libssh2/libssh2.info8
2 files changed, 13 insertions, 15 deletions
diff --git a/libraries/libssh2/libssh2.SlackBuild b/libraries/libssh2/libssh2.SlackBuild
index 98e6b06be1..f238b70d36 100644
--- a/libraries/libssh2/libssh2.SlackBuild
+++ b/libraries/libssh2/libssh2.SlackBuild
@@ -2,23 +2,21 @@
# Slackware build script for Libssh2
-# Written by Menno E. Duursma <druiloor@zonnet.nl>
+# Written by Menno Duursma <druiloor@zonnet.nl>
# This program is free software. It comes without any warranty.
# Granted WTFPL, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details.
PRGNAM=libssh2
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.2.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -26,7 +24,7 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp} # Drop the package in /tmp
+OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -57,14 +55,16 @@ find . -type d -exec chmod 0755 {} \; -o -type f -exec chmod u+rw,go+r-w,a-s {}
# --enable-mac-none Permit "none" MAC -- NOT RECOMMENDED
# --disable-gex-new Disable "new" diffie-hellman-group-exchange-sha1 method
# --enable-debug Enable pedantic and debug options
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -ldl" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
+ --disable-static \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man
+ --mandir=/usr/man \
+ --build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
@@ -72,10 +72,8 @@ make install-strip DESTDIR=$PKG
find $PKG -type f | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-( cd $PKG/usr/man || exit 1
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a [A-Z][A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libssh2/libssh2.info b/libraries/libssh2/libssh2.info
index 34f68938e8..e4f673668e 100644
--- a/libraries/libssh2/libssh2.info
+++ b/libraries/libssh2/libssh2.info
@@ -1,10 +1,10 @@
PRGNAM="libssh2"
-VERSION="1.2.2"
+VERSION="1.2.6"
HOMEPAGE="http://www.libssh2.org/"
-DOWNLOAD="http://www.libssh2.org/download/libssh2-1.2.2.tar.gz"
-MD5SUM="fa8d9cd425bdd62f57244fc61fb54da7"
+DOWNLOAD="http://www.libssh2.org/download/libssh2-1.2.6.tar.gz"
+MD5SUM="7887bd95f1d5fc69780bfc5784410574"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Menno Duursma"
EMAIL="druiloor@zonnet.nl"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"