Bump Apache dependency to Apache 2

          --- old/usr/src/lib/print/libipp-listener/common/ipp-listener.h
          +++ new/usr/src/lib/print/libipp-listener/common/ipp-listener.h

   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 + * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  23   24   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  24   25   * Use is subject to license terms.
  25   26   *
  26   27   */
  27   28  
  28   29  #ifndef _IPP_LISTENER_H
  29   30  #define _IPP_LISTENER_H
  30   31  
  31   32  /* $Id: ipp-listener.h 146 2006-03-24 00:26:54Z njacobs $ */
  32   33  
  33      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  34      -
  35   34  #ifdef  __cplusplus
  36   35  extern "C" {
  37   36  #endif
  38   37  
  39   38  #include <ipp.h>
  40   39  
  41   40  /* exported functions */
  42   41  extern papi_status_t ipp_configure_operation(papi_attribute_t ***list,
  43      -                                                char *operation, char *type);
       42 +                                                const char *operation,
       43 +                                                const char *type);
  44   44  extern papi_status_t ipp_process_request(papi_attribute_t **request,
  45   45                                          papi_attribute_t ***response,
  46   46                                          ipp_reader_t iread, void *fd);
  47   47  
  48   48  /* shared internal functions */
  49   49  extern char *ipp_svc_status_mesg(papi_service_t svc, papi_status_t status);
  50   50  extern char *destination_from_printer_uri(char *);
  51   51  extern void get_printer_id(papi_attribute_t **attributes, char **printer,
  52   52                          int *id);
  53   53  extern void ipp_operations_supported(papi_attribute_t ***list,

  54   54                          papi_attribute_t **request);
  55   55  extern void get_string_list(papi_attribute_t **attributes, char *name,
  56   56                          char ***values);
  57   57  extern void add_default_attributes(papi_attribute_t ***attributes);
  58   58  extern void papi_to_ipp_printer_group(papi_attribute_t ***response,
  59   59                          papi_attribute_t **request, int flags,
  60   60                          papi_printer_t p);
  61   61  extern void papi_to_ipp_job_group(papi_attribute_t ***response,
  62   62                          papi_attribute_t **request, int flags, papi_job_t j);
  63   63  extern void massage_response(papi_attribute_t **request,
  64   64                          papi_attribute_t **response);
  65   65  
  66   66  #ifdef  __cplusplus
  67   67  }
  68   68  #endif
  69   69  
  70   70  #endif  /* _IPP_LISTENER_H */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX