main/xe-guest-utilities: upgrade to 6.6.80

4 files changed, 26 insertions, 107 deletions

diff --git a/main/xe-guest-utilities/APKBUILD b/main/xe-guest-utilities/APKBUILD
index 69c098142e..e344814dbb 100644
--- a/main/xe-guest-utilities/APKBUILD
+++ b/main/xe-guest-utilities/APKBUILD
@@ -1,74 +1,55 @@
 # Contributor: Cedric Schieli <cschieli@gmail.com>
 # Maintainer: Cedric Schieli <cschieli@gmail.com>
 pkgname=xe-guest-utilities
-_major=5.5.0
-_minor=458
-pkgver=6.1.0
-pkgrel=2
+pkgver=6.6.80
+pkgrel=0
 pkgdesc="XenServer guest tools"
-url="http://www.citrix.com"
+url="https://github.com/xenserver/xe-guest-utilities"
 arch="x86 x86_64"
-license="GPL"
+license="BSD-2-Clause"
 depends=
-makedepends=
+makedepends=go
 install=
-subpackages=
-source="http://updates.vmd.citrix.com/XenServer/${_major}/debian/pool/main/x/${pkgname}/${pkgname}_${_major}-${_minor}.tar.gz
+subpackages="${pkgname}-udev:udev:noarch"
+options="!check"
+source="${pkgname}-${pkgver}.tar.gz::https://github.com/xenserver/${pkgname}/archive/v${pkgver}.tar.gz
 	$pkgname.initd
-	no_bash_dependency.patch
 	identify_alpine.patch
-	fix_cflags.patch
-	no_hard_links.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$_major
+_builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
-	cd "$_builddir"
-
-	msg "Unpacking xenstore-sources..."
-	tar xjf xenstore-sources.tar.bz2
+	cd "$_builddir/mk"
 
 	for i in ../*.diff ../*.patch; do
 		[ -f $i ] || continue
 		msg "Applying $i..."
 		patch -s -p1 -N < $i || return 1
 	done
-
-	ln -s ../../xen/include/public uclibc-sources/tools/xenstore/xen
-	sed -i -e 's/-Werror//' uclibc-sources/tools/xenstore/Makefile
 }
 
 build() {
-	cd "$_builddir"/uclibc-sources/tools/xenstore
-	make XENSTORE_STATIC_CLIENTS=y clients
+	cd "$_builddir"
+	make
 }
 
 package() {
-	cd "$_builddir"
-	install -m755 -D "$_builddir"/xe-linux-distribution "$pkgdir"/usr/sbin/xe-linux-distribution
-	install -m755 -D "$_builddir"/xe-update-guest-attrs "$pkgdir"/usr/sbin/xe-update-guest-attrs
-	install -m755 -D "$_builddir"/xe-daemon "$pkgdir"/usr/sbin/xe-daemon
+	mkdir -p "$pkgdir"
+	cp -ar "${_builddir}/build/stage/usr/" "$pkgdir/"
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	cd uclibc-sources/tools/xenstore
-	make DESTDIR="$pkgdir" client-install
 }
 
-md5sums="b15546f0b3883472140f35f5f8802a92  xe-guest-utilities_5.5.0-458.tar.gz
-ff0085b3329fa864262a0f285cfc5d22  xe-guest-utilities.initd
-1fe4c6c4621982a87de97d897612eef7  no_bash_dependency.patch
-aa129940379b312783dc314497f62042  identify_alpine.patch
-cf32b9c90ce2e846d2221eaca0638929  fix_cflags.patch
-85231dd847d9d696b1ce86e0954091ed  no_hard_links.patch"
-sha256sums="c7328a4e207c1c0cecf852c53dec7733f9593487c399d49767bbbbcf88340b31  xe-guest-utilities_5.5.0-458.tar.gz
-85d384aec7d2b8652d733bfc1d8164746f998612de18a89f29b759da14c55721  xe-guest-utilities.initd
-c7bb18aad94a1de69984fb7de55390470acc7e83b3c4b6259c0b03a84fec14ca  no_bash_dependency.patch
-a4e68e6c4ae90b5d1262846a601ae1561d19888201134012678a062c99010473  identify_alpine.patch
-7d238dfdc08b996bdd2056fb6ed346ad60b219a2afbe63aae4adc1a15b8cfa40  fix_cflags.patch
-37b521fb396c5410e7e40745a2bd93440479eebc9f9a5320eeef57395d735503  no_hard_links.patch"
-sha512sums="773dfd902166143d2fb0106312704dc516a34f6026d566f4d5b9e855bce0365288a98cad61c336aa26a639559f69a28038bc5c18379206006d11a3f10c8d3950  xe-guest-utilities_5.5.0-458.tar.gz
+udev() {
+	pkgdesc="udev rules for CPU hotplugging when running as Xen DomU"
+	depends="udev"
+
+	udev_dir="etc/udev/rules.d"
+	mkdir -p "${subpkgdir}/${udev_dir}"
+	filename="z10_xen-vcpu-hotplug.rules"
+	install -m644 -D "${_builddir}/build/stage/${udev_dir}/${filename}" "${subpkgdir}/${udev_dir}/${filename}"
+}
+
+sha512sums="8b4519e5c23cb57b2ee86435cec8078912921d2c9c49f90eddba6f0f122d0dec0091690d5280bebb7af97c13095640b6cb77ea7e1a813d828dd31514096069aa  xe-guest-utilities-6.6.80.tar.gz
 3e898b473f6e71ecc5b820717df0a460b31756b68f4bb9bf454df39f430e64ca5e33582c03bfea044d93f49937883fe9b6807c31dee72307750de670bfca8bcd  xe-guest-utilities.initd
-8823cccdcef84f8632a528a77fa338e71cfc098f05a2e8d858f335bbaa21c2eddc40696c5d526e2a7f86a2225e23a63df83274cbeb755a9626036724e9855724  no_bash_dependency.patch
-94d0d3c6f082dc76e7a76b48d1ecfff7d38ba6da344d1fdfa94c7a8f6c23ca726bccc7b1c8934f41ab06bb9a6b8582aec7448a99d17598b19dc8f3a73f1cd08a  identify_alpine.patch
-0fc0bbff8f6b165f9ac9b89cccda5fbc46e37a20342028a770c43aa893c8c4dc2dbeddae7c005d13f500d96d12172176202298d1933094671323dc6f71732435  fix_cflags.patch
-7245a92f8af446ec77eabed8a022c61f0c4874cc2dc569ef3ff944b6b398ac42ab284822c5f4886eb4a9a461f1ae2b02eb6c58560eb50af7616c92583d1612fc  no_hard_links.patch"
+94d0d3c6f082dc76e7a76b48d1ecfff7d38ba6da344d1fdfa94c7a8f6c23ca726bccc7b1c8934f41ab06bb9a6b8582aec7448a99d17598b19dc8f3a73f1cd08a  identify_alpine.patch"
diff --git a/main/xe-guest-utilities/fix_cflags.patch b/main/xe-guest-utilities/fix_cflags.patch
deleted file mode 100644
index 866fa29fd3..0000000000
--- a/main/xe-guest-utilities/fix_cflags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- xe-guest-utilities-5.5.0.orig/uclibc-sources/Config.mk
-+++ xe-guest-utilities-5.5.0/uclibc-sources/Config.mk
-@@ -70,7 +70,6 @@
-       export XEN_ROOT
-   endef
- 
--CFLAGS += -g
- 
- CFLAGS += -fno-strict-aliasing
- 
---- xe-guest-utilities-5.5.0.orig/uclibc-sources/config/StdGNU.mk
-+++ xe-guest-utilities-5.5.0/uclibc-sources/config/StdGNU.mk
-@@ -44,7 +44,6 @@
- SHLIB_CFLAGS = -shared
- 
- ifneq ($(debug),y)
--CFLAGS += -O2 -fomit-frame-pointer
- else
- # Less than -O1 produces bad code and large stack frames
- CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
---- xe-guest-utilities-5.5.0.orig/uclibc-sources/config/x86_32.mk
-+++ xe-guest-utilities-5.5.0/uclibc-sources/config/x86_32.mk
-@@ -7,7 +7,6 @@
- CONFIG_XCUTILS := y
- CONFIG_IOEMU := n
- 
--CFLAGS += -m32 -march=i686
- 
- # Use only if calling $(LD) directly.
- LDFLAGS_DIRECT_OpenBSD = _obsd
---- xe-guest-utilities-5.5.0.orig/uclibc-sources/tools/Rules.mk
-+++ xe-guest-utilities-5.5.0/uclibc-sources/tools/Rules.mk
-@@ -27,9 +27,7 @@
- CFLAGS += -D__XEN_TOOLS__
- 
- # Enable implicit LFS support *and* explicit LFS names.
--CFLAGS  += $(shell getconf LFS_CFLAGS)
--CFLAGS  += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--LDFLAGS += $(shell getconf LFS_LDFLAGS)
-+CFLAGS  += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
- # 32-bit x86 does not perform well with -ve segment accesses on Xen.
- CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs)
diff --git a/main/xe-guest-utilities/no_bash_dependency.patch b/main/xe-guest-utilities/no_bash_dependency.patch
deleted file mode 100644
index 27d9af285b..0000000000
--- a/main/xe-guest-utilities/no_bash_dependency.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- xe-guest-utilities-5.5.0.orig/xe-daemon
-+++ xe-guest-utilities-5.5.0/xe-daemon
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Copyright (C) 2009  Citrix Systems Inc.
- #
diff --git a/main/xe-guest-utilities/no_hard_links.patch b/main/xe-guest-utilities/no_hard_links.patch
deleted file mode 100644
index 6a43b5af76..0000000000
--- a/main/xe-guest-utilities/no_hard_links.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xe-guest-utilities-5.5.0.orig/uclibc-sources/tools/xenstore/Makefile
-+++ xe-guest-utilities-5.5.0/uclibc-sources/tools/xenstore/Makefile
-@@ -97,7 +97,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/bin
- 	$(INSTALL_PROG) xenstore $(DESTDIR)/usr/bin
- 	set -e ; for c in $(CLIENTS) ; do \
--		ln -f $(DESTDIR)/usr/bin/xenstore $(DESTDIR)/usr/bin/$${c} ; \
-+		ln -sf xenstore $(DESTDIR)/usr/bin/$${c} ; \
- 	done
- 
- .PHONY: install