From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../xe-guest-utilities/files/xe-daemon.initd | 27 ----- .../xe-guest-utilities-5.6.100_p651-gentoo.patch | 35 ------ ...utilities-5.6.100_p651-update-guest-attrs.patch | 11 -- ...st-utilities-6.2.0_p1120-Guest-Attributes.patch | 127 --------------------- ...-utilities-6.2.0_p1120-Linux-Distribution.patch | 77 ------------- 5 files changed, 277 deletions(-) delete mode 100644 app-emulation/xe-guest-utilities/files/xe-daemon.initd delete mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch delete mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch delete mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch delete mode 100644 app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch (limited to 'app-emulation/xe-guest-utilities/files') diff --git a/app-emulation/xe-guest-utilities/files/xe-daemon.initd b/app-emulation/xe-guest-utilities/files/xe-daemon.initd deleted file mode 100644 index d2c6e51fb5bf..000000000000 --- a/app-emulation/xe-guest-utilities/files/xe-daemon.initd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - after bootmisc -} - -start() { - einfo "Detecting Linux distribution version" - /usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution - - ebegin "Starting xe daemon" - start-stop-daemon --start --exec /usr/sbin/xe-daemon \ - --pidfile /var/run/xe-daemon.pid \ - --background \ - -- -p /var/run/xe-daemon.pid - eend $? -} - -stop() { - ebegin "Stopping xe daemon" - start-stop-daemon --stop --exec /usr/sbin/xe-daemon \ - --pidfile /var/run/xe-daemon.pid - eend $? -} diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch deleted file mode 100644 index ee9b86e91396..000000000000 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- usr/sbin/xe-linux-distribution.orig 2011-04-18 10:56:30.000000000 -0500 -+++ usr/sbin/xe-linux-distribution 2013-12-31 01:35:51.995831278 -0600 -@@ -249,6 +249,24 @@ - write_to_output "${distro}" "${major}" "${minor}" "${description}" - } - -+identify_gentoo() -+{ -+ gentoo_release="$1" -+ if [ ! -e "${gentoo_release}" ] ; then -+ return 1 -+ fi -+ distro="gentoo" -+ eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' ) -+ if [ -z "${release}" ] ; then -+ return 1 -+ fi -+ eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' ) -+ if [ -z "${major}" -o -z "$minor" ] ; then -+ return 1 -+ fi -+ write_to_output "${distro}" "${major}" "${minor}" "${distro}" -+} -+ - if [ $# -eq 1 ] ; then - exec 1>"$1" - fi -@@ -258,6 +276,7 @@ - identify_sles /etc/SuSE-release && exit 0 - identify_lsb lsb_release && exit 0 - identify_debian /etc/debian_version && exit 0 -+ identify_gentoo /etc/gentoo-release && exit 0 - - if [ $# -eq 1 ] ; then - rm -f "$1" diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch deleted file mode 100644 index c60994effa65..000000000000 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- usr/sbin/xe-update-guest-attrs.orig 2011-04-18 10:56:30.000000000 -0500 -+++ usr/sbin/xe-update-guest-attrs 2013-12-31 04:34:57.750083257 -0600 -@@ -172,7 +172,7 @@ - # collisions:0 txqueuelen:0 - # RX bytes:3604609 (3.4 MiB) TX bytes:3604609 (3.4 MiB) - --eval $(/sbin/ifconfig | \ -+eval $(/bin/ifconfig | \ - sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \ - -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \ - -e 's/ *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;') diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch deleted file mode 100644 index d431cdfcf999..000000000000 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- usr/sbin/xe-update-guest-attrs.orig 2013-06-14 07:57:18.000000000 -0500 -+++ usr/sbin/xe-update-guest-attrs 2014-04-19 13:38:14.627477193 -0500 -@@ -1,6 +1,7 @@ - #!/bin/sh - - # Copyright (C) 2009 Citrix Systems Inc. -+# Copyright (C) 2014 Christopher J. Camisa - # - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU General Public License -@@ -51,10 +52,10 @@ - - # parse command line opts - --MEMORY_MODE=0 # do not update memory stats --while [ $# -ge 1 ] ; do -+MEMORY_MODE=0 # do not update memory stats -+while [ $# -ge 1 ] ; do - if [ "$1" = "--memory" ] ; then -- MEMORY_MODE=1 # update only memory stats -+ MEMORY_MODE=1 # update only memory stats - fi - shift - done -@@ -71,12 +72,12 @@ - fi - else - # cache does not exist -- if [ -e $cache ] ; then -+ if [ -e $cache ] ; then - # something (directory?) in its way - rm -rf $cache - fi - fi -- -+ - # try to write and update cache if successful - if $XENSTORE write "$key" "$newval" ; then - mkdir -p $(dirname "$cache") -@@ -119,8 +120,8 @@ - xenstore_list_interfaces_cached() { - topdir=$XS_CACHE/attr - if [ -d $topdir ] ; then -- cd $topdir -- for dir in * ; do -+ cd $topdir -+ for dir in * ; do - [ -f $dir/ip ] && echo $dir - done - fi -@@ -131,7 +132,7 @@ - eval $(cat /proc/meminfo | \ - sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \ - -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;') -- -+ - xenstore_write_cached "data/meminfo_total" "${memtotal}" - xenstore_write_cached "data/meminfo_free" "${memfree}" - fi -@@ -140,17 +141,17 @@ - - # e.g. - # $ ip addr show --# 1: lo: mtu 16436 qdisc noqueue -+# 1: lo: mtu 16436 qdisc noqueue - # link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 - # inet 127.0.0.1/8 scope host lo --# inet6 ::1/128 scope host -+# inet6 ::1/128 scope host - # valid_lft forever preferred_lft forever - # 2: eth0: mtu 1500 qdisc pfifo_fast qlen 1000 - # link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff - # inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0 --# inet6 fe80::213:20ff:fe95:e874/64 scope link -+# inet6 fe80::213:20ff:fe95:e874/64 scope link - # valid_lft forever preferred_lft forever --# 3: sit0: mtu 1480 qdisc noop -+# 3: sit0: mtu 1480 qdisc noop - # link/sit 0.0.0.0 brd 0.0.0.0 - - #eval $(ip addr show | \ -@@ -158,26 +159,26 @@ - # -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;') - - # e.g. --# eth0 Link encap:Ethernet HWaddr 00:13:20:95:E8:74 -+# eth0 Link encap:Ethernet HWaddr 00:13:20:95:E8:74 - # inet addr:172.31.0.57 Bcast:172.31.15.255 Mask:255.255.240.0 - # inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link - # UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 - # RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0 - # TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0 --# collisions:0 txqueuelen:1000 -+# collisions:0 txqueuelen:1000 - # RX bytes:35864034092 (33.4 GiB) TX bytes:27544025180 (25.6 GiB) --# Interrupt:177 --# --# lo Link encap:Local Loopback -+# Interrupt:177 -+# -+# lo Link encap:Local Loopback - # inet addr:127.0.0.1 Mask:255.0.0.0 - # inet6 addr: ::1/128 Scope:Host - # UP LOOPBACK RUNNING MTU:16436 Metric:1 - # RX packets:32928 errors:0 dropped:0 overruns:0 frame:0 - # TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0 --# collisions:0 txqueuelen:0 -+# collisions:0 txqueuelen:0 - # RX bytes:3604609 (3.4 MiB) TX bytes:3604609 (3.4 MiB) - --ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \ -+ifs=`/bin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \ - -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \ - -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \ - while read tag value; do -@@ -225,9 +226,9 @@ - # build time addons - xenstore_write_cached "attr/PVAddons/MajorVersion" "6" - xenstore_write_cached "attr/PVAddons/MinorVersion" "2" --xenstore_write_cached "attr/PVAddons/MicroVersion" "0" -+xenstore_write_cached "attr/PVAddons/MicroVersion" "0" - xenstore_write_cached "attr/PVAddons/BuildVersion" "70442" --xenstore_write_cached "attr/PVAddons/Installed" "1" -+xenstore_write_cached "attr/PVAddons/Installed" "1" - - # update xenstore if necessary - if [ $XENSTORE_UPDATED -eq 1 ] ; then diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch deleted file mode 100644 index 45b0bbc56c69..000000000000 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- usr/sbin/xe-linux-distribution.orig 2013-06-14 07:57:18.000000000 -0500 -+++ usr/sbin/xe-linux-distribution 2014-04-19 13:54:13.270477193 -0500 -@@ -1,6 +1,7 @@ - #! /bin/sh - - # Copyright (C) 2009 Citrix Systems Inc. -+# Copyright (C) 2014 Christopher J. Camisa - # - # This program is free software; you can redistribute it and/or - # modify it under the terms of the GNU General Public License -@@ -68,7 +69,7 @@ - eval $(awk -F. '/^[0-9]*\.[0-9]*/ \ - { print "major="$1 ; print "minor="$2 ; exit 0 }' \ - "${debian_version}") -- -+ - if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then - return 1 - fi -@@ -118,7 +119,7 @@ - # Enterprise Linux Enterprise Linux Server release 5 (Carthage) - # Enterprise Linux Enterprise Linux Server release 5.5 (Carthage) - # Oracle Linux Server release 5.6 -- -+ - if [ ! -f "${redhat_release}" ] ; then - return 1 - fi -@@ -236,7 +237,7 @@ - if [ ! -x "${lsb_release}" ] ; then - return 1 - fi -- -+ - distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z') - description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g') - release=$(${lsb_release} --short --release) -@@ -254,6 +255,31 @@ - write_to_output "${distro}" "${major}" "${minor}" "${description}" - } - -+identify_gentoo() -+{ -+ gentoo_release="$1" -+ -+ if [ ! -e "${gentoo_release}" ] ; then -+ return 1 -+ fi -+ -+ distro="gentoo" -+ -+ eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' ) -+ -+ if [ -z "${release}" ] ; then -+ return 1 -+ fi -+ -+ eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' ) -+ -+ if [ -z "${major}" -o -z "$minor" ] ; then -+ return 1 -+ fi -+ -+ write_to_output "${distro}" "${major}" "${minor}" "${distro}" -+} -+ - if [ $# -eq 1 ] ; then - exec 1>"$1" - fi -@@ -265,6 +291,7 @@ - identify_sles /etc/SuSE-release && exit 0 - identify_lsb lsb_release && exit 0 - identify_debian /etc/debian_version && exit 0 -+ identify_gentoo /etc/gentoo-release && exit 0 - - if [ $# -eq 1 ] ; then - rm -f "$1" -- cgit v1.2.3