diff options
| author | maya <maya@pkgsrc.org> | 2017-07-24 11:37:49 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-07-24 11:37:49 +0000 |
| commit | f8b27c9ba8a28e050d8e5472739cf1fccec77635 (patch) | |
| tree | 7e623b2a42eb93bf7dba403d8480361fde12983c /sysutils/xentools42 | |
| parent | 9747647a6e587600cb8bdb3629b662c325c35923 (diff) | |
| download | pkgsrc-f8b27c9ba8a28e050d8e5472739cf1fccec77635.tar.gz | |
xentools{42,45,46,48}: don't force SSP. fixes build.
xentools42: avoid %m in printf, use strerror instead. bump PKGREVISION.
I still can't build it due to other new warnings (it uses -Werror)
Diffstat (limited to 'sysutils/xentools42')
| -rw-r--r-- | sysutils/xentools42/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/xentools42/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools42/patches/patch-console_daemon_utils.c | 22 |
3 files changed, 28 insertions, 5 deletions
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index 4d63cacb14b..b80e749d614 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.58 2017/07/11 14:19:21 jaapb Exp $ +# $NetBSD: Makefile,v 1.59 2017/07/24 11:37:49 maya Exp $ VERSION= 4.2.5 VERSION_IPXE= 1.0.0 DISTNAME= xen-${VERSION} PKGNAME= xentools42-${VERSION} -PKGREVISION= 22 +PKGREVISION= 23 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ @@ -33,9 +33,9 @@ PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 +PKGSRC_USE_SSP= no + CONFLICTS+= libxen-[0-9]* -CONFLICTS+= xentools20-[0-9]* -CONFLICTS+= xentools3-[0-9]* CONFLICTS+= xenstoretools-[0-9]* XENTOP= ${WRKDIR}/xen-${VERSION} diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index 0d38b40d0a7..9ced5f53479 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2017/07/01 00:40:30 kamil Exp $ +$NetBSD: distinfo,v 1.33 2017/07/24 11:37:49 maya Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -46,6 +46,7 @@ SHA1 (patch-XSA-199) = e34c7557a1df7131000f5e408e89d3aaa4b10189 SHA1 (patch-blktap_drivers_Makefile) = c6be57154a403a64e3d6bc22d6bd833fe33fc9af SHA1 (patch-blktap_lib_blktaplib.h) = 571e35081df24785ae67133b04d2b0ff016a0ded SHA1 (patch-configure) = 11df58a8e1cd6bcc319db0aff508367e59592cba +SHA1 (patch-console_daemon_utils.c) = 362966402e4925a37b400e324e59af738b65cafc SHA1 (patch-examples_Makefile) = ee02f973416ca4ffda5381cd7a4ddb3b43579621 SHA1 (patch-examples_xend-config.sxp) = 1c3423b6eead47f09768d571a65891caed12aa99 SHA1 (patch-firmware_etherboot_Makefile) = 9928566768b20d9400d8df379c09b30ba60b2575 diff --git a/sysutils/xentools42/patches/patch-console_daemon_utils.c b/sysutils/xentools42/patches/patch-console_daemon_utils.c new file mode 100644 index 00000000000..59d87c7e2e4 --- /dev/null +++ b/sysutils/xentools42/patches/patch-console_daemon_utils.c @@ -0,0 +1,22 @@ +$NetBSD: patch-console_daemon_utils.c,v 1.1 2017/07/24 11:37:49 maya Exp $ + +Avoid GNU extension %m in printf + +--- console/daemon/utils.c.orig 2014-09-02 06:22:57.000000000 +0000 ++++ console/daemon/utils.c +@@ -113,13 +113,13 @@ bool xen_setup(void) + xs = xs_daemon_open(); + if (xs == NULL) { + dolog(LOG_ERR, +- "Failed to contact xenstore (%m). Is it running?"); ++ "Failed to contact xenstore (%s). Is it running?", strerror(errno)); + goto out; + } + + xc = xc_interface_open(0,0,0); + if (!xc) { +- dolog(LOG_ERR, "Failed to contact hypervisor (%m)"); ++ dolog(LOG_ERR, "Failed to contact hypervisor (%s)", strerror(errno)); + goto out; + } + |