Bump Apache dependency to Apache 2

          --- old/exception_lists/interface_check
          +++ new/exception_lists/interface_check

   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) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  
  25   25  # This file provides exceptions to the usual rules applied to shared
  26   26  # objects by interface_check. All strings are Perl regular expressions
  27   27  # that are compared to file names. In addition to the standard Perl
  28   28  # syntax, there is one extension:
  29   29  #
  30   30  #       MACH(dir)
  31   31  #
  32   32  # is expanded into a regular expression that matches the given
  33   33  # directory, or a 64-bit subdirectory of the directory with the
  34   34  # name of a 64-bit architecture. For example, MACH(lib) will match
  35   35  # any of the following:

  36   36  #
  37   37  #       lib
  38   38  #       lib/amd64
  39   39  #       lib/sparcv9
  40   40  
  41   41  
  42   42  # Shared objects underneath these parts of the tree are taken to be plugins.
  43   43  # Plugins are not required to have versioned file names, and are not required
  44   44  # to be internally versioned.
  45   45  #
  46      -PLUGIN          ^usr/apache/libexec
       46 +PLUGIN          ^usr/apache2/2.2/libexec
  47   47  PLUGIN          ^usr/lib/devfsadm
  48   48  PLUGIN          ^usr/lib/efcode/.*\.so$
  49   49  PLUGIN          ^usr/lib/elfedit
  50   50  PLUGIN          ^usr/lib/fm/fmd/plugins
  51   51  PLUGIN          ^usr/lib/fm/fmd/schemes
  52   52  PLUGIN          ^usr/lib/fm/topo/plugins
  53   53  PLUGIN          ^usr/lib/fwflash
  54   54  PLUGIN          ^usr/lib/iconv
  55   55  PLUGIN          ^usr/lib/inet/ppp
  56   56  PLUGIN          ^usr/lib/mdb

  57   57  PLUGIN          ^usr/lib/pci
  58   58  PLUGIN          ^usr/lib/picl/plugins
  59   59  PLUGIN          ^usr/lib/python2.[46]
  60   60  PLUGIN          ^usr/lib/rcm/modules
  61   61  PLUGIN          ^usr/lib/scsi/plugins
  62   62  PLUGIN          ^usr/lib/sysevent/modules
  63   63  PLUGIN          ^usr/perl5/5\.[^\\]*/lib
  64   64  PLUGIN          ^usr/platform
  65   65  PLUGIN          ^usr/sadm/lib/wbem
  66   66  
  67   67  
  68   68  # sbcp is a special case, and not a plugin. However, it does not have a
  69   69  # versioned name, and does not contain versioning, so the PLUGIN exemptions fit.
  70   70  PLUGIN  ^usr/4lib/sbcp$
  71   71  
  72   72  
  73   73  # Objects that are not expected to contain versioning information.
  74   74  # Note that PLUGIN objects are automatically exempt from this,
  75   75  # so these directives are generally applied to non-plugin objects
  76   76  NOVERDEF        ^usr/4lib/libc\.so\.
  77   77  NOVERDEF        ^usr/MACH(lib)/0\@0\.so\.1$
  78   78  NOVERDEF        ^usr/lib/MACH(abi)/apptrace\.so\.1$
  79   79  NOVERDEF        ^usr/MACH(lib)/libfru.*\.so\.1$
  80   80  NOVERDEF        ^usr/MACH(lib)/libkrb5\.so\.1$
  81   81  NOVERDEF        ^usr/MACH(lib)/libzpool\.so\.1$
  82   82  NOVERDEF        ^usr/MACH(lib)/madv\.so\.1$
  83   83  NOVERDEF        ^usr/MACH(lib)/mpss\.so\.1$
  84   84  NOVERDEF        ^usr/MACH(lib)/s10_brand\.so\.1$
  85   85  NOVERDEF        ^usr/MACH(lib)/s10_npreload\.so\.1$
  86   86  NOVERDEF        ^usr/MACH(lib)/sn1_brand\.so\.1$
  87   87  NOVERDEF        ^usr/lib/fs/[^/]*/fstyp\.so\.1$
  88   88  NOVERDEF        ^usr/lib/libmilter\.so\.1$
  89   89  NOVERDEF        ^usr/lib/libwrap\.so\.1\.0$
  90   90  NOVERDEF        ^usr/lib/locale/MACH(iso_8859_1)/iso_8859_1\.so\.3$
  91   91  NOVERDEF        ^usr/lib/picl/plugins$
  92   92  NOVERDEF        ^usr/sadm/admin/dhcpmgr/dhcpmgr\.so\.1$
  93   93  NOVERDEF        ^usr/sadm/admin/printmgr/lib/libpmgr\.so\.1$
  94   94  
  95   95  
  96   96  # Objects that are allowed to deviate from our standard version
  97   97  # names.
  98   98  NONSTD_VERNAME  ^usr/MACH(lib)/libtecla\.so\.1$
  99   99  
 100  100  
 101  101  # These libc variants have an SONAME of libc\.so\.1$
 102  102  NONSTD_VERNAME  ^usr/MACH(lib)/libc/libc_hwcap[1-3]+\.so\.1$
 103  103  
 104  104  
 105  105  # The ABI requires the SONAME for libsys.so.1 to be /usr/lib/ld.so.1
 106  106  # That means that the base version will also be /usr/lib/ld.so.1, which
 107  107  # is non-standard.
 108  108  NONSTD_VERNAME  ^usr/lib/libsys\.so\.1$

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX