[csw-devel] SF.net SVN: gar:[18468] csw/mgar/pkg/libssh2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 18468
          http://gar.svn.sourceforge.net/gar/?rev=18468&view=rev
Author:   dmichelsen
Date:     2012-06-20 11:42:58 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
libssh2/trunk: Update to 1.4.2 and OpenSSL 1.0

Modified Paths:
--------------
    csw/mgar/pkg/libssh2/trunk/Makefile
    csw/mgar/pkg/libssh2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch

Modified: csw/mgar/pkg/libssh2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libssh2/trunk/Makefile	2012-06-20 11:41:47 UTC (rev 18467)
+++ csw/mgar/pkg/libssh2/trunk/Makefile	2012-06-20 11:42:58 UTC (rev 18468)
@@ -1,5 +1,5 @@
 NAME = libssh2
-VERSION = 1.3.0
+VERSION = 1.4.2
 CATEGORIES = lib
 GARTYPE = v2
 
@@ -14,15 +14,19 @@
 MASTER_SITES = http://www.libssh2.org/download/
 DISTFILES += $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Force-bash-and-GNU-grep.patch
+
 VENDOR_URL = http://www.libssh2.org
 
-BUILD_DEP_PKGS += CSWossldevel
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibz-dev
 
 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 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibz1
 OBSOLETED_BY_CSWlibssh2-1 += CSWlibssh2
 

Modified: csw/mgar/pkg/libssh2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libssh2/trunk/checksums	2012-06-20 11:41:47 UTC (rev 18467)
+++ csw/mgar/pkg/libssh2/trunk/checksums	2012-06-20 11:42:58 UTC (rev 18468)
@@ -1 +1 @@
-6425331899ccf1015f1ed79448cb4709  libssh2-1.3.0.tar.gz
+42e2b3796ac07fc1dbafc7abcc002cd3  libssh2-1.4.2.tar.gz

Added: csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch
===================================================================
--- csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch	                        (rev 0)
+++ csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch	2012-06-20 11:42:58 UTC (rev 18468)
@@ -0,0 +1,31 @@
+From a20cd01152e6c707a04ed75a810d705c20f2aa0a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at 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.