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

[chninkel at users.sourceforge.net]

Revision: 12052
          http://gar.svn.sourceforge.net/gar/?rev=12052&view=rev
Author:   chninkel
Date:     2010-12-20 21:43:35 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
openssh: renamed pidfile from sshd.pid to cswsshd.pid

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

Added Paths:
-----------
    csw/mgar/pkg/openssh/trunk/files/0005-rename-pidfile.patch

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-12-20 20:52:44 UTC (rev 12051)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-12-20 21:43:35 UTC (rev 12052)
@@ -52,7 +52,6 @@
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
 PKGFILES_CSWossh += $(localstatedir)/empty
-PKGFILES_CSWossh += $(localstatedir)/run
 PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
 PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup
@@ -124,6 +123,11 @@
 # Bug filled upstream: https://bugzilla.mindrot.org/show_bug.cgi?id=87
 PATCHFILES += 0004-no-lastlog-file.patch
 
+# Rename the pidfile to use cswsshd.pid instead of sshd.pid in order to
+# avoid a clash with sun native ssh pid file
+# see https://www.opencsw.org/mantis/view.php?id=4398
+PATCHFILES += 0005-rename-pidfile.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    
@@ -149,7 +153,6 @@
 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	=
 
@@ -221,5 +224,4 @@
 
 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/0005-rename-pidfile.patch
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/0005-rename-pidfile.patch	                        (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/0005-rename-pidfile.patch	2010-12-20 21:43:35 UTC (rev 12052)
@@ -0,0 +1,26 @@
+From 4cc2f5de9ac2c0fdaf53040f2f1c279b36df37e2 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Mon, 20 Dec 2010 22:37:53 +0100
+Subject: [PATCH] Rename pidfile from sshd.pid to cswsshd.pid to avoid clash with
+ Sun native ssh.
+
+---
+ pathnames.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pathnames.h b/pathnames.h
+index 9e50950..5fdd47a 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -51,7 +51,7 @@
+  * The process id of the daemon listening for connections is saved here to
+  * make it easier to kill the correct daemon when necessary.
+  */
+-#define _PATH_SSH_DAEMON_PID_FILE	_PATH_SSH_PIDDIR "/sshd.pid"
++#define _PATH_SSH_DAEMON_PID_FILE	_PATH_SSH_PIDDIR "/cswsshd.pid"
+ 
+ /*
+  * The directory in user's home directory in which the files reside. The
+-- 
+1.7.3.2
+

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-12-20 20:52:44 UTC (rev 12051)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-12-20 21:43:35 UTC (rev 12052)
@@ -7,8 +7,8 @@
   * 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).
+  * Added 0005-rename-pidfile.patch to rename pidfile from sshd.pid to
+  cswsshd.pid. This avoids a conflict with sun native ssh (Closes: #4398).
   * [Build system] Switched to dynamic prototype.
   * [Build system] Switched to cswclassutils for user/group creation.
 


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