[csw-devel] SF.net SVN: gar:[4059] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Mar 29 19:29:36 CEST 2009
Revision: 4059
http://gar.svn.sourceforge.net/gar/?rev=4059&view=rev
Author: chninkel
Date: 2009-03-29 17:29:36 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
openssh: now works correctly with gar v2
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/CSWossh.depend
csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-29 17:29:36 UTC (rev 4059)
@@ -1,3 +1,17 @@
+#####################################################################
+# OpenCSW build recipe for openssh
+#
+# Copyright 2009 Yann Rouillard <yann at pleiades.fr.eu.org>
+# All rights reserved. Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted. This software is without warranty of any kind. The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#####################################################################
+
+###### Package information #######
+
GARNAME = openssh
GARVERSION = 5.2
RELEASE = p1
@@ -17,6 +31,20 @@
and supports all SSH protocol versions.
endef
+
+PACKAGES = CSWossh CSWosshclient
+
+CATALOGNAME_CSWossh = openssh
+SPKG_DESC_CSWossh = OpenSSH Secure Shell server
+REQUIRED_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
+
+CATALOGNAME_CSWosshclient = openssh_client
+SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client
+REQUIRED_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib
+
+
+###### Upstream and opencsw files information #######
+
MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/
# We define upstream file regex so we can be notifed of new upstream software release
@@ -33,12 +61,8 @@
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
+LICENSE = LICENCE
-
# 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
@@ -57,9 +81,19 @@
# 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
+DOCDIRS = openssh openssh_client
SPKG_CLASSES = none conf
+
+# little hack to be able to still use old smf support with gar v2
+# until openssh is migrated to cswclassutils init system
+DISTFILES += openssh_dyngspec.fakespec
+_CATEGORY_GSPEC_INCLUDE = $(if $(findstring CSWosshclient,$*),csw_dyndepend.gspec,../../$(DOWNLOADDIR)/openssh_dyngspec.fakespec)
+
+
+##### Build and installation information #####
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-kerberos5=$(prefix)
CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/ssh
@@ -69,15 +103,24 @@
TEST_SCRIPTS =
+
+## Optional addition to add Ldap Public Key support
+## see http://code.google.com/p/openssh-lpk/
+
ifdef LPK
- DISTFILES += $(call admfiles,CSWosshlpk,depend checkinstall preinstall postinstall prototype)
+ PACKAGES = CSWosshlpk
+ CATALOGNAME_CSWosshlpk = openssh_lpk
+ SPKG_DESC_CSWosshlpk = OpenSSH Secure Shell server with ldap public key support
+ REQUIRED_PKGS_CSWosshlpk = $(REQUIRED_PKGS_CSWossh) CSWoldaprt
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
+ DOCDIRS = openssh_lpk
endif
+
include gar/category.mk
@@ -87,30 +130,24 @@
@$(MAKECOOKIE)
# adding documentation files
-post-install-modulated: customize_ssh_config
+post-merge: customize_ssh_config
ginstall $(WORKDIR_FIRSTMOD)/*.conf $(WORKROOTDIR)/build-global/
ginstall -D $(DOWNLOADDIR)/openssh $(PKGROOT)/etc/init.d/openssh
ginstall -D $(DOWNLOADDIR)/sshd_config $(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW
ginstall -D $(DOWNLOADDIR)/openssh_restart_workaround.sh $(PKGROOT)/$(sharedstatedir)/openssh/openssh_restart_workaround.sh
+
+ for DOCDIR in $(DOCDIRS); do \
+ ginstall -d $(PKGROOT)/$(docdir)/$(DOCDIR); \
+ (cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$(DOCDIR)/); \
+ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(DOCDIR)/; \
+ done
+ @$(MAKECOOKIE)
-ifdef LPK
- mkdir -p $(PKGROOT)/$(docdir)/openssh_lpk/
- cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_lpk/
- ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh_lpk/
-else
- mkdir -p $(PKGROOT)/$(docdir)/openssh/
- cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh/
- ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh/
- mkdir -p $(PKGROOT)/$(docdir)/openssh_client/
- cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_client/
- cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_client/
- ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh_client/
-endif
-
customize_ssh_config:
# Correction des chemins
- gsed -i -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' -e 's,/usr/libexec/,/opt/csw/libexec/,g' "$(INSTALLISADIR)/$(sysconfdir)/ssh/sshd_config"
- gsed -i -e 's,^ *# *UsePAM *.*,UsePAM yes,g' -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(INSTALLISADIR)/$(sysconfdir)/ssh/sshd_config"
+ gsed -i -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' -e 's,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config"
+ gsed -i -e 's,^ *# *UsePAM *.*,UsePAM yes,g' -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config"
+ @$(MAKECOOKIE)
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-29 17:29:36 UTC (rev 4059)
@@ -7,16 +7,8 @@
8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh
547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml
fd50a65230ec1ead7949e8500844b0bf download/openssh
-e62e5c0ba0dc79449789ecb63e2aa9d0 download/CSWossh.gspec
-6e91d098018d7e1855b626ea463b8a29 download/CSWossh.depend
-1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall
-0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall
-e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall
-3378c7fb3d60254747df3642dde7b5d3 download/CSWossh.prototype
-f756587e423d2fad4f910ed78fa5f10d download/CSWosshclient.gspec
-1055c346c01d99d09572d978fad10256 download/CSWosshclient.depend
-137254f217b342ed6dd8a5cc31033dec download/CSWosshclient.prototype
bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh
+2768c47277b19c556403ea652cf8ceb3 download/openssh_dyngspec.fakespec
bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch
4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch
ca5403c8e1539d5ced0573f289ed7aef download/no_x_forwarding_bug.patch
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.depend
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.depend 2009-03-29 17:29:36 UTC (rev 4059)
@@ -1,5 +0,0 @@
-P CSWosslrt
-P CSWtcpwrap
-P CSWzlib
-P CSWkrb5lib
-P CSWosshclient
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec 2009-03-29 17:29:36 UTC (rev 4059)
@@ -1,6 +0,0 @@
-%var bitname openssh
-%var pkgname CSWossh
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/LICENCE
-%var SERVICE_CONF_FILES /opt/csw/etc/ssh/sshd_config
-%include url file://%{PKGLIB}/smf_enabled.gspec
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.depend 2009-03-29 17:29:36 UTC (rev 4059)
@@ -1,3 +0,0 @@
-P CSWosslrt
-P CSWzlib
-P CSWkrb5lib
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-29 17:07:07 UTC (rev 4058)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-29 17:29:36 UTC (rev 4059)
@@ -1,4 +0,0 @@
-%var bitname openssh_client
-%var pkgname CSWosshclient
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/LICENCE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list