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

[chninkel at users.sourceforge.net]

Revision: 12021
          http://gar.svn.sourceforge.net/gar/?rev=12021&view=rev
Author:   chninkel
Date:     2010-12-19 17:36:37 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
openssh: several bug fixes (#4398 and #4494)

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/0004-no-lastlog-file.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-12-19 04:02:12 UTC (rev 12020)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-12-19 17:36:37 UTC (rev 12021)
@@ -118,6 +118,11 @@
 # see https://bugzilla.mindrot.org/show_bug.cgi?id=1457
 PATCHFILES += no_x_forwarding_bug.patch
 
+# Force openssh to not use /var/adm/lastlog but still prints last log information
+# Workaround to fix https://www.opencsw.org/mantis/view.php?id=4494
+# Bug filled upstream: https://bugzilla.mindrot.org/show_bug.cgi?id=87
+PATCHFILES += 0004-no-lastlog-file.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 WARNING.RNG    
@@ -143,6 +148,7 @@
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix)
 CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty
+CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run
 
 TEST_SCRIPTS	=
 
@@ -214,4 +220,5 @@
 
 merge-special-directories:
 	ginstall -d $(PKGROOT)$(localstatedir)/empty
+	ginstall -d $(PKGROOT)$(localstatedir)/run
 	ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh

Added: csw/mgar/pkg/openssh/trunk/files/0004-no-lastlog-file.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/0004-no-lastlog-file.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/0004-no-lastlog-file.patch	2010-12-19 17:36:37 UTC (rev 12021)
@@ -0,0 +1,27 @@
+From a942b6c3d50bbdb7cf1a3940b247c26b1ba18383 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 19 Dec 2010 18:15:22 +0100
+Subject: [PATCH] Do not use /var/adm/lastlog to retrieve last log information as
+ it has already been updated during the ssh login process, so it always
+ returns the current logging time
+
+---
+ defines.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/defines.h b/defines.h
+index fe25170..6709314 100644
+--- a/defines.h
++++ b/defines.h
+@@ -663,6 +663,8 @@ struct winsize {
+ #  endif
+ #endif
+ 
++#undef LASTLOG_FILE
++
+ #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+ # define USE_SHADOW
+ #endif
+-- 
+1.7.3.2
+

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-12-19 04:02:12 UTC (rev 12020)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-12-19 17:36:37 UTC (rev 12021)
@@ -1,15 +1,18 @@
-openssh (5.6p1,REV=2010.09.02) unstable
+openssh (5.6p1,REV=2010.12.19) unstable
 
   * New upstream release.
   * Removed patch applied upstream (derelativise_path_bugfix.patch 
   and dont_derelativise_authorizedkeysfile_option.patch).
   * Moved conf from /opt/csw/etc to /etc/opt/csw.
-  * Moved privilege separation directory from /var/empty to
-  /var/opt/csw/var/empty.
+  * Moved privilege separation directory from /var/empty to /var/opt/csw/empty.
+  * Added 0004-no-lastlog-file.patch patch to workaround a bug with
+  Lastlog information printed at login time (see bug #4494).
+  * Moved pid file location from /var/run to /var/opt/csw/run to avoid a
+  conflict with sun native ssh (Closes: #4398).
   * [Build system] Switched to dynamic prototype.
   * [Build system] Switched to cswclassutils for user/group creation.
 
- -- Yann Rouillard <yann at opencsw.org>  Wed, 02 Sep 2010 23:25:24 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Wed, 19 Dec 2010 23:25:24 +0200
 
 openssh (5.4p1,REV=2010.03.25) unstable
 

Modified: csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch	2010-12-19 04:02:12 UTC (rev 12020)
+++ csw/mgar/pkg/openssh/trunk/files/don_t_use_TIOCSCTTY.patch	2010-12-19 17:36:37 UTC (rev 12021)
@@ -6,10 +6,10 @@
  	}
  	/* Make it our controlling tty. */
 -#ifdef TIOCSCTTY
-+/* Blastwave package modification: TIOCSCTTY doesn't exist under solaris 10
++/* Opencsw package modification: TIOCSCTTY doesn't exist under solaris 10
 +   although it is defined in /usr/include/sys/termios.h (??), so we make
 +   sure it is not used. */
-+#ifdef 0
++#if 0
  	debug("Setting controlling tty using TIOCSCTTY.");
  	if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0)
  		error("ioctl(TIOCSCTTY): %.100s", strerror(errno));


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