Print this page
fix openssh/sunssh exclude, allow openssh in entire

Split Close
Expand all
Collapse all
          --- old/build/entire/entire.p5m
          +++ new/build/entire/entire.p5m
↓ open down ↓ 253 lines elided ↑ open up ↑
 254  254  depend fmri=locale/zh_mo@0.5.11,5.11-@PVER@ type=require
 255  255  depend fmri=locale/zh_sg@0.5.11,5.11-@PVER@ type=require
 256  256  depend fmri=locale/zh_tw@0.5.11,5.11-@PVER@ type=require
 257  257  depend fmri=naming/ldap@0.5.11,5.11-@PVER@ type=require
 258  258  depend fmri=network/bridging@0.5.11,5.11-@PVER@ type=require
 259  259  depend fmri=network/dns/bind@9.10,5.11-@PVER@ type=require
 260  260  depend fmri=network/ftp@0.5.11,5.11-@PVER@ type=require
 261  261  depend fmri=network/ipfilter@0.5.11,5.11-@PVER@ type=require
 262  262  depend fmri=network/iscsi/initiator@0.5.11,5.11-@PVER@ type=require
 263  263  depend fmri=network/iscsi/iser@0.5.11,5.11-@PVER@ type=require
 264      -depend fmri=network/ssh/ssh-key@0.5.11,5.11-@PVER@ type=require
 265      -depend fmri=network/ssh@0.5.11,5.11-@PVER@ type=require
      264 +depend fmri=network/ssh/ssh-key@0.5.11,5.11-@PVER@ fmri=network/openssh type=require-any
      265 +depend fmri=network/ssh@0.5.11,5.11-@PVER@ fmri=network/openssh type=require-any
 266  266  depend fmri=network/telnet@0.5.11,5.11-@PVER@ type=require
 267  267  depend fmri=package/pkg@0.5.11,5.11-@PVER@ type=require
 268  268  depend fmri=release/name@0.5.11,5.11-@PVER@ type=require
 269  269  depend fmri=release/notices@0.5.11,5.11-@PVER@ type=require
 270  270  depend fmri=runtime/perl@5.16.1,5.11-@PVER@ type=require
 271  271  depend fmri=runtime/perl/manual@5.16.1,5.11-@PVER@ type=require
 272  272  depend fmri=runtime/perl/module/sun-solaris@0.5.11,5.11-@PVER@ type=require
 273  273  depend fmri=runtime/python-26@2.6.8,5.11-@PVER@ type=require
 274  274  depend fmri=security/sudo@1.8,5.11-@PVER@ type=require
 275  275  depend fmri=service/fault-management@0.5.11,5.11-@PVER@ type=require
 276  276  depend fmri=service/file-system/nfs@0.5.11,5.11-@PVER@ type=require
 277  277  depend fmri=service/file-system/smb@0.5.11,5.11-@PVER@ type=require
 278  278  depend fmri=service/hal@0.5.11,5.11-@PVER@ type=require
 279  279  depend fmri=service/network/network-clients@0.5.11,5.11-@PVER@ type=require
 280  280  depend fmri=service/network/ntp@4.2.8,5.11-@PVER@ type=require
 281      -depend fmri=service/network/ssh@0.5.11,5.11-@PVER@ type=require
      281 +depend fmri=service/network/ssh@0.5.11,5.11-@PVER@ fmri=network/openssh-server type=require-any
 282  282  depend fmri=service/picl@0.5.11,5.11-@PVER@ type=require
 283  283  depend fmri=service/resource-pools/poold@0.5.11,5.11-@PVER@ type=require
 284  284  depend fmri=service/resource-pools@0.5.11,5.11-@PVER@ type=require
 285  285  depend fmri=service/storage/removable-media@0.5.11,5.11-@PVER@ type=require
 286  286  depend fmri=shell/bash@4.3,5.11-@PVER@ type=require
 287  287  depend fmri=shell/pipe-viewer@1.5,5.11-@PVER@ type=require
 288  288  depend fmri=shell/tcsh@6.18.1,5.11-@PVER@ type=require
 289  289  depend fmri=shell/zsh@5.0,5.11-@PVER@ type=require
 290  290  depend fmri=system/accounting/legacy@0.5.11,5.11-@PVER@ type=require
 291  291  depend fmri=system/boot/grub@0.97,5.11-@PVER@ type=require
↓ open down ↓ 76 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX