From 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 4 Nov 2013 17:08:47 +0000 Subject: Slackware 14.1 Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-) --- source/l/libssh/libssh.SlackBuild | 7 +++++-- source/l/libssh/libssh.no.example.build.diff | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 source/l/libssh/libssh.no.example.build.diff (limited to 'source/l/libssh') diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild index cc60f00a..38a73272 100755 --- a/source/l/libssh/libssh.SlackBuild +++ b/source/l/libssh/libssh.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libssh -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -65,9 +65,12 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 +# These fail to build and are not packaged anyway: +zcat $CWD/libssh.no.example.build.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/l/libssh/libssh.no.example.build.diff b/source/l/libssh/libssh.no.example.build.diff new file mode 100644 index 00000000..e7f50251 --- /dev/null +++ b/source/l/libssh/libssh.no.example.build.diff @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt.orig 2013-01-22 04:51:59.000000000 -0600 ++++ ./CMakeLists.txt 2013-03-28 18:56:18.490047174 -0500 +@@ -89,8 +89,6 @@ + pkgconfig + ) + +-add_subdirectory(examples) +- + if (WITH_TESTING) + find_package(CMockery REQUIRED) + include(AddCMockeryTest) -- cgit v1.2.3