illumos-gate-1681 Wdiff usr/src/pkg/manifests/service-security-kerberos-5.mf

Print this page

1681 support for BUILD64=# no longer works

Split	Close
Expand all
Collapse all

          --- old/usr/src/pkg/manifests/service-security-kerberos-5.mf
          +++ new/usr/src/pkg/manifests/service-security-kerberos-5.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

↓ open down ↓

13 lines elided

↑ open up ↑

  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 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri value=pkg:/service/security/kerberos-5@$(PKGVERS)
  27   28  set name=pkg.description value="Kerberos version 5 support"
  28   29  set name=pkg.summary value="Kerberos version 5 support"
  29   30  set name=info.classification \
  30   31      value=org.opensolaris.category.2008:System/Security
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=etc group=sys
  33   34  dir path=etc/krb5 group=sys
  34   35  dir path=lib
  35   36  dir path=lib/svc
  36   37  dir path=lib/svc/manifest group=sys
  37   38  dir path=lib/svc/manifest/network group=sys
  38   39  dir path=lib/svc/manifest/network/security group=sys
  39   40  dir path=usr group=sys
  40   41  dir path=usr/bin
  41   42  dir path=usr/lib
  42      -dir path=usr/lib/$(ARCH64)
  43      -dir path=usr/lib/$(ARCH64)/gss
       43 +$(BUILD64)dir path=usr/lib/$(ARCH64)
       44 +$(BUILD64)dir path=usr/lib/$(ARCH64)/gss
  44   45  dir path=usr/lib/gss
  45   46  dir path=usr/lib/krb5
  46      -dir path=usr/lib/krb5/$(ARCH64)
       47 +$(BUILD64)dir path=usr/lib/krb5/$(ARCH64)
  47   48  dir path=usr/lib/krb5/plugins
  48   49  dir path=usr/lib/krb5/plugins/preauth
  49   50  dir path=usr/lib/security
  50      -dir path=usr/lib/security/$(ARCH64)
       51 +$(BUILD64)dir path=usr/lib/security/$(ARCH64)
  51   52  dir path=usr/share/man
  52   53  dir path=usr/share/man/man1
  53   54  dir path=usr/share/man/man1m
  54   55  dir path=usr/share/man/man3lib
  55   56  dir path=usr/share/man/man5
  56   57  dir path=var group=sys
  57   58  dir path=var/krb5 group=sys
  58   59  dir path=var/krb5/rcache group=sys mode=1777
  59   60  dir path=var/krb5/rcache/root group=sys mode=0700
  60   61  file path=etc/krb5/krb5.conf group=sys \

  61   62      original_name=SUNWkrb:etc/krb5/krb5.conf preserve=true
  62   63  file path=etc/krb5/warn.conf group=sys \

↓ open down ↓

2 lines elided

↑ open up ↑

  63   64      original_name=SUNWkrb:etc/krb5/warn.conf preserve=true
  64   65  file path=lib/svc/manifest/network/security/kadmin.xml group=sys mode=0444
  65   66  file path=lib/svc/manifest/network/security/krb5kdc.xml group=sys mode=0444
  66   67  file path=lib/svc/manifest/network/security/ktkt_warn.xml group=sys mode=0444
  67   68  file path=usr/bin/kdestroy mode=0555
  68   69  file path=usr/bin/kinit mode=0555
  69   70  file path=usr/bin/klist mode=0555
  70   71  file path=usr/bin/kpasswd mode=0555
  71   72  file path=usr/bin/krb5-config mode=0555
  72   73  file path=usr/bin/ktutil mode=0555
  73      -file path=usr/lib/$(ARCH64)/gss/mech_krb5.so.1
  74      -file path=usr/lib/$(ARCH64)/libkrb5.so.1
       74 +$(BUILD64)file path=usr/lib/$(ARCH64)/gss/mech_krb5.so.1
       75 +$(BUILD64)file path=usr/lib/$(ARCH64)/libkrb5.so.1
  75   76  file path=usr/lib/gss/mech_krb5.so.1
  76      -file path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so.1
       77 +$(BUILD64)file path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so.1
  77   78  file path=usr/lib/krb5/ktkt_warnd mode=0555
  78   79  file path=usr/lib/krb5/libkadm5clnt.so.1
  79   80  file path=usr/lib/krb5/libss.so.1
  80   81  file path=usr/lib/krb5/plugins/preauth/pkinit.so.1
  81   82  file path=usr/lib/libkrb5.so.1
  82      -file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1
  83      -file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1
       83 +$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1
       84 +$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1
  84   85  file path=usr/lib/security/pam_krb5.so.1
  85   86  file path=usr/lib/security/pam_krb5_migrate.so.1
  86   87  file path=usr/share/man/man1/kdestroy.1
  87   88  file path=usr/share/man/man1/kinit.1
  88   89  file path=usr/share/man/man1/klist.1
  89   90  file path=usr/share/man/man1/kpasswd.1
  90   91  file path=usr/share/man/man1/krb5-config.1
  91   92  file path=usr/share/man/man1/ktutil.1
  92   93  file path=usr/share/man/man1m/ktkt_warnd.1m
  93   94  file path=usr/share/man/man3lib/libkrb5.3lib
  94   95  file path=usr/share/man/man5/pam_krb5.5
  95   96  file path=usr/share/man/man5/pam_krb5_migrate.5
  96   97  legacy pkg=SUNWkrbr desc="Kerberos version 5 support (Root)" \
  97   98      name="Kerberos version 5 support (Root)"
  98   99  legacy pkg=SUNWkrbu desc="Kerberos version 5 support (Usr)" \
  99  100      name="Kerberos version 5 support (Usr)"
 100  101  license cr_Sun license=cr_Sun
 101  102  license lic_CDDL license=lic_CDDL
 102  103  license usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \
 103  104      license=usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE
 104      -link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1
 105      -link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1
      105 +$(BUILD64)link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1
      106 +$(BUILD64)link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1
 106  107  link path=usr/lib/gss/mech_krb5.so target=./mech_krb5.so.1
 107      -link path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so target=./libkadm5clnt.so.1
      108 +$(BUILD64)link path=usr/lib/krb5/$(ARCH64)/libkadm5clnt.so \
      109 +    target=./libkadm5clnt.so.1
 108  110  link path=usr/lib/krb5/libkadm5clnt.so target=./libkadm5clnt.so.1
 109  111  link path=usr/lib/krb5/libss.so target=libss.so.1
 110  112  link path=usr/lib/krb5/plugins/preauth/pkinit.so target=pkinit.so.1
 111  113  link path=usr/lib/libkrb5.so target=./libkrb5.so.1
 112      -link path=usr/lib/security/$(ARCH64)/pam_krb5.so target=./pam_krb5.so.1
 113      -link path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so \
      114 +$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_krb5.so \
      115 +    target=./pam_krb5.so.1
      116 +$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so \
 114  117      target=./pam_krb5_migrate.so.1
 115  118  link path=usr/lib/security/pam_krb5.so target=./pam_krb5.so.1
 116  119  link path=usr/lib/security/pam_krb5_migrate.so target=./pam_krb5_migrate.so.1
 117  120  depend fmri=service/security/gss type=require

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX