[csw-devel] SF.net SVN: gar:[5456] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Tue Jun 30 19:40:52 CEST 2009
Revision: 5456
http://gar.svn.sourceforge.net/gar/?rev=5456&view=rev
Author: chninkel
Date: 2009-06-30 17:40:52 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
openssh: switched to cswclassutils SMF support
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/checksums
csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
csw/mgar/pkg/openssh/trunk/files/changelog.CSW
csw/mgar/pkg/openssh/trunk/files/cswopenssh
csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
Added Paths:
-----------
csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/openssh_dyngspec.fakespec
csw/mgar/pkg/openssh/trunk/files/openssh_lpk_dyngspec.fakespec
csw/mgar/pkg/openssh/trunk/files/svc-cswopenssh
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2009-06-30 17:40:52 UTC (rev 5456)
@@ -56,7 +56,7 @@
DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz
DISTFILES += changelog.CSW
-DISTFILES += cswopenssh svc-cswopenssh cswopenssh.xml
+DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
LICENSE = LICENCE
@@ -79,12 +79,7 @@
REQUIRED_PKGS += CSWcswclassutils
SPKG_CLASSES = none cswpreserveconf
-# 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)
@@ -103,7 +98,6 @@
# we always register the lpk related files so checksum
# is the same with LPK enabled or not
DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
-DISTFILES += openssh_lpk_dyngspec.fakespec
ifdef LPK
PACKAGES = CSWosshlpk
CATALOGNAME_CSWosshlpk = openssh_lpk
@@ -113,8 +107,6 @@
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
-
- _CATEGORY_GSPEC_INCLUDE = $(if $(findstring CSWosshclient,$*),csw_dyndepend.gspec,../../$(DOWNLOADDIR)/openssh_lpk_dyngspec.fakespec)
# we must reset the CSWosshclient description to avoid a bug in the automatic dependancy generation
SPKG_DESC_CSWosshclient =
Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/checksums 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,11 +1,9 @@
-ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz
-c9f2e90545738c1408a52647ae45be70 download/changelog.CSW
-73416a82ca98ba40e7b86ea94d0339cf download/cswopenssh
-8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh
-547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml
-2768c47277b19c556403ea652cf8ceb3 download/openssh_dyngspec.fakespec
+a51dd54a24d61cad406d02343cc826f0 download/changelog.CSW
9153031524651a18e7edaed4637aa769 download/contrib-openssh-lpk-5.2p1-0.3.9.patch
-d3f074f8af957bcb4f2f6122d4cc7442 download/openssh_lpk_dyngspec.fakespec
-bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch
+a5ebb2e3fdaa06c3c9edba55aac5f83b download/cswopenssh
+8e765642349b6321d01b33e95304e113 download/cswopenssh.xml
4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch
ca5403c8e1539d5ced0573f289ed7aef download/no_x_forwarding_bug.patch
+bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch
+ada79c7328a8551bdf55c95e631e7dad download/openssh-5.2p1.tar.gz
+db57ce80e8944213443caa4c52c884e5 download/sshd.smf_wrapper
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,8 +1,11 @@
-f none /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
+d none /opt/csw/etc/pkg/CSWossh 0755 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswopenssh 0755 root bin
+f cswpreserveconf /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
f cswpreserveconf /opt/csw/etc/ssh/moduli.CSW 0644 root bin
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/sftp-server 0755 root bin
f none /opt/csw/sbin/sshd 0755 root bin
+f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin
f none /opt/csw/share/Ssh.bin 0644 root bin
d none /opt/csw/share/doc/openssh 0755 root bin
f none /opt/csw/share/doc/openssh/changelog.CSW 0644 root bin
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,8 +1,11 @@
-f none /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
+d none /opt/csw/etc/pkg/CSWosshlpk 0755 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswopenssh 0755 root bin
+f cswpreserveconf /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
f cswpreserveconf /opt/csw/etc/ssh/moduli.CSW 0644 root bin
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/sftp-server 0755 root bin
f none /opt/csw/sbin/sshd 0755 root bin
+f none /opt/csw/sbin/sshd.smf_wrapper 0755 root bin
f none /opt/csw/share/Ssh.bin 0644 root bin
d none /opt/csw/share/doc/openssh_lpk 0755 root bin
f none /opt/csw/share/doc/openssh_lpk/changelog.CSW 0644 root bin
Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,3 +1,9 @@
+openssh (5.2,REV=2009.06.30_rev=p1) unstable
+
+ * Switched to cswclassutils for SMF support.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 30 Jun 2009 10:34:39 +0100
+
openssh (5.2,REV=2008.03.28_rev=p1) unstable
* New upstream version.
Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh 2009-06-30 17:40:52 UTC (rev 5456)
@@ -2,6 +2,14 @@
# stolen from solaris 9 sshd script, more or less.
+# cswclassutils smf variable
+#RC_KNUM 99
+#RC_SNUM 99
+#RC_KLEV 0,1,2,S
+#RC_SLEV 3
+#MANIFEST /var/opt/csw/svc/manifest/network/cswopenssh.xml
+
+
PATH=/usr/bin:/opt/csw/bin:/usr/sbin
KEYDIR=/opt/csw/etc/ssh
Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2009-06-30 17:40:52 UTC (rev 5456)
@@ -45,7 +45,7 @@
<exec_method
name='start'
type='method'
- exec='/opt/csw/lib/svc/method/svc-cswopenssh start'
+ exec='/opt/csw/sbin/sshd.smf_wrapper'
timeout_seconds='60'>
<method_context/>
</exec_method>
Deleted: csw/mgar/pkg/openssh/trunk/files/openssh_dyngspec.fakespec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh_dyngspec.fakespec 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/openssh_dyngspec.fakespec 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,3 +0,0 @@
-%include url file://%{PKGLIB}/csw_dyngspec.gspec
-%var SERVICE_CONF_FILES /opt/csw/etc/ssh/sshd_config
-%include url file://%{PKGLIB}/smf_enabled.gspec
Deleted: csw/mgar/pkg/openssh/trunk/files/openssh_lpk_dyngspec.fakespec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh_lpk_dyngspec.fakespec 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/openssh_lpk_dyngspec.fakespec 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,6 +0,0 @@
-%include url file://%{PKGLIB}/csw_dyngspec.gspec
-%var SERVICE_CONF_FILES /opt/csw/etc/ssh/sshd_config
-%var RC_INIT_SCRIPT cswopenssh
-%var SMF_MANIFEST cswopenssh.xml
-%var SMF_SCRIPT svc-cswopenssh
-%include url file://%{PKGLIB}/smf_enabled.gspec
Copied: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper (from rev 4054, csw/mgar/pkg/openssh/trunk/files/svc-cswopenssh)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper 2009-06-30 17:40:52 UTC (rev 5456)
@@ -0,0 +1,19 @@
+#!/sbin/sh
+
+PATH=/usr/bin:/opt/csw/bin:/usr/sbin
+
+KEYDIR=/opt/csw/etc/ssh
+PIDFILE=/var/run/sshd.pid
+if [ -x /opt/csw/bin/ssh-keygen ]; then
+ if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then
+ echo "Creating new RSA public/private host key pair"
+ /opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_rsa_key -t rsa -N ''
+ fi
+
+ if [ ! -f "$KEYDIR/ssh_host_dsa_key" ]; then
+ echo "Creating new DSA public/private host key pair"
+ /opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_dsa_key -t dsa -N ''
+ fi
+fi
+
+/opt/csw/sbin/sshd
Deleted: csw/mgar/pkg/openssh/trunk/files/svc-cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/svc-cswopenssh 2009-06-30 17:19:14 UTC (rev 5455)
+++ csw/mgar/pkg/openssh/trunk/files/svc-cswopenssh 2009-06-30 17:40:52 UTC (rev 5456)
@@ -1,40 +0,0 @@
-#!/sbin/sh
-
-# stolen from solaris 9 sshd script, more or less.
-
-PATH=/usr/bin:/opt/csw/bin:/usr/sbin
-
-KEYDIR=/opt/csw/etc/ssh
-PIDFILE=/var/run/sshd.pid
-case $1 in
-'start')
- if [ -x /opt/csw/bin/ssh-keygen ]; then
- if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then
- echo "Creating new RSA public/private host key pair"
- /opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_rsa_key -t rsa -N ''
- fi
-
- if [ ! -f "$KEYDIR/ssh_host_dsa_key" ]; then
- echo "Creating new DSA public/private host key pair"
- /opt/csw/bin/ssh-keygen -f $KEYDIR/ssh_host_dsa_key -t dsa -N ''
- fi
- fi
-
- /opt/csw/sbin/sshd
- ;;
-'stop')
- if [ -f "$PIDFILE" ]; then
- /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE`
- fi
- ;;
-
-'restart')
- if [ -f "$PIDFILE" ]; then
- /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE`
- fi
- ;;
-*)
- echo "Usage: $0 { start | stop | restart }"
- exit 1
- ;;
-esac
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