371 pkg:/network/ftp should not contain /usr/sbin/ping

          --- old/usr/src/pkg/manifests/network-ftp.mf
          +++ new/usr/src/pkg/manifests/network-ftp.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri value=pkg:/network/ftp@$(PKGVERS)
  27      -set name=pkg.description value="Basic IP commands (/usr/sbin/ping, /bin/ftp)"
  28      -set name=pkg.summary value="Basic IP commands"
       28 +set name=pkg.description \
       29 +    value="The ftp command is the user interface to the Internet standard File Transfer Protocol (FTP)"
       30 +set name=pkg.summary value="FTP client command"
  29   31  set name=info.classification \
  30   32      value="org.opensolaris.category.2008:Applications/System Utilities"
  31   33  set name=variant.arch value=$(ARCH)
  32   34  dir path=etc group=sys
  33   35  dir path=etc/default group=sys
  34   36  dir path=usr group=sys
  35   37  dir path=usr/bin
  36      -dir path=usr/sbin
  37   38  dir path=usr/share/man
  38   39  dir path=usr/share/man/man1
  39      -dir path=usr/share/man/man1m
  40   40  dir path=usr/share/man/man4
  41   41  file path=etc/default/ftp group=sys original_name=SUNWbip:etc/default/ftp \
  42   42      preserve=true
  43   43  file path=usr/bin/ftp mode=0555
  44      -file path=usr/sbin/ping mode=4555
  45   44  file path=usr/share/man/man1/ftp.1
  46      -file path=usr/share/man/man1m/ping.1m
  47   45  file path=usr/share/man/man4/ftp.4
  48   46  file path=usr/share/man/man4/netrc.4
  49      -legacy pkg=SUNWbip desc="Basic IP commands (/usr/sbin/ping, /bin/ftp)" \
  50      -    name="Basic IP commands (Usr)"
       47 +legacy pkg=SUNWbip desc="Basic IP commands" name="Basic IP commands (Usr)"
  51   48  legacy pkg=SUNWbipr desc="Basic IP commands (Root)" \
  52   49      name="Basic IP commands (Root)"
  53   50  license cr_ATT license=cr_ATT
  54   51  license cr_Sun license=cr_Sun
  55   52  license lic_CDDL license=lic_CDDL
  56   53  license usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE \
  57   54      license=usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX