pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xentools20 Fix build with libcurl-7.6.10.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c61987694213
branches: trunk
changeset: 521800:c61987694213
user: seb <seb%pkgsrc.org@localhost>
date: Wed Nov 22 00:12:34 2006 +0000
description:
Fix build with libcurl-7.6.10.
Fix build with NetBSD's current gcc 4.1.2.
Bump PKGREVISION to 9.
Approved by maintainer.
diffstat:
sysutils/xentools20/Makefile | 4 +-
sysutils/xentools20/distinfo | 12 +++++-
sysutils/xentools20/patches/patch-ac | 13 +++++++-
sysutils/xentools20/patches/patch-ae | 56 +++++++++++++++++++++++++++++++++--
sysutils/xentools20/patches/patch-ai | 13 ++++++++
sysutils/xentools20/patches/patch-an | 47 ++++++++++++++++++++++++++++++
sysutils/xentools20/patches/patch-ap | 13 ++++++++
sysutils/xentools20/patches/patch-ar | 22 ++++++++++++++
sysutils/xentools20/patches/patch-ba | 13 ++++++++
sysutils/xentools20/patches/patch-bb | 16 ++++++++++
10 files changed, 198 insertions(+), 11 deletions(-)
diffs (293 lines):
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/Makefile
--- a/sysutils/xentools20/Makefile Tue Nov 21 23:58:08 2006 +0000
+++ b/sysutils/xentools20/Makefile Wed Nov 22 00:12:34 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/22 00:12:34 seb Exp $
#
DISTNAME= xen-2.0.7-src
PKGNAME= xentools20-2.0.7
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= sysutils
MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/
EXTRACT_SUFX= .tgz
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/distinfo
--- a/sysutils/xentools20/distinfo Tue Nov 21 23:58:08 2006 +0000
+++ b/sysutils/xentools20/distinfo Wed Nov 22 00:12:34 2006 +0000
@@ -1,21 +1,25 @@
-$NetBSD: distinfo,v 1.13 2006/10/15 23:34:02 seb Exp $
+$NetBSD: distinfo,v 1.14 2006/11/22 00:12:34 seb Exp $
SHA1 (xen-2.0.7-src.tgz) = 5317100e1e062961e3fee398fccbf023eb8f0337
RMD160 (xen-2.0.7-src.tgz) = db99fb49e592df7229d4d361c48bab1d23a1d725
Size (xen-2.0.7-src.tgz) = 2580390 bytes
SHA1 (patch-aa) = 2c3ca679003895f19f11dcd5038dbfa2de241a74
SHA1 (patch-ab) = ff0df4820e18310bd16ce649e5c8613d88321b35
-SHA1 (patch-ac) = 7bc2923eb2b8786d40cbdb73b8e872aa4f4e6a69
+SHA1 (patch-ac) = 282cfea5db2cdf418f43f3ea04168717fa0158d1
SHA1 (patch-ad) = 6f242d6ad89b4c019cd291313ba8eaa28ae3bfbb
-SHA1 (patch-ae) = 83440e3d6c0d2f6227dad6a95ba56a955979751c
+SHA1 (patch-ae) = 673dac9ea547b77804f591139ffc409340b7b31a
SHA1 (patch-af) = 5467e64fbd49d6ca35718d42864ed7b44fe76df3
SHA1 (patch-ag) = 6a19a5cf75894e0d5ba91e4d4214b6bd59de60df
SHA1 (patch-ah) = 610be8e20e2ef27ce838519144b7b0678b7d6830
+SHA1 (patch-ai) = 868588b3deff152b33489e3e5a24789b3311e1bd
SHA1 (patch-aj) = 8712a2641e9aad2468d46d0f554cefca2259b230
SHA1 (patch-ak) = 2d38643ac8308cbd79876c150a42d463b1c2bfbd
SHA1 (patch-al) = 6394c54681af520fa21a6839cf32b84a51a146d5
SHA1 (patch-am) = 7392057d2da107e935775627afe2498a81903f71
+SHA1 (patch-an) = 40e0798b8608a280e45f43b11f449c341b1f5a7b
+SHA1 (patch-ap) = 1fb379e7b2ddb7f577d19bbc83cda35e5d265f99
SHA1 (patch-aq) = 96ac4caaa268069ee02962a917f85753515747be
+SHA1 (patch-ar) = 850d88aa8b536f2470b967068afe924a03fc496c
SHA1 (patch-as) = 333da168af43dae9a4e8695409cbd006e7fcf097
SHA1 (patch-at) = 0964bc7dd23ff6fcd596d6a8564d9e3033f34563
SHA1 (patch-au) = a5eb7b34d43f57a3e1d4644e98ec571f30c56f5e
@@ -24,3 +28,5 @@
SHA1 (patch-ax) = b4a0b8e06ff7ab6424d5340ee35d8f62243f8e3c
SHA1 (patch-ay) = a77b39b508d05a8276550bccff02e770d27c3f42
SHA1 (patch-az) = 972708387e8f87a2283b123887d6062eabc8bd82
+SHA1 (patch-ba) = cd2d822dd74d2d1c531822b1a98506b0964e87a5
+SHA1 (patch-bb) = 980885a16c3408db8b7e196c8f6cc17bfd96fa19
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ac
--- a/sysutils/xentools20/patches/patch-ac Tue Nov 21 23:58:08 2006 +0000
+++ b/sysutils/xentools20/patches/patch-ac Wed Nov 22 00:12:34 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/07/13 01:28:37 grant Exp $
+$NetBSD: patch-ac,v 1.4 2006/11/22 00:12:34 seb Exp $
---- python/xen/lowlevel/xu/xu.c.orig 2005-05-22 20:56:26.000000000 +1000
+--- python/xen/lowlevel/xu/xu.c.orig 2005-08-03 23:57:58.000000000 +0000
+++ python/xen/lowlevel/xu/xu.c
@@ -15,7 +15,9 @@
#include <sys/socket.h>
@@ -101,6 +101,15 @@
PyObject_Del((PyObject *)xun);
return PyErr_SetFromErrno(PyExc_IOError);
}
+@@ -508,7 +532,7 @@ static PyObject *xu_message_get_payload(
+ return dict;
+ }
+
+- return PyString_FromStringAndSize(xum->msg.msg, xum->msg.length);
++ return PyString_FromStringAndSize((char *)xum->msg.msg, xum->msg.length);
+ }
+
+ static PyObject *xu_message_get_header(PyObject *self, PyObject *args)
@@ -1110,7 +1134,8 @@ static PyObject *xu_port_new(PyObject *s
* The control-interface event channel for DOM0 is already set up.
* We use an ioctl to discover the port at our end of the channel.
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ae
--- a/sysutils/xentools20/patches/patch-ae Tue Nov 21 23:58:08 2006 +0000
+++ b/sysutils/xentools20/patches/patch-ae Wed Nov 22 00:12:34 2006 +0000
@@ -1,8 +1,56 @@
-$NetBSD: patch-ae,v 1.2 2005/08/06 17:43:14 bouyer Exp $
+$NetBSD: patch-ae,v 1.3 2006/11/22 00:12:34 seb Exp $
---- xfrd/xfrd.c.orig 2005-08-04 02:57:58.000000000 +0300
-+++ xfrd/xfrd.c 2005-08-04 12:34:08.000000000 +0300
-@@ -1230,8 +1230,8 @@
+--- xfrd/xfrd.c.orig 2005-08-03 23:57:58.000000000 +0000
++++ xfrd/xfrd.c
+@@ -481,9 +481,9 @@ int xfr_hello(Conn *conn){
+ err = -EINVAL;
+ goto exit;
+ }
+- err = intof(sxpr_childN(sxpr, 0, ONONE), &hello_major);
++ err = intof(sxpr_childN(sxpr, 0, ONONE), (int *)&hello_major);
+ if(err) goto exit;
+- err = intof(sxpr_childN(sxpr, 1, ONONE), &hello_minor);
++ err = intof(sxpr_childN(sxpr, 1, ONONE), (int *)&hello_minor);
+ if(err) goto exit;
+ if(hello_major != major || hello_minor != minor){
+ eprintf("> Wanted protocol version %d.%d, got %d.%d",
+@@ -646,7 +646,7 @@ int xfr_send_state(XfrState *state, Conn
+ if(!err) err = errcode;
+ } else if(sxpr_elementp(sxpr, oxfr_xfr_ok)){
+ // Ok - get the new domain id.
+- err = intof(sxpr_childN(sxpr, 0, ONONE), &state->vmid_new);
++ err = intof(sxpr_childN(sxpr, 0, ONONE), (int *)&state->vmid_new);
+ xfr_error(peer, err);
+ } else {
+ // Anything else is invalid. But it may be too late.
+@@ -917,7 +917,7 @@ int xfrd_service(Args *args, int peersoc
+ int n = 0;
+
+ dprintf("> xfr.migrate\n");
+- err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid);
++ err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid);
+ if(err) goto exit;
+ err = stringof(sxpr_childN(sxpr, n++, ONONE), &state->vmconfig);
+ if(err) goto exit;
+@@ -939,7 +939,7 @@ int xfrd_service(Args *args, int peersoc
+ int n = 0;
+
+ dprintf("> xfr.save\n");
+- err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid);
++ err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid);
+ if(err) goto exit;
+ err = stringof(sxpr_childN(sxpr, n++, ONONE), &state->vmconfig);
+ if(err) goto exit;
+@@ -965,7 +965,7 @@ int xfrd_service(Args *args, int peersoc
+ int n = 0;
+
+ dprintf("> xfr.xfr\n");
+- err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid);
++ err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid);
+ if(err) goto exit;
+ err = xfr_recv(args, state, conn);
+
+@@ -1230,8 +1230,8 @@ int main(int argc, char *argv[]){
#ifndef DEBUG
freopen(LOGFILE, "w+", stdout);
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-ai Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2006/11/22 00:12:34 seb Exp $
+
+--- libxc/xc_linux_build.c.orig 2005-08-03 23:57:57.000000000 +0000
++++ libxc/xc_linux_build.c
+@@ -324,7 +324,7 @@ static int setup_guestos(int xc_handle,
+ start_info->mod_start = vinitrd_start;
+ start_info->mod_len = initrd_len;
+ }
+- strncpy(start_info->cmd_line, cmdline, MAX_CMDLINE);
++ strncpy((char *)start_info->cmd_line, cmdline, MAX_CMDLINE);
+ start_info->cmd_line[MAX_CMDLINE-1] = '\0';
+ munmap(start_info, PAGE_SIZE);
+
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-an Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-an,v 1.3 2006/11/22 00:12:34 seb Exp $
+
+--- libxc/xc_plan9_build.c.orig 2005-08-03 23:57:57.000000000 +0000
++++ libxc/xc_plan9_build.c
+@@ -108,14 +108,14 @@ void
+ plan9header(Exec * header)
+ {
+ /* header is big-endian */
+- swabby(&header->magic, "magic");
+- swabby(&header->text, "text");
+- swabby(&header->data, "data");
+- swabby(&header->bss, "bss");
+- swabby(&header->syms, "syms");
+- swabby(&header->entry, "entry");
+- swabby(&header->spsz, "spsz");
+- swabby(&header->pcsz, "pcsz");
++ swabby((unsigned long *)&header->magic, "magic");
++ swabby((unsigned long *)&header->text, "text");
++ swabby((unsigned long *)&header->data, "data");
++ swabby((unsigned long *)&header->bss, "bss");
++ swabby((unsigned long *)&header->syms, "syms");
++ swabby((unsigned long *)&header->entry, "entry");
++ swabby((unsigned long *)&header->spsz, "spsz");
++ swabby((unsigned long *)&header->pcsz, "pcsz");
+
+ }
+
+@@ -205,8 +205,8 @@ setup_guestos(int xc_handle,
+ unsigned long ksize;
+ mmu_t *mmu = NULL;
+ int i;
+- unsigned long first_page_after_kernel,
+- first_data_page,
++ unsigned long first_page_after_kernel = 0,
++ first_data_page = 0,
+ page_array_page;
+ unsigned long cpu0pdb, cpu0pte, cpu0ptelast;
+ unsigned long /*last_pfn, */ tot_pte_pages;
+@@ -431,7 +431,7 @@ setup_guestos(int xc_handle,
+ start_info->flags = 0;
+ DPRINTF((" control event channel is %d\n", control_evtchn));
+ start_info->domain_controller_evtchn = control_evtchn;
+- strncpy(start_info->cmd_line, cmdline, MAX_CMDLINE);
++ strncpy((char *)start_info->cmd_line, cmdline, MAX_CMDLINE);
+ start_info->cmd_line[MAX_CMDLINE - 1] = '\0';
+ munmap(start_info, PAGE_SIZE);
+
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-ap Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.3 2006/11/22 00:12:34 seb Exp $
+
+--- xfrd/lzi_stream.c.orig 2005-08-03 23:57:58.000000000 +0000
++++ xfrd/lzi_stream.c
+@@ -242,7 +242,7 @@ int read_block(LZIState *s){
+ int err = 0, k = 0;
+ //dprintf(">\n");
+ if(s->eof) goto exit;
+- err = unmarshal_uint32(s->io, &k);
++ err = unmarshal_uint32(s->io, (uint32_t *)&k);
+ if(err) goto exit;
+ if(k > s->inbuf_size){
+ err = -EINVAL;
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ar
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-ar Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ar,v 1.3 2006/11/22 00:12:34 seb Exp $
+
+--- xfrd/marshal.c.orig 2005-08-03 23:57:58.000000000 +0000
++++ xfrd/marshal.c
+@@ -166,7 +166,7 @@ int marshal_string(IOStream *io, char *s
+ int unmarshal_string(IOStream *io, char *s, uint32_t s_n){
+ int err = 0, val_n = 0;
+ //dprintf(">\n");
+- err = unmarshal_uint32(io, &val_n);
++ err = unmarshal_uint32(io, (uint32_t *)&val_n);
+ if(err) goto exit;
+ if(val_n >= s_n){
+ err = -EINVAL;
+@@ -184,7 +184,7 @@ int unmarshal_new_string(IOStream *io, c
+ int err = 0, val_n = 0;
+ char *val = NULL;
+ //dprintf(">\n");
+- err = unmarshal_uint32(io, &val_n);
++ err = unmarshal_uint32(io, (uint32_t *)&val_n);
+ if(err) goto exit;
+ val = allocate(val_n + 1);
+ if(!val){
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-ba Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2006/11/22 00:12:34 seb Exp $
+
+--- xfrd/xdr.c.orig 2005-08-03 23:57:58.000000000 +0000
++++ xfrd/xdr.c
+@@ -283,7 +283,7 @@ int unpack_sxpr(IOStream *io, Sxpr *x){
+ err = unpack_cons(io, &val);
+ break;
+ case T_BOOL:
+- err = unpack_bool(io, &u);
++ err = unpack_bool(io, (int *)&u);
+ if(err) goto exit;
+ val = (u ? OTRUE : OFALSE);
+ break;
diff -r 76d9a318caeb -r c61987694213 sysutils/xentools20/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools20/patches/patch-bb Wed Nov 22 00:12:34 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bb,v 1.1 2006/11/22 00:12:34 seb Exp $
+
+--- xfrd/xen_domain.c.orig 2005-08-03 23:57:58.000000000 +0000
++++ xfrd/xen_domain.c
+@@ -223,9 +223,11 @@ static int curlsetup(CURL **pcurl, struc
+ #else
+ // No progress meter.
+ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
++#if defined(CURLOPT_MUTE)
+ // Completely quiet.
+ curl_easy_setopt(curl, CURLOPT_MUTE, 1);
+ #endif
++#endif
+ // Set the URL.
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+
Home |
Main Index |
Thread Index |
Old Index