SF.net SVN: gar:[24171] csw/mgar/pkg/openssh/trunk

[chninkel at users.sourceforge.net]

Revision: 24171
          http://sourceforge.net/p/gar/code/24171
Author:   chninkel
Date:     2014-10-11 10:10:32 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
openssh/trunk: Update GSS Kex patch version and add fix for Linux-ism

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/fix-user-id-retrieval-for-solaris.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2014-10-10 09:06:00 UTC (rev 24170)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2014-10-11 10:10:32 UTC (rev 24171)
@@ -13,8 +13,8 @@
 
 NAME = openssh
 VERSION = 6.7p1
-GSSKEX_PATCH_VERSION = 6.6p1
-GSSKEX_PATCH_DATE = 20140320
+GSSKEX_PATCH_VERSION = 6.7p1
+GSSKEX_PATCH_DATE = 20140907
 GARTYPE = v2
 
 DESCRIPTION = OpenSSH Secure Shell
@@ -155,6 +155,10 @@
 # see https://www.opencsw.org/mantis/view.php?id=4398
 PATCHFILES += 0005-rename-pidfile.patch
 
+# The regress/Makefile uses "id -un" to retrieve the id of the current user
+# but that command doesn't work on Solaris, this patch fixes that issue
+PATCHFILES += fix-user-id-retrieval-for-solaris.patch
+
 # documentation files to install (not a gar variable)
 DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns 
 DOCFILES += README.platform README.privsep README.tun TODO 

Added: csw/mgar/pkg/openssh/trunk/files/fix-user-id-retrieval-for-solaris.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/fix-user-id-retrieval-for-solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/fix-user-id-retrieval-for-solaris.patch	2014-10-11 10:10:32 UTC (rev 24171)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru a/regress/Makefile b/regress/Makefile
+--- a/regress/Makefile
++++ b/regress/Makefile
+@@ -72,7 +72,7 @@
+ 
+ #LTESTS= 	cipher-speed
+ 
+-USER!=		id -un
++USER!=		/usr/ucb/whoami 2>/dev/null || whoami 2>/dev/null || logname 2>/dev/null || id -un
+ CLEANFILES=	t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+ 		t8.out t8.out.pub t9.out t9.out.pub t10.out t10.out.pub \
+ 		authorized_keys_${USER} known_hosts pidfile testdata \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.