diff options
author | Eric Hameleers <alien@slackware.com> | 2015-04-30 14:17:41 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-04-30 14:17:41 +0200 |
commit | f55ab90f06db1c6a515f8d3becaed13d73afd08c (patch) | |
tree | 245c3515071b621f936f9d285de7b776eade6ca0 /deps/libssh | |
parent | d5106979962c319936a93cc40bdb06f888e87aff (diff) | |
download | ktown-f55ab90f06db1c6a515f8d3becaed13d73afd08c.tar.gz ktown-f55ab90f06db1c6a515f8d3becaed13d73afd08c.tar.xz |
Remove all dependencies and extragear language files that have been
folded into slackware-current as official packages.
Diffstat (limited to '')
-rwxr-xr-x | deps/libssh/libssh.SlackBuild | 115 | ||||
-rw-r--r-- | deps/libssh/libssh_libgcrypt.patch | 51 | ||||
-rw-r--r-- | deps/libssh/slack-desc | 19 |
3 files changed, 0 insertions, 185 deletions
diff --git a/deps/libssh/libssh.SlackBuild b/deps/libssh/libssh.SlackBuild deleted file mode 100755 index ef701ca..0000000 --- a/deps/libssh/libssh.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh - -# Copyright 2011, 2012, 2014, 2015 Eric Hameleers, Eindhoven, NL -# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=libssh -VERSION=${VERSION:-0.6.4} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j7 "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 - -# Fix a compilation issue (backport from libssh git): -cat $CWD/libssh_libgcrypt.patch | patch -p1 --verbose || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Build and install: -mkdir build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DWITH_GCRYPT=1 \ - -DWITH_SSH1=1 \ - -DWITH_PCAP=1 \ - -DWITH_SFTP=1 \ - -DWITH_SERVER=1 \ - -DWITH_STATIC_LIB=0 \ - .. - make $NUMJOBS VERBOSE=1 || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS BSD ChangeLog COPYING INSTALL README doc/{API*,libssh*.txt} \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/libssh/libssh_libgcrypt.patch b/deps/libssh/libssh_libgcrypt.patch deleted file mode 100644 index 622c338..0000000 --- a/deps/libssh/libssh_libgcrypt.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3880a8ed80a4b1e2c052bd62f328bba2f869d5ae Mon Sep 17 00:00:00 2001 -From: Aris Adamantiadis <aris@0xbadc0de.be> -Date: Mon, 29 Dec 2014 15:06:33 +0000 -Subject: Fix the dh.c build with libgcrypt - -Fixes bug reported by gentoo at https://bugs.gentoo.org/show_bug.cgi?id=533424 -The function was only used by EDCSA backend which are not supported by the libgcrypt code anyway. ---- -diff --git a/include/libssh/dh.h b/include/libssh/dh.h -index f28b916..89872e3 100644 ---- a/include/libssh/dh.h -+++ b/include/libssh/dh.h -@@ -49,7 +49,9 @@ int hashbufin_add_cookie(ssh_session session, unsigned char *cookie); - int hashbufout_add_cookie(ssh_session session); - int generate_session_keys(ssh_session session); - bignum make_string_bn(ssh_string string); -+#ifdef HAVE_LIBCRYPTO - void make_string_bn_inplace(ssh_string string, bignum bnout); -+#endif /* HAVE_LIBCRYPTO */ - ssh_string make_bignum_string(bignum num); - - #endif /* DH_H_ */ -diff --git a/src/dh.c b/src/dh.c -index 84355d4..010a1dd 100644 ---- a/src/dh.c -+++ b/src/dh.c -@@ -407,14 +407,17 @@ bignum make_string_bn(ssh_string string){ - return bn; - } - -+#ifdef HAVE_LIBCRYPTO -+/** @internal -+ * @brief converts the content of a SSH string in an already allocated bignum -+ * @warning only available with OpenSSL builds -+ */ - void make_string_bn_inplace(ssh_string string, bignum bnout) { - unsigned int len = ssh_string_len(string); --#ifdef HAVE_LIBGCRYPT -- #error "unsupported" --#elif defined HAVE_LIBCRYPTO - bignum_bin2bn(string->data, len, bnout); --#endif - } -+#endif /* HAVE_LIBCRYPTO */ -+ - - ssh_string dh_get_e(ssh_session session) { - return make_bignum_string(session->next_crypto->e); --- -cgit v0.9.1 - diff --git a/deps/libssh/slack-desc b/deps/libssh/slack-desc deleted file mode 100644 index 12a1c19..0000000 --- a/deps/libssh/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libssh: libssh (library implementing ssh protocols) -libssh: -libssh: libssh is a mulitplatform C library implementing the SSHv2 and SSHv1 -libssh: protocol on client and server side. With libssh, you can remotely -libssh: execute programs, transfer files, and use a secure and transparent -libssh: tunnel for your remote applications. -libssh: -libssh: Homepage: http://www.libssh.org/ -libssh: -libssh: -libssh: |