Bump Apache dependency to Apache 2

*** 18,36 ****
   *
   * CDDL HEADER END
   */
  
  /*
   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
   */
  
  /* $Id: ipp-listener.c 146 2006-03-24 00:26:54Z njacobs $ */
  
- #pragma ident   "%Z%%M% %I%     %E% SMI"
- 
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <netinet/in.h>
  #include <assert.h>
--- 18,35 ----
   *
   * CDDL HEADER END
   */
  
  /*
+  * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
   */
  
  /* $Id: ipp-listener.c 146 2006-03-24 00:26:54Z njacobs $ */
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <netinet/in.h>
  #include <assert.h>
*** 149,159 ****
          { 0x400D, "cups-move-job",              cups_move_job,  OP_VENDOR },
          { 0, NULL, NULL, OP_VENDOR }
  };
  
  static int
! ipp_operation_name_to_index(char *name)
  {
          int i;
  
          for (i = 0; handlers[i].name != NULL; i++)
                  if (strcasecmp(name, handlers[i].name) == 0)
--- 148,158 ----
          { 0x400D, "cups-move-job",              cups_move_job,  OP_VENDOR },
          { 0, NULL, NULL, OP_VENDOR }
  };
  
  static int
! ipp_operation_name_to_index(const char *name)
  {
          int i;
  
          for (i = 0; handlers[i].name != NULL; i++)
                  if (strcasecmp(name, handlers[i].name) == 0)
*** 231,241 ****
  
          return (handlers[index].function);
  }
  
  static char
! type_to_boolean(char *type)
  {
          char result = PAPI_FALSE;
  
          if ((strcasecmp(type, "true") == 0) ||
              (strcasecmp(type, "yes") == 0) ||
--- 230,240 ----
  
          return (handlers[index].function);
  }
  
  static char
! type_to_boolean(const char *type)
  {
          char result = PAPI_FALSE;
  
          if ((strcasecmp(type, "true") == 0) ||
              (strcasecmp(type, "yes") == 0) ||
*** 274,284 ****
  
          return (result);
  }
  
  papi_status_t
! ipp_configure_operation(papi_attribute_t ***list, char *operation, char *type)
  {
          papi_status_t result = PAPI_OPERATION_NOT_SUPPORTED;
          char boolean = PAPI_FALSE;
  
          if ((list == NULL) || (operation == NULL) || (type == NULL))
--- 273,283 ----
  
          return (result);
  }
  
  papi_status_t
! ipp_configure_operation(papi_attribute_t ***list, const char *operation, const char *type)
  {
          papi_status_t result = PAPI_OPERATION_NOT_SUPPORTED;
          char boolean = PAPI_FALSE;
  
          if ((list == NULL) || (operation == NULL) || (type == NULL))