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

[chninkel at users.sourceforge.net]

Revision: 4002
          http://gar.svn.sourceforge.net/gar/?rev=4002&view=rev
Author:   chninkel
Date:     2009-03-27 23:28:08 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
openssh: more LPK stuff

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2009-03-27 22:43:39 UTC (rev 4001)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2009-03-27 23:28:08 UTC (rev 4002)
@@ -6,6 +6,7 @@
 CATEGORIES = server
 
 DESCRIPTION = OpenSSH Secure Shell
+
 define BLURB
   OpenSSH is a FREE version of the SSH connectivity tools that technical users 
   of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that 
@@ -27,12 +28,17 @@
 DISTFILES  = $(GARNAME)-$(DISTVERSION).tar.gz
 DISTFILES += i.conf r.conf
 DISTFILES += changelog.CSW
-DISTFILES += $(call admfiles,CSWossh,depend checkinstall preinstall postinstall prototype) 
+
 DISTFILES += sshd_config
 DISTFILES += cswopenssh svc-cswopenssh cswopenssh.xml
 DISTFILES += openssh
+
+ifndef LPK
+DISTFILES += $(call admfiles,CSWossh,depend checkinstall preinstall postinstall prototype) 
 DISTFILES += $(call admfiles,CSWosshclient,depend prototype) 
+endif
 
+
 # Script created to workaround a upgrade bug between 
 # package = 4.6,REV=2007.07.30_rev=p1 and later package
 DISTFILES += openssh_restart_workaround.sh
@@ -64,9 +70,12 @@
 TEST_SCRIPTS	=
 
 ifdef LPK
+	DISTFILES += $(call admfiles,CSWosshlpk,depend checkinstall preinstall postinstall prototype) 
+	DESCRIPTION = OpenSSH Secure Shell with Ldap Public Key support
 	MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/
 	PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
 	CONFIGURE_ARGS += --with-ldap
+	DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk
 endif
 
 include gar/category.mk
@@ -78,10 +87,21 @@
 	@$(MAKECOOKIE)
 
 # adding documentation files
-post-install:
-	mkdir -p $(DESTDIR)/$(docdir)/openssh/ $(DESTDIR)/$(docdir)/openssh_client/
+post-install: customize_ssh_config
+ifdef LPK
+	mkdir -p $(DESTDIR)/$(docdir)/openssh_lpk/ 
+	cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_lpk/
+else
+	mkdir -p $(DESTDIR)/$(docdir)/openssh/ 
 	cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh/
+	mkdir -p $(DESTDIR)/$(docdir)/openssh_client/
 	cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_client/
+endif
 
+customize_ssh_config:
+	# Correction des chemins
+	sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' -e 's,/usr/libexec/,/opt/csw/libexec/,g' "$(DESTDIR)/$(sysconfdir)/ssh/sshd_config"
+	sed -e 's,^ *# *UsePAM *.*,UsePAM yes,g' -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(DESTDIR)/$(sysconfdir)/ssh/sshd_config"
 
+
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)

Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums	2009-03-27 22:43:39 UTC (rev 4001)
+++ csw/mgar/pkg/openssh/trunk/checksums	2009-03-27 23:28:08 UTC (rev 4002)
@@ -1,18 +1,18 @@
 ada79c7328a8551bdf55c95e631e7dad  download/openssh-5.2p1.tar.gz
 dc212745af1f549ce2a236401bf97c1b  download/i.conf
 5d9e9fb1a5b6af82ce915f72ebc5e3b7  download/r.conf
-780a273b9c28497e373dbc0ecc8d6fd1  download/changelog.CSW
+c9f2e90545738c1408a52647ae45be70  download/changelog.CSW
+0c7fca2f4bee3ecd489ebd85fdd8cdee  download/sshd_config
+73416a82ca98ba40e7b86ea94d0339cf  download/cswopenssh
+8e23e1f856f36e8e084a9283d22a7cbf  download/svc-cswopenssh
+547a915f1712c35dc79dc41378001ca9  download/cswopenssh.xml
+fd50a65230ec1ead7949e8500844b0bf  download/openssh
 d1c2c49bcd3b65a601946e8316b0b018  download/CSWossh.gspec
 6e91d098018d7e1855b626ea463b8a29  download/CSWossh.depend
 1d3d6d477c09e59c514e637fa3a2f7a4  download/CSWossh.checkinstall
 0993813fa5c752215f892cb67c86816f  download/CSWossh.preinstall
 e9e93bfda8a883bca632c712d9c359f6  download/CSWossh.postinstall
 0251175f92d2ec655f033cfdf58aa0d8  download/CSWossh.prototype
-0c7fca2f4bee3ecd489ebd85fdd8cdee  download/sshd_config
-73416a82ca98ba40e7b86ea94d0339cf  download/cswopenssh
-8e23e1f856f36e8e084a9283d22a7cbf  download/svc-cswopenssh
-547a915f1712c35dc79dc41378001ca9  download/cswopenssh.xml
-fd50a65230ec1ead7949e8500844b0bf  download/openssh
 17fca1c009ef012c158b7051dd0f2b5a  download/CSWosshclient.gspec
 1055c346c01d99d09572d978fad10256  download/CSWosshclient.depend
 3446a3185dddc9a63b28c588685c629e  download/CSWosshclient.prototype
@@ -20,4 +20,3 @@
 bb77f4010f030d85f143b3d149aa6a69  download/openssh-5.2p1-gsskex-20081003.patch
 4b3e79120b60e8f25be5141eba53cac5  download/don_t_use_TIOCSCTTY.patch
 ca5403c8e1539d5ced0573f289ed7aef  download/no_x_forwarding_bug.patch
-9153031524651a18e7edaed4637aa769  download/contrib-openssh-lpk-5.2p1-0.3.9.patch

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2009-03-27 22:43:39 UTC (rev 4001)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2009-03-27 23:28:08 UTC (rev 4002)
@@ -1,4 +1,4 @@
-openssh (5.2,REV=2008.03.22_rev=p1) unstable
+openssh (5.2,REV=2008.03.28_rev=p1) unstable
 
   * New upstream version.
   * Split the client in a distinct package.


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