[csw-devel] SF.net SVN: gar:[10909] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Thu Sep 2 17:09:06 CEST 2010
Revision: 10909
http://gar.svn.sourceforge.net/gar/?rev=10909&view=rev
Author: chninkel
Date: 2010-09-02 15:09:05 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
openssh: switched to cswclassutils for user/group creation (no more preinstall code !)
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/openssh/trunk/files/cswusergroup
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2010-09-02 15:09:05 UTC (rev 10909)
@@ -36,12 +36,10 @@
CATALOGNAME_CSWossh = openssh
SPKG_DESC_CSWossh = OpenSSH Secure Shell server
RUNTIME_DEP_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
-SPKG_CLASSES_CSWossh = none cswmigrateconf cswpreserveconf cswinitsmf
CATALOGNAME_CSWosshclient = openssh_client
SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client
RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib
-SPKG_CLASSES_CSWosshclient = none cswmigrateconf cswpreserveconf
PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
@@ -56,6 +54,7 @@
PKGFILES_CSWossh += $(localstatedir)/empty
PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
+PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup
PKGFILES_CSWosshclient = $(bindir)/.*
PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
@@ -74,6 +73,7 @@
PRESERVECONF += $(sysconfdir)/ssh/ssh_config
PRESERVECONF += $(sysconfdir)/ssh/moduli
INITSMF = $(sysconfdir)/init.d/cswopenssh
+USERGROUP = $(prefix)/etc/pkg/CSWossh/cswusergroup
MIGRATE_FILES_CSWossh = moduli sshd_config
MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
@@ -96,9 +96,10 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWossh.preinstall CSWossh.checkinstall
-DISTFILES += CSWosshlpk.preinstall CSWosshlpk.checkinstall
+DISTFILES += CSWossh.checkinstall
+DISTFILES += CSWosshlpk.checkinstall
DISTFILES += changelog.CSW
+DISTFILES += cswusergroup
DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
@@ -157,7 +158,6 @@
CATALOGNAME_CSWosshlpk = openssh_lpk
SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support
RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt
- SPKG_CLASSES_CSWosshlpk = none cswpreserveconf cswinitsmf
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
@@ -195,7 +195,6 @@
ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml"
ginstall -D "$(WORKDIR_FIRSTMOD)/sshd.smf_wrapper" "$(PKGROOT)/opt/csw/sbin/sshd.smf_wrapper"
-
merge-doc-files:
for DOCDIR in $(foreach _PKG,$(PACKAGES),$(call catalogname,$(_PKG))); do \
ginstall -d $(PKGROOT)/$(docdir)/$$DOCDIR; \
@@ -209,9 +208,10 @@
# we change some default value in the server config file
perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
+ ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
@$(MAKECOOKIE)
merge-special-directories:
ginstall -d $(PKGROOT)$(localstatedir)/empty
- ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh
+ ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall 2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall 2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-
-#checks for /dev/random are done in checkinstall
-
-grep '^sshd:' $PKG_ROOT_DIR/etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
- getent passwd sshd >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDUSER=1
- fi
-fi
-
-if [ "$PKG_ROOT_DIR" = "" ] ; then
- PKG_ROOT_DIR=/
-fi
-
-if [ "$NEEDUSER" = 1 ] ; then
- echo Adding required sshd user
- chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
-fi
-
-true
-
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall 2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall 2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-
-#checks for /dev/random are done in checkinstall
-
-grep '^sshd:' $PKG_ROOT_DIR/etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
- getent passwd sshd >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDUSER=1
- fi
-fi
-
-if [ "$PKG_ROOT_DIR" = "" ] ; then
- PKG_ROOT_DIR=/
-fi
-
-if [ "$NEEDUSER" = 1 ] ; then
- echo Adding required sshd user
- chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
-fi
-
-true
-
Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-09-02 14:57:08 UTC (rev 10908)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-09-02 15:09:05 UTC (rev 10909)
@@ -1,4 +1,4 @@
-openssh (5.6p1,REV=2010.09.01) unstable
+openssh (5.6p1,REV=2010.09.02) unstable
* New upstream release.
* Removed patch applied upstream (derelativise_path_bugfix.patch
@@ -7,8 +7,9 @@
* Moved privilege separation directory from /var/empty to
/var/opt/csw/var/empty.
* [Build system] Switched to dynamic prototype.
+ * [Build system] Switched to cswclassutils for user/group creation.
- -- Yann Rouillard <yann at opencsw.org> Wed, 01 Sep 2010 23:25:24 +0200
+ -- Yann Rouillard <yann at opencsw.org> Wed, 02 Sep 2010 23:25:24 +0200
openssh (5.4p1,REV=2010.03.25) unstable
Added: csw/mgar/pkg/openssh/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswusergroup (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/cswusergroup 2010-09-02 15:09:05 UTC (rev 10909)
@@ -0,0 +1 @@
+sshd:nogroup:sshd nonpriv user:/var/run:/bin/false:::NP
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