Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC 2015/227 SunSSH EOF and Removal
authorHuie-Ying Lee <huieying.lee@oracle.com>
Thu, 14 Apr 2016 14:15:13 -0700
changeset 5774 5867c90db266
parent 5772 497bef0e3f86
child 5775 ecbec224a370
PSARC 2015/227 SunSSH EOF and Removal 22807914 update config/service attributes and add SSH server ancestor pkg (step 3-4)
components/meta-packages/history/history file | annotate | diff | comparison | revisions
components/openssh/network-ssh.p5m file | annotate | diff | comparison | revisions
components/openssh/service-network-ssh.p5m file | annotate | diff | comparison | revisions 
--- a/components/meta-packages/history/history	Thu Apr 14 13:52:55 2016 -0700
+++ b/components/meta-packages/history/history	Thu Apr 14 14:15:13 2016 -0700
@@ -666,6 +666,7 @@
 [email protected],5.11-0.133 web/proxy/[email protected]
 [email protected],5.11-0.133 network/[email protected],5.11-0.133
 [email protected],5.11-0.133 network/ssh/[email protected],5.11-0.133
[email protected],5.11-0.133 service/network/[email protected],5.11-0.133
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 service/security/[email protected]
 [email protected],5.11-0.133 security/[email protected]
@@ -1072,6 +1073,8 @@
 security/[email protected]
 security/[email protected]
 service/network/samba/[email protected]
+service/network/[email protected] service/network/[email protected]
+service/network/[email protected] service/network/[email protected]
 service/storage/[email protected],5.11-0.175.0.0.0.0.0 desktop/[email protected]
 system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
 system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
--- a/components/openssh/network-ssh.p5m	Thu Apr 14 13:52:55 2016 -0700
+++ b/components/openssh/network-ssh.p5m	Thu Apr 14 14:15:13 2016 -0700
@@ -35,7 +35,7 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2012/335
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=etc/ssh/ssh_config group=sys mode=0644 \
-    original_name=SUNWssh:etc/ssh/ssh_config overlay=true preserve=renamenew
+    original_name=SUNWssh:etc/ssh/ssh_config overlay=allow preserve=renamenew
 file path=usr/bin/scp mode=0555
 file path=usr/bin/sftp mode=0555
 file path=usr/bin/ssh mode=0555
--- a/components/openssh/service-network-ssh.p5m	Thu Apr 14 13:52:55 2016 -0700
+++ b/components/openssh/service-network-ssh.p5m	Thu Apr 14 14:15:13 2016 -0700
@@ -34,13 +34,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2015/227
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=etc/ssh/moduli group=sys mode=0644 overlay=true preserve=renamenew
+file path=etc/ssh/moduli group=sys mode=0644 overlay=allow preserve=renamenew
 file path=etc/ssh/sshd_config group=sys mode=0644 \
-    original_name=SUNWsshd:etc/ssh/sshd_config overlay=true preserve=renamenew
-file sources/ssh.xml path=lib/svc/manifest/network/ssh.xml group=sys mode=0444 \
-    overlay=true preserve=true
-file sources/sshd.sh path=lib/svc/method/sshd mode=0555 overlay=true \
-    preserve=true
+    original_name=SUNWsshd:etc/ssh/sshd_config overlay=allow preserve=renamenew
+file sources/ssh.xml path=lib/svc/manifest/network/ssh.xml group=sys mode=0444
+file sources/sshd.sh path=lib/svc/method/sshd mode=0555
 file usr/lib/dtrace/64/sftp64.d path=usr/lib/dtrace/sftp.d
 file path=usr/lib/ssh/sftp-server mode=0555
 file path=usr/lib/ssh/ssh-keysign mode=4555
@@ -56,6 +54,10 @@
 group groupname=sshd gid=22
 user username=sshd ftpuser=false gcos-field="sshd privsep" group=sshd \
     home-dir=/var/empty login-shell=/bin/false uid=22
+legacy pkg=SUNWsshdr desc="Secure Shell protocol Server" \
+    name="SSH Server, (Root)"
+legacy pkg=SUNWsshdu desc="Secure Shell protocol Server" \
+    name="SSH Server, (Usr)"
 license openssh.license license="BSD, BSD-like (OpenSSH)" \
     com.oracle.info.description="OpenSSH, a suite of tools that help secure network connections" \
     com.oracle.info.name=openssh com.oracle.info.tpno=$(TPNO_OPENSSH) \
upstream/oracle/userland-gate