Update to 6.2.0 SDK for use with XenServer 6.2 and earlier (support for

XenServer 4.0 has been removed from this release).

4 files changed, 82 insertions, 24 deletions

diff --git a/devel/libxenserver/Makefile b/devel/libxenserver/Makefile
index 7be8c4365c2..5e8175cf5b4 100644
--- a/devel/libxenserver/Makefile
+++ b/devel/libxenserver/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2013/02/06 23:21:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/18 11:59:28 sborrill Exp $
 #
 
-DISTNAME=	libxenserver-5.6.100-1-src
-PKGNAME=	${DISTNAME:S/-1-src//}
-PKGREVISION=	4
+VERSION=	6.2.0
+DISTNAME=	XenServer-${VERSION}-SDK
+PKGNAME=	libxenserver-${VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	http://community.citrix.com/download/attachments/38633496/
+MASTER_SITES=	http://downloadns.citrix.com.edgesuite.net/7289/
 
 MAINTAINER=	sborrill@NetBSD.org
 HOMEPAGE=	http://community.citrix.com/cdn/xs/sdks/
 COMMENT=	Citrix XenServer SDK for C
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_SUFX=	.tar.bz2
-WRKSRC=		${WRKDIR}/libxenserver
-MAJOR=		1
-MINOR=		3
+EXTRACT_SUFX=	.zip
+WRKSRC=		${WRKDIR}/XenServer-SDK/libxenserver/src
+MAJOR=		2
+MINOR=		0
 BUILD_TARGET=	libxenserver.so
 USE_TOOLS+=	gmake pax
 
diff --git a/devel/libxenserver/PLIST b/devel/libxenserver/PLIST
index 7bbfc3e4984..19403a6b888 100644
--- a/devel/libxenserver/PLIST
+++ b/devel/libxenserver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/17 09:54:02 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/07/18 11:59:28 sborrill Exp $
 include/xen/api/xen_after_apply_guidance.h
 include/xen/api/xen_all.h
 include/xen/api/xen_api_failure.h
@@ -6,61 +6,96 @@ include/xen/api/xen_auth.h
 include/xen/api/xen_auth_decl.h
 include/xen/api/xen_blob.h
 include/xen/api/xen_blob_decl.h
+include/xen/api/xen_blob_xen_blob_record_map.h
 include/xen/api/xen_bond.h
 include/xen/api/xen_bond_decl.h
+include/xen/api/xen_bond_mode.h
+include/xen/api/xen_bond_xen_bond_record_map.h
 include/xen/api/xen_cls.h
 include/xen/api/xen_common.h
 include/xen/api/xen_console.h
 include/xen/api/xen_console_decl.h
 include/xen/api/xen_console_protocol.h
+include/xen/api/xen_console_xen_console_record_map.h
 include/xen/api/xen_crashdump.h
 include/xen/api/xen_crashdump_decl.h
+include/xen/api/xen_crashdump_xen_crashdump_record_map.h
+include/xen/api/xen_dr_task.h
+include/xen/api/xen_dr_task_decl.h
+include/xen/api/xen_dr_task_xen_dr_task_record_map.h
 include/xen/api/xen_event.h
 include/xen/api/xen_event_decl.h
 include/xen/api/xen_event_operation.h
-include/xen/api/xen_hello_return.h
+include/xen/api/xen_gpu_group.h
+include/xen/api/xen_gpu_group_decl.h
+include/xen/api/xen_gpu_group_xen_gpu_group_record_map.h
 include/xen/api/xen_host.h
 include/xen/api/xen_host_allowed_operations.h
 include/xen/api/xen_host_cpu.h
 include/xen/api/xen_host_cpu_decl.h
+include/xen/api/xen_host_cpu_xen_host_cpu_record_map.h
 include/xen/api/xen_host_crashdump.h
 include/xen/api/xen_host_crashdump_decl.h
+include/xen/api/xen_host_crashdump_xen_host_crashdump_record_map.h
 include/xen/api/xen_host_decl.h
 include/xen/api/xen_host_metrics.h
 include/xen/api/xen_host_metrics_decl.h
+include/xen/api/xen_host_metrics_xen_host_metrics_record_map.h
 include/xen/api/xen_host_patch.h
 include/xen/api/xen_host_patch_decl.h
+include/xen/api/xen_host_patch_xen_host_patch_record_map.h
 include/xen/api/xen_host_string_set_map.h
+include/xen/api/xen_host_xen_host_record_map.h
 include/xen/api/xen_int_float_map.h
 include/xen/api/xen_int_int_map.h
 include/xen/api/xen_int_string_set_map.h
 include/xen/api/xen_ip_configuration_mode.h
+include/xen/api/xen_ipv6_configuration_mode.h
 include/xen/api/xen_message.h
 include/xen/api/xen_message_decl.h
+include/xen/api/xen_message_xen_message_record_map.h
 include/xen/api/xen_network.h
 include/xen/api/xen_network_decl.h
+include/xen/api/xen_network_default_locking_mode.h
 include/xen/api/xen_network_operations.h
+include/xen/api/xen_network_xen_network_record_map.h
 include/xen/api/xen_on_boot.h
 include/xen/api/xen_on_crash_behaviour.h
 include/xen/api/xen_on_normal_exit.h
 include/xen/api/xen_pbd.h
 include/xen/api/xen_pbd_decl.h
+include/xen/api/xen_pbd_xen_pbd_record_map.h
+include/xen/api/xen_pci.h
+include/xen/api/xen_pci_decl.h
+include/xen/api/xen_pci_xen_pci_record_map.h
+include/xen/api/xen_pgpu.h
+include/xen/api/xen_pgpu_decl.h
+include/xen/api/xen_pgpu_xen_pgpu_record_map.h
 include/xen/api/xen_pif.h
 include/xen/api/xen_pif_decl.h
 include/xen/api/xen_pif_metrics.h
 include/xen/api/xen_pif_metrics_decl.h
+include/xen/api/xen_pif_metrics_xen_pif_metrics_record_map.h
+include/xen/api/xen_pif_xen_pif_record_map.h
 include/xen/api/xen_pool.h
 include/xen/api/xen_pool_decl.h
 include/xen/api/xen_pool_patch.h
 include/xen/api/xen_pool_patch_decl.h
+include/xen/api/xen_pool_patch_xen_pool_patch_record_map.h
+include/xen/api/xen_pool_xen_pool_record_map.h
+include/xen/api/xen_primary_address_type.h
 include/xen/api/xen_role.h
 include/xen/api/xen_role_decl.h
+include/xen/api/xen_role_xen_role_record_map.h
 include/xen/api/xen_secret.h
 include/xen/api/xen_secret_decl.h
+include/xen/api/xen_secret_xen_secret_record_map.h
 include/xen/api/xen_sm.h
 include/xen/api/xen_sm_decl.h
+include/xen/api/xen_sm_xen_sm_record_map.h
 include/xen/api/xen_sr.h
 include/xen/api/xen_sr_decl.h
+include/xen/api/xen_sr_xen_sr_record_map.h
 include/xen/api/xen_storage_operations.h
 include/xen/api/xen_string_blob_map.h
 include/xen/api/xen_string_host_allowed_operations_map.h
@@ -75,54 +110,77 @@ include/xen/api/xen_string_task_allowed_operations_map.h
 include/xen/api/xen_string_vbd_operations_map.h
 include/xen/api/xen_string_vdi_operations_map.h
 include/xen/api/xen_string_vif_operations_map.h
+include/xen/api/xen_string_vm_appliance_operation_map.h
 include/xen/api/xen_string_vm_operations_map.h
 include/xen/api/xen_subject.h
 include/xen/api/xen_subject_decl.h
+include/xen/api/xen_subject_xen_subject_record_map.h
 include/xen/api/xen_task.h
 include/xen/api/xen_task_allowed_operations.h
 include/xen/api/xen_task_decl.h
 include/xen/api/xen_task_status_type.h
+include/xen/api/xen_task_xen_task_record_map.h
 include/xen/api/xen_tunnel.h
 include/xen/api/xen_tunnel_decl.h
+include/xen/api/xen_tunnel_xen_tunnel_record_map.h
 include/xen/api/xen_user.h
 include/xen/api/xen_user_decl.h
 include/xen/api/xen_vbd.h
 include/xen/api/xen_vbd_decl.h
 include/xen/api/xen_vbd_metrics.h
 include/xen/api/xen_vbd_metrics_decl.h
+include/xen/api/xen_vbd_metrics_xen_vbd_metrics_record_map.h
 include/xen/api/xen_vbd_mode.h
 include/xen/api/xen_vbd_operations.h
 include/xen/api/xen_vbd_type.h
+include/xen/api/xen_vbd_xen_vbd_record_map.h
 include/xen/api/xen_vdi.h
 include/xen/api/xen_vdi_decl.h
 include/xen/api/xen_vdi_operations.h
-include/xen/api/xen_vdi_string_map.h
+include/xen/api/xen_vdi_sr_map.h
 include/xen/api/xen_vdi_type.h
+include/xen/api/xen_vdi_xen_vdi_record_map.h
+include/xen/api/xen_vgpu.h
+include/xen/api/xen_vgpu_decl.h
+include/xen/api/xen_vgpu_xen_vgpu_record_map.h
 include/xen/api/xen_vif.h
 include/xen/api/xen_vif_decl.h
+include/xen/api/xen_vif_locking_mode.h
 include/xen/api/xen_vif_metrics.h
 include/xen/api/xen_vif_metrics_decl.h
+include/xen/api/xen_vif_metrics_xen_vif_metrics_record_map.h
+include/xen/api/xen_vif_network_map.h
 include/xen/api/xen_vif_operations.h
+include/xen/api/xen_vif_xen_vif_record_map.h
 include/xen/api/xen_vlan.h
 include/xen/api/xen_vlan_decl.h
+include/xen/api/xen_vlan_xen_vlan_record_map.h
 include/xen/api/xen_vm.h
+include/xen/api/xen_vm_appliance.h
+include/xen/api/xen_vm_appliance_decl.h
+include/xen/api/xen_vm_appliance_operation.h
+include/xen/api/xen_vm_appliance_xen_vm_appliance_record_map.h
 include/xen/api/xen_vm_decl.h
 include/xen/api/xen_vm_guest_metrics.h
 include/xen/api/xen_vm_guest_metrics_decl.h
+include/xen/api/xen_vm_guest_metrics_xen_vm_guest_metrics_record_map.h
 include/xen/api/xen_vm_metrics.h
 include/xen/api/xen_vm_metrics_decl.h
+include/xen/api/xen_vm_metrics_xen_vm_metrics_record_map.h
 include/xen/api/xen_vm_operations.h
 include/xen/api/xen_vm_operations_string_map.h
 include/xen/api/xen_vm_power_state.h
 include/xen/api/xen_vm_string_map.h
 include/xen/api/xen_vm_string_set_map.h
 include/xen/api/xen_vm_string_string_map_map.h
+include/xen/api/xen_vm_xen_vm_record_map.h
 include/xen/api/xen_vmpp.h
 include/xen/api/xen_vmpp_archive_frequency.h
 include/xen/api/xen_vmpp_archive_target_type.h
 include/xen/api/xen_vmpp_backup_frequency.h
 include/xen/api/xen_vmpp_backup_type.h
 include/xen/api/xen_vmpp_decl.h
+include/xen/api/xen_vmpp_xen_vmpp_record_map.h
 include/xen/api/xen_vtpm.h
 include/xen/api/xen_vtpm_decl.h
 lib/libxenserver.so
diff --git a/devel/libxenserver/distinfo b/devel/libxenserver/distinfo
index 1d784787497..d544ac4c434 100644
--- a/devel/libxenserver/distinfo
+++ b/devel/libxenserver/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/02/17 09:54:02 sborrill Exp $
+$NetBSD: distinfo,v 1.2 2013/07/18 11:59:28 sborrill Exp $
 
-SHA1 (libxenserver-5.6.100-1-src.tar.bz2) = 7f7c04e1719f03e341daa85c4c6802f9d62966f6
-RMD160 (libxenserver-5.6.100-1-src.tar.bz2) = f44ddf26aef471ae1771c3ccd0d7f31d079878a1
-Size (libxenserver-5.6.100-1-src.tar.bz2) = 97237 bytes
+SHA1 (XenServer-6.2.0-SDK.zip) = 09d35add52ab85a5de10841c45022c86dcf948fa
+RMD160 (XenServer-6.2.0-SDK.zip) = b9f8326fe5512582ffdd2d73db1c36b3522b54ae
+Size (XenServer-6.2.0-SDK.zip) = 10367600 bytes
 SHA1 (patch-Makefile) = d2159549bf4307411ab9b99f4beb3c3ab2cb411b
-SHA1 (patch-xen_common.c) = 9d4ffe6157106d0b41565c4f58bc271bce4c87bf
+SHA1 (patch-xen_common.c) = b750589e7c7bcd33fedca8a564371251eeb1f3c9
diff --git a/devel/libxenserver/patches/patch-xen_common.c b/devel/libxenserver/patches/patch-xen_common.c
index 4a600f33cff..60311c806a2 100644
--- a/devel/libxenserver/patches/patch-xen_common.c
+++ b/devel/libxenserver/patches/patch-xen_common.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-xen_common.c,v 1.1.1.1 2011/02/17 09:54:02 sborrill Exp $
+$NetBSD: patch-xen_common.c,v 1.2 2013/07/18 11:59:28 sborrill Exp $
 
---- src/xen_common.c.orig	2011-02-11 12:59:37.000000000 +0000
-+++ src/xen_common.c	2011-02-11 13:00:20.000000000 +0000
-@@ -1131,6 +1131,7 @@
+--- src/xen_common.c.orig	2013-06-14 14:51:06.000000000 +0100
++++ src/xen_common.c	2013-07-18 12:52:57.000000000 +0100
+@@ -1310,6 +1310,7 @@
      default:
          assert(false);
      }
@@ -10,9 +10,9 @@ $NetBSD: patch-xen_common.c,v 1.1.1.1 2011/02/17 09:54:02 sborrill Exp $
  }
  
  
-@@ -1638,6 +1639,7 @@
-     default:
-         assert(false);
+@@ -1826,6 +1827,7 @@
+             assert(false);
+             break;
      }
 +    return NULL;
  }