[csw-devel] SF.net SVN: gar:[9365] csw/mgar/pkg/openssh/trunk

[chninkel at users.sourceforge.net]

Revision: 9365
          http://gar.svn.sourceforge.net/gar/?rev=9365&view=rev
Author:   chninkel
Date:     2010-03-25 18:17:07 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
openssh: added dont_derelativise_authorizedkeysfile_option.patch

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/checksums
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-03-25 15:08:00 UTC (rev 9364)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-03-25 18:17:07 UTC (rev 9365)
@@ -77,6 +77,10 @@
 # see https://bugzilla.mindrot.org/show_bug.cgi?id=1739
 PATCHFILES += derelativise_path_bugfix.patch
 
+# AuthorizedKeysFile option value should not be derelativized !!
+# see https://bugzilla.mindrot.org/show_bug.cgi?id=1739
+PATCHFILES += dont_derelativise_authorizedkeysfile_option.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.smartcard README.tun TODO WARNING.RNG    

Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums	2010-03-25 15:08:00 UTC (rev 9364)
+++ csw/mgar/pkg/openssh/trunk/checksums	2010-03-25 18:17:07 UTC (rev 9365)
@@ -5,12 +5,13 @@
 1d3d6d477c09e59c514e637fa3a2f7a4  CSWosshlpk.checkinstall
 0993813fa5c752215f892cb67c86816f  CSWosshlpk.preinstall
 77b86c30c3257fdf014102c8166fab2d  CSWosshlpk.prototype
-b888991f715a20842aeb776fe6c71370  changelog.CSW
+3344f6f17e6d75e8e135b8366e64a7ee  changelog.CSW
 9153031524651a18e7edaed4637aa769  contrib-openssh-lpk-5.2p1-0.3.9.patch
 a5ebb2e3fdaa06c3c9edba55aac5f83b  cswopenssh
 8e765642349b6321d01b33e95304e113  cswopenssh.xml
 704ad1d3216df8de4d44465006c64c39  derelativise_path_bugfix.patch
 4b3e79120b60e8f25be5141eba53cac5  don_t_use_TIOCSCTTY.patch
+72c46751eba8f77b53b1ee7cb801bfd7  dont_derelativise_authorizedkeysfile_option.patch
 ca5403c8e1539d5ced0573f289ed7aef  no_x_forwarding_bug.patch
 10e0b84c84ad0dc9c490480aab36be01  openssh-5.4p1-gsskex-all-20100313.patch
 da10af8a789fa2e83e3635f3a1b76f5e  openssh-5.4p1.tar.gz

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-03-25 15:08:00 UTC (rev 9364)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-03-25 18:17:07 UTC (rev 9365)
@@ -1,9 +1,11 @@
-openssh (5.4p1,REV=2010.03.24) unstable
+openssh (5.4p1,REV=2010.03.25) unstable
 
   * Added derelativise_path_bugfix.patch patch to solve a bug in the
   derelativise_path function (Closes: #4367).
+  * Added dont_derelativise_authorizedkeysfile_option.patch so the
+  AuthorizedKeysFile option can be relative as explained in the man page.
 
- -- Yann Rouillard <yann at opencsw.org>  Wed, 24 Mar 2010 22:00:55 +0100
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 25 Mar 2010 19:15:55 +0100
 
 openssh (5.4p1,REV=2010.03.13) unstable
 

Added: csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/dont_derelativise_authorizedkeysfile_option.patch	2010-03-25 18:17:07 UTC (rev 9365)
@@ -0,0 +1,22 @@
+--- openssh-5.4p1/servconf.c.orig	2010-03-25 19:10:47.783942371 +0100
++++ openssh-5.4p1/servconf.c	2010-03-25 19:10:52.526955504 +0100
+@@ -1223,7 +1252,18 @@
+ 		charptr = (opcode == sAuthorizedKeysFile) ?
+ 		    &options->authorized_keys_file :
+ 		    &options->authorized_keys_file2;
+-		goto parse_filename;
++
++		arg = strdelim(&cp);
++		if (!arg || *arg == '\0')
++			fatal("%s line %d: missing file name.",
++			    filename, linenum);
++		if (*activep && *charptr == NULL) {
++			*charptr = xstrdup(arg);
++			/* increase optional counter */
++			if (intptr != NULL)
++				*intptr = *intptr + 1;
++		}
++		break;
+ 
+ 	case sClientAliveInterval:
+ 		intptr = &options->client_alive_interval;


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