[csw-devel] SF.net SVN: gar:[10887] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Thu Sep 2 00:43:27 CEST 2010
Revision: 10887
http://gar.svn.sourceforge.net/gar/?rev=10887&view=rev
Author: chninkel
Date: 2010-09-01 22:43:26 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
openssh: switched to dynamic prototype
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/files/changelog.CSW
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2010-09-01 22:43:26 UTC (rev 10887)
@@ -45,6 +45,36 @@
PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
+PKGFILES_CSWossh = $(sbindir)/.*
+PKGFILES_CSWossh += $(docdir)/openssh/.*
+PKGFILES_CSWossh += $(mandir)/man5/sshd_config.5
+PKGFILES_CSWossh += $(mandir)/man8/sftp-server.8
+PKGFILES_CSWossh += $(mandir)/man8/sshd.8
+PKGFILES_CSWossh += $(libexecdir)/sftp-server
+PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
+PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
+PKGFILES_CSWossh += /var/empty
+PKGFILES_CSWossh += /etc$(prefix)/init.d/cswopenssh
+PKGFILES_CSWossh += /var$(prefix)/svc/manifest/network/cswopenssh.xml
+
+PKGFILES_CSWosshclient = $(bindir)/.*
+PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
+PKGFILES_CSWosshclient += $(mandir)/man1/.*
+PKGFILES_CSWosshclient += $(mandir)/man5/ssh_config.5
+PKGFILES_CSWosshclient += $(mandir)/man8/ssh-keysign.8
+PKGFILES_CSWosshclient += $(libexecdir)/ssh-keysign
+PKGFILES_CSWosshclient += $(sysconfdir)/ssh/ssh_config.CSW
+
+PROTOTYPE_MODIFIERS = setuid
+PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
+PROTOTYPE_PERMS_setuid = 4711
+
+
+PRESERVECONF = /opt/csw/etc/ssh/sshd_config
+PRESERVECONF += /opt/csw/etc/ssh/ssh_config
+PRESERVECONF += /opt/csw/etc/ssh/moduli
+INITSMF = /etc/opt/csw/init.d/cswopenssh
+
# The openssh package installs the server and the client
CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
@@ -56,9 +86,8 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*p\d+).tar.gz
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWossh.prototype CSWossh.preinstall CSWossh.checkinstall
-DISTFILES += CSWosshlpk.prototype CSWosshlpk.preinstall CSWosshlpk.checkinstall
-DISTFILES += CSWosshclient.prototype
+DISTFILES += CSWossh.preinstall CSWossh.checkinstall
+DISTFILES += CSWosshlpk.preinstall CSWosshlpk.checkinstall
DISTFILES += changelog.CSW
DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
@@ -78,12 +107,13 @@
# 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
+DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG
# we're using conf handling class from the cswclassutils package
RUNTIME_DEP_PKGS += CSWcswclassutils
+
##### Build and installation information #####
CONFIGURE_ARGS = $(DIRPATHS)
@@ -133,11 +163,12 @@
@$(MAKECOOKIE)
# adding documentation files
-pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files
+pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories
merge-contrib-files:
ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
+ chmod -x "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
merge-init-files:
ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh"
@@ -149,19 +180,17 @@
for DOCDIR in $(foreach _PKG,$(PACKAGES),$(call catalogname,$(_PKG))); do \
ginstall -d $(PKGROOT)/$(docdir)/$$DOCDIR; \
(cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/$$DOCDIR/); \
+ (cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \
ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \
done
@$(MAKECOOKIE)
merge-config-files:
- ginstall $(PKGROOT)/$(sysconfdir)/ssh/ssh_config $(PKGROOT)/$(sysconfdir)/ssh/ssh_config.CSW
- ginstall $(PKGROOT)/$(sysconfdir)/ssh/moduli $(PKGROOT)/$(sysconfdir)/ssh/moduli.CSW
# we change some default value in the server config file
- sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' \
- -e 's,/usr/libexec/,/opt/csw/libexec/,g' \
- -e 's,^ *# *UsePAM *.*,UsePAM yes,g' \
- -e 's,^ *# *PrintMotd *.*,PrintMotd no,g' \
- -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config" > "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW
+ perl -pi -e 's,/etc/ssh/,/opt/csw/etc/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"
@$(MAKECOOKIE)
-
+merge-special-directories:
+ ginstall -d $(PKGROOT)/var/empty
+ ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,32 +0,0 @@
-d none /opt/csw/etc/pkg/CSWossh 0755 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswopenssh 0755 root bin
-d none /opt/csw/etc/ssh 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
-d none /opt/csw/share/doc/openssh 0755 root bin
-f none /opt/csw/share/doc/openssh/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/openssh/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh/license=LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh/README 0644 root bin
-f none /opt/csw/share/doc/openssh/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh/WARNING.RNG 0644 root bin
-f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin
-f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
-f none /opt/csw/share/man/man8/sshd.8 0644 root bin
-d none /opt/csw/share/openssh 0755 root bin
-d none /var/empty
-f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys
-i checkpkg_override=checkpkg_override.CSWossh
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,40 +0,0 @@
-f none /opt/csw/bin/scp 0755 root bin
-f none /opt/csw/bin/sftp 0755 root bin
-s none /opt/csw/bin/slogin=./ssh
-f none /opt/csw/bin/ssh 0755 root bin
-f none /opt/csw/bin/ssh-add 0755 root bin
-f none /opt/csw/bin/ssh-agent 0755 root bin
-f none /opt/csw/bin/ssh-copy-id 0755 root bin
-f none /opt/csw/bin/ssh-keygen 0755 root bin
-f none /opt/csw/bin/ssh-keyscan 0755 root bin
-d none /opt/csw/etc/ssh 0755 root bin
-f cswpreserveconf /opt/csw/etc/ssh/ssh_config.CSW 0644 root bin
-d none /opt/csw/libexec 0755 root bin
-f none /opt/csw/libexec/ssh-keysign 4711 root bin
-d none /opt/csw/share/doc/openssh_client 0755 root bin
-f none /opt/csw/share/doc/openssh_client/changelog.CSW 0644 root bin
-f none /opt/csw/share/doc/openssh_client/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh_client/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh_client/license=LICENCE
-f none /opt/csw/share/doc/openssh_client/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh_client/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh_client/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh_client/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh_client/WARNING.RNG 0644 root bin
-f none /opt/csw/share/man/man1/scp.1 0644 root bin
-f none /opt/csw/share/man/man1/sftp.1 0644 root bin
-s none /opt/csw/share/man/man1/slogin.1=./ssh.1
-f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-copy-id.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin
-f none /opt/csw/share/man/man1/ssh.1 0644 root bin
-f none /opt/csw/share/man/man5/ssh_config.5 0644 root bin
-f none /opt/csw/share/man/man8/ssh-keysign.8 0644 root bin
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2010-09-01 22:43:26 UTC (rev 10887)
@@ -1,36 +0,0 @@
-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
-f none /opt/csw/share/doc/openssh_lpk/CREDITS 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/ChangeLog 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/ChangeLog.gssapi 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/INSTALL 0644 root bin
-l none /opt/csw/share/doc/openssh_lpk/license=LICENCE
-f none /opt/csw/share/doc/openssh_lpk/LICENCE 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/OVERVIEW 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.dns 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.platform 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.privsep 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.smartcard 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.tun 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/TODO 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/WARNING.RNG 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/openssh-lpk_openldap.schema 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/openssh-lpk_sun.schema 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/lpk-user-example.txt 0644 root bin
-f none /opt/csw/share/doc/openssh_lpk/README.lpk 0644 root bin
-f none /opt/csw/share/man/man5/sshd_config.5 0644 root bin
-f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
-f none /opt/csw/share/man/man8/sshd.8 0644 root bin
-d none /opt/csw/share/openssh 0755 root bin
-d none /var/empty
-f none /var/opt/csw/svc/manifest/network/cswopenssh.xml 0644 root sys
Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-09-01 21:42:06 UTC (rev 10886)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2010-09-01 22:43:26 UTC (rev 10887)
@@ -3,6 +3,7 @@
* New upstream release.
* Removed patch applied upstream (derelativise_path_bugfix.patch
and dont_derelativise_authorizedkeysfile_option.patch).
+ * [Build system] Switched to dynamic prototype.
-- Yann Rouillard <yann at opencsw.org> Wed, 01 Sep 2010 23:25:24 +0200
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