Revision: 26075
http://sourceforge.net/p/gar/code/26075
Author: dmichelsen
Date: 2017-01-03 11:46:42 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
libssh: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/libssh/trunk/Makefile
csw/mgar/pkg/libssh/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libssh/
Removed Paths:
-------------
csw/mgar/pkg/libssh/trunk/files/0001-Force-bash-and-GNU-grep.patch
Modified: csw/mgar/pkg/libssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libssh2/trunk/Makefile 2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/libssh/trunk/Makefile 2017-01-03 11:46:42 UTC (rev 26075)
@@ -1,51 +1,58 @@
-NAME = libssh2
-VERSION = 1.4.2
+NAME = libssh
+VERSION = 0.7.3
GARTYPE = v2
-DESCRIPTION = A library for impementing the SSH2 protocol
-define BLURB
- libssh2 is a library implementing the SSH2 protocol as defined by
- Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION,
- SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and
- SECSH-PUBLICKEY.
-endef
+DESCRIPTION = The SSH library
-MASTER_SITES = http://www.libssh2.org/download/
-DISTFILES += $(DISTNAME).tar.gz
+MASTER_SITES += https://red.libssh.org/attachments/download/195/
+DISTFILES += $(DISTNAME).tar.xz
-PATCHFILES += 0001-Force-bash-and-GNU-grep.patch
+VENDOR_URL = http://www.libssh.org
-VENDOR_URL = http://www.libssh2.org
+# BUILD_DEP_PKGS += CSWlibssl-dev
+# BUILD_DEP_PKGS += CSWlibz-dev
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGES += CSWlibssh4
+SPKG_DESC_CSWlibssh4 = A library for impementing the SSH2 protocol, libssh.so.4
+PKGFILES_CSWlibssh4 += $(call pkgfiles_lib,libssh.so.4)
+RUNTIME_DEP_PKGS_CSWlibssh4 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibssh4 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibssh4 += CSWlibkrb5-3
-BUILD_DEP_PKGS += CSWlibssl-dev
-BUILD_DEP_PKGS += CSWlibz-dev
+PACKAGES += CSWlibssh-threads4
+SPKG_DESC_CSWlibssh-threads4 = A library for impementing the SSH2 protocol,
libssh_threads.so.4
+PKGFILES_CSWlibssh-threads4 += $(call pkgfiles_lib,libssh_threads.so.4)
-PACKAGES += CSWlibssh2-1
-SPKG_DESC_CSWlibssh2-1 = A library for impementing the SSH2 protocol,
libssh2.so.1
-PKGFILES_CSWlibssh2-1 += $(call pkgfiles_lib,libssh2.so.1)
-RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibz1
-OBSOLETED_BY_CSWlibssh2-1 += CSWlibssh2
-
-PACKAGES += CSWlibssh2-dev
-SPKG_DESC_CSWlibssh2-dev = Development files for libssh2.so.1
+PACKAGES += CSWlibssh-dev
+SPKG_DESC_CSWlibssh-dev = Development files for libssh.so.4
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWlibssh2-dev += CSWlibssh2-1
-OBSOLETED_BY_CSWlibssh2-dev += CSWlibssh2devel
-CATALOGNAME_CSWlibssh2devel = libssh2_devel_stub
+RUNTIME_DEP_PKGS_CSWlibssh-dev += CSWlibssh4
+RUNTIME_DEP_PKGS_CSWlibssh-dev += CSWlibssh-threads4
BUILD64_LIBS_ONLY = 1
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-libz
-CONFIGURE_ARGS += --with-openssl=/opt/csw
+CONFIGURE_SCRIPTS = cmake
-# Disable for now until this is fixed:
-# http://libssh2.stuge.se/ticket/170
-# GARFLAVOR = DBG
-# EXTRA_CPPFLAGS = -DLIBSSH2DEBUG
-SKIPTEST ?= 1
+BUILD_SCRIPTS = $(WORKSRC)/solaris/Makefile
+# ??? There is no testsuite
+TEST_SCRIPTS =
+# TEST_TARGET = check
+
+INSTALL_SCRIPTS = $(WORKSRC)/solaris/Makefile
+
include gar/category.mk
+
+configure-cmake:
+ mkdir $(WORKSRC)/solaris
+ @# The -DMAKE= is needed because docs generation uses $(MAKE) -C which
the default /usr/ccs/bin/make does not understand
+ cd $(WORKSRC)/solaris && $(CONFIGURE_ENV) cmake \
+ -DMAKE=/opt/csw/bin/gmake \
+ -Dbuild_doc=YES \
+ -DCMAKE_INSTALL_PREFIX="$(prefix)" \
+ -DCMAKE_BINARY_DIR:PATH="$(bindir)" \
+ -DLIB_INSTALL_DIR:PATH="$(libdir)" \
+ -DSYSCONF_INSTALL_DIR:PATH="$(sysconfdir)" \
+ -DDATA_INSTALL_DIR:PATH="$(datadir)" \
+ -G 'Unix Makefiles' $(abspath $(WORKSRC))
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/libssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/libssh2/trunk/checksums 2016-07-06 11:21:51 UTC (rev
25802)
+++ csw/mgar/pkg/libssh/trunk/checksums 2017-01-03 11:46:42 UTC (rev 26075)
@@ -1 +1 @@
-42e2b3796ac07fc1dbafc7abcc002cd3 libssh2-1.4.2.tar.gz
+05465da8004f3258db946346213209de libssh-0.7.3.tar.xz
Deleted: csw/mgar/pkg/libssh/trunk/files/0001-Force-bash-and-GNU-grep.patch
===================================================================
--- csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch
2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/libssh/trunk/files/0001-Force-bash-and-GNU-grep.patch
2017-01-03 11:46:42 UTC (rev 26075)
@@ -1,31 +0,0 @@
-From a20cd01152e6c707a04ed75a810d705c20f2aa0a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <da\x...@opencsw.org>
-Date: Wed, 20 Jun 2012 13:10:31 +0200
-Subject: [PATCH] Force bash and GNU grep
-
----
- tests/mansyntax.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/mansyntax.sh b/tests/mansyntax.sh
-index 3e72c25..0018709 100755
---- a/tests/mansyntax.sh
-+++ b/tests/mansyntax.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- set -e
-
- # Written by Mikhail Gusarov
-@@ -12,7 +12,7 @@ mandir=${srcdir}/../docs
- #
- # Only test if suitable man is available
- #
--if ! man --help | grep -q warnings; then
-+if ! man --help | ggrep -q warnings; then
- exit 77
- fi
-
---
-1.7.10.3
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
