NEX-9864 Some SMB cancel races remain after NEX-5845 (cstyle)
NEX-10236 Rebuild fails in cmd/Adm/sun
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
NEX-6871 remove wu-ftpd
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Revert "5069 Removal of wu-ftpd"
This reverts commit 4e762ae71a675489e308ef67b9c4f35fa31042da.

          --- old/usr/src/cmd/Adm/sun/Makefile
          +++ new/usr/src/cmd/Adm/sun/Makefile

   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  # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  23      -# Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
       23 +# Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
  24   24  #
  25   25  
  26   26  ETCFILES= ioctl.syscon passwd shadow motd
  27   27  FTPDFILES= ftpusers
  28   28  KVMFILES= README
  29   29  SMBFILES= smbpasswd
  30   30  
  31   31  include ../../Makefile.cmd
  32   32  
  33   33  ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)

  34   34  ROOTETCFTPDFILES= $(FTPDFILES:%=$(ROOTETCFTPD)/%)
  35   35  ROOTUSRKVMFILES= $(KVMFILES:%=$(ROOTUSRKVM)/%)
  36   36  ROOTVARSMBFILES= $(SMBFILES:%=$(ROOTVARSMB)/%)
  37   37  
  38   38  FILEMODE= 0644

  39   39  
  40   40  ROOTETCFTPUSERSLINK= $(ROOTETC)/ftpusers
  41   41  
  42   42  $(ROOTETC)/shadow       :=      FILEMODE =      400
  43   43  $(ROOTVARSMB)/smbpasswd :=      FILEMODE =      0400
  44   44  
  45   45  
  46   46  .KEEP_STATE:
  47   47  
  48   48  $(ROOTETCFTPUSERSLINK): $(ROOTETCFTPDFILES)
  49      -        $(RM) $@; $(SYMLINK) ftpd/ftpusers $@
       49 +        $(RM) $@
       50 +        $(SYMLINK) ftpd/ftpusers $@
  50   51  
  51   52  all: $(ETCFILES) $(KVMFILES) $(SMBFILES) $(FTPDFILES)
  52   53  
  53   54  install: all $(ROOTETCFILES) $(ROOTETCFTPDFILES) $(ROOTUSRKVMFILES) $(ROOTVARSMBFILES) $(ROOTETCFTPUSERSLINK)
  54   55  
  55   56  clean:
  56   57          $(RM) $(ROOTETCFTPUSERSLINK)
  57   58  
  58   59  lint:
  59   60  

  60   61  clobber:
  61   62  
  62   63  motd:   FRC
  63   64          @-$(ECHO) "rebuilding motd"
  64   65          @$(RELEASE_BUILD)-$(ECHO) "The Illumos Project\tSunOS $(RELEASE)\t$(VERSION)\t$(RELEASE_DATE)" > motd
  65   66          @$(NOT_RELEASE_BUILD)-$(ECHO) "The Illumos Project\tSunOS $(RELEASE)\t$(VERSION)\t`date +'%h. %d, %Y'`" > motd
  66   67          @$(NOT_RELEASE_BUILD)-$(ECHO) $(DEV_CM) | sed -e "s/@(#)//" >> motd
  67   68          @-$(CAT) release_info >> motd
  68   69  
  69   70  smbpasswd:
  70   71          $(TOUCH) smbpasswd
  71   72  
  72   73  clean:
  73   74  
  74   75  lint:
  75   76  
  76   77  clobber:
  77   78          $(RM) motd smbpasswd
  78   79  
  79   80  FRC:

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX