# HG changeset patch # User Huie-Ying Lee # Date 1454538726 28800 # Node ID a3366751f9c633485237932ebd0ce344abb76b36 # Parent 2cf37adf29cfaad262f3530af93f6c416df687bb PSARC 2015/227 SunSSH EOF and Removal 22631349 remove mediator links from pkg:/network/openssh (step 3-1) diff -r 2cf37adf29cf -r a3366751f9c6 components/openssh/openssh.p5m --- a/components/openssh/openssh.p5m Tue Feb 02 16:00:39 2016 -0800 +++ b/components/openssh/openssh.p5m Wed Feb 03 14:32:06 2016 -0800 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability "Pass-through Uncommitted"> set name=pkg.fmri \ @@ -34,99 +34,32 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2012/335 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -link path=usr/bin/scp target=../lib/openssh/bin/scp mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/sftp target=../lib/openssh/bin/sftp mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/ssh target=../lib/openssh/bin/ssh mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/ssh-add target=../lib/openssh/bin/ssh-add mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/ssh-agent target=../lib/openssh/bin/ssh-agent mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/ssh-keygen target=../lib/openssh/bin/ssh-keygen mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/bin/ssh-keyscan target=../lib/openssh/bin/ssh-keyscan \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/lib/dtrace/64/sftp64.d path=usr/lib/dtrace/64/sftp64.d mode=0555 -$(SOLARIS_12_ONLY)link path=usr/lib/dtrace/sftp.d target=./64/sftp64.d \ - $(SOLARIS_12_ONLY)mediator=ssh \ - $(SOLARIS_12_ONLY)mediator-implementation=openssh \ - $(SOLARIS_12_ONLY)mediator-priority=vendor -file usr/bin/scp path=usr/lib/openssh/bin/scp mode=0555 -file usr/bin/sftp path=usr/lib/openssh/bin/sftp mode=0555 -file usr/bin/ssh path=usr/lib/openssh/bin/ssh mode=0555 -file usr/bin/ssh-add path=usr/lib/openssh/bin/ssh-add mode=0555 -file usr/bin/ssh-agent path=usr/lib/openssh/bin/ssh-agent mode=2555 -file usr/bin/ssh-keygen path=usr/lib/openssh/bin/ssh-keygen mode=0555 -file usr/bin/ssh-keyscan path=usr/lib/openssh/bin/ssh-keyscan mode=0555 -file usr/lib/ssh/sftp-server path=usr/lib/openssh/lib/sftp-server mode=0555 -file usr/lib/ssh/ssh-keysign path=usr/lib/openssh/lib/ssh-keysign mode=4555 -file usr/lib/ssh/ssh-pkcs11-helper path=usr/lib/openssh/lib/ssh-pkcs11-helper \ - mode=0555 -file usr/lib/ssh/sshd path=usr/lib/openssh/lib/sshd mode=0555 -link path=usr/lib/ssh/sftp-server target=../openssh/lib/sftp-server \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -link path=usr/lib/ssh/ssh-keysign target=../openssh/lib/ssh-keysign \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -link path=usr/lib/ssh/ssh-pkcs11-helper \ - target=../openssh/lib/ssh-pkcs11-helper mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -link path=usr/lib/ssh/sshd target=../openssh/lib/sshd mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor \ - restart_fmri=svc:/network/ssh:default -link path=usr/share/man/man1/scp.1 target=./scp.openssh.1 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/scp.1 path=usr/share/man/man1/scp.openssh.1 mode=0444 -link path=usr/share/man/man1/sftp.1 target=./sftp.openssh.1 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/sftp.1 path=usr/share/man/man1/sftp.openssh.1 mode=0444 -link path=usr/share/man/man1/ssh-add.1 target=./ssh-add.openssh.1 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/ssh-add.1 path=usr/share/man/man1/ssh-add.openssh.1 \ - mode=0444 -link path=usr/share/man/man1/ssh-agent.1 target=./ssh-agent.openssh.1 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/ssh-agent.1 \ - path=usr/share/man/man1/ssh-agent.openssh.1 mode=0444 -link path=usr/share/man/man1/ssh-keygen.1 target=./ssh-keygen.openssh.1 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/ssh-keygen.1 \ - path=usr/share/man/man1/ssh-keygen.openssh.1 mode=0444 -link path=usr/share/man/man1/ssh-keyscan.1 target=./ssh-keyscan.openssh.1 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/ssh-keyscan.1 \ - path=usr/share/man/man1/ssh-keyscan.openssh.1 mode=0444 -link path=usr/share/man/man1/ssh.1 target=./ssh.openssh.1 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man1/ssh.1 path=usr/share/man/man1/ssh.openssh.1 mode=0444 -link path=usr/share/man/man5/moduli.5 target=./moduli.openssh.5 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man5/moduli.5 path=usr/share/man/man5/moduli.openssh.5 -link path=usr/share/man/man5/ssh_config.5 target=./ssh_config.openssh.5 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man5/ssh_config.5 \ - path=usr/share/man/man5/ssh_config.openssh.5 -link path=usr/share/man/man5/sshd_config.5 target=./sshd_config.openssh.5 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man5/sshd_config.5 \ - path=usr/share/man/man5/sshd_config.openssh.5 -link path=usr/share/man/man8/sftp-server.8 target=./sftp-server.openssh.8 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man8/sftp-server.8 \ - path=usr/share/man/man8/sftp-server.openssh.8 -link path=usr/share/man/man8/ssh-keysign.8 target=./ssh-keysign.openssh.8 \ - mediator=ssh mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man8/ssh-keysign.8 \ - path=usr/share/man/man8/ssh-keysign.openssh.8 -link path=usr/share/man/man8/ssh-pkcs11-helper.8 \ - target=./ssh-pkcs11-helper.openssh.8 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man8/ssh-pkcs11-helper.8 \ - path=usr/share/man/man8/ssh-pkcs11-helper.openssh.8 -link path=usr/share/man/man8/sshd.8 target=./sshd.openssh.8 mediator=ssh \ - mediator-implementation=openssh mediator-priority=vendor -file usr/share/man/man8/sshd.8 path=usr/share/man/man8/sshd.openssh.8 +file path=usr/bin/scp mode=0555 +file path=usr/bin/sftp mode=0555 +file path=usr/bin/ssh mode=0555 +file path=usr/bin/ssh-add mode=0555 +file path=usr/bin/ssh-agent mode=2555 +file path=usr/bin/ssh-keygen mode=0555 +file path=usr/bin/ssh-keyscan mode=0555 +file usr/lib/dtrace/64/sftp64.d path=usr/lib/dtrace/sftp.d mode=0555 +file path=usr/lib/ssh/sftp-server mode=0555 +file path=usr/lib/ssh/ssh-keysign mode=4555 +file path=usr/lib/ssh/ssh-pkcs11-helper mode=0555 +file path=usr/lib/ssh/sshd mode=0555 +file path=usr/share/man/man1/scp.1 mode=0444 +file path=usr/share/man/man1/sftp.1 mode=0444 +file path=usr/share/man/man1/ssh-add.1 mode=0444 +file path=usr/share/man/man1/ssh-agent.1 mode=0444 +file path=usr/share/man/man1/ssh-keygen.1 mode=0444 +file path=usr/share/man/man1/ssh-keyscan.1 mode=0444 +file path=usr/share/man/man1/ssh.1 mode=0444 +file path=usr/share/man/man5/moduli.5 +file path=usr/share/man/man5/ssh_config.5 +file path=usr/share/man/man5/sshd_config.5 +file path=usr/share/man/man8/sftp-server.8 +file path=usr/share/man/man8/ssh-keysign.8 +file path=usr/share/man/man8/ssh-pkcs11-helper.8 +file path=usr/share/man/man8/sshd.8 dir path=var/empty owner=root group=sys mode=0755 sysattr=readonly group groupname=sshd gid=22 user username=sshd ftpuser=false gcos-field="sshd privsep" group=sshd \