diff options
Diffstat (limited to 'libproc/debian')
| -rw-r--r-- | libproc/debian/changelog | 7 | ||||
| -rw-r--r-- | libproc/debian/control | 2 | ||||
| -rw-r--r-- | libproc/debian/patches/illumos-3463.patch | 48 | ||||
| -rw-r--r-- | libproc/debian/patches/series | 1 |
4 files changed, 57 insertions, 1 deletions
diff --git a/libproc/debian/changelog b/libproc/debian/changelog index b86f1eb..33d5ac9 100644 --- a/libproc/debian/changelog +++ b/libproc/debian/changelog @@ -1,3 +1,10 @@ +libproc (2.10-2) unstable; urgency=low + + * libproc1-dev requires libc-db1-dev + * Upstream patch: 3463 agent lwp clobbers amd64 abi stack redzone + + -- Igor Pashev <pashev.igor@gmail.com> Tue, 15 Jan 2013 01:33:32 +0000 + libproc (2.10-1) unstable; urgency=low * Initial release. diff --git a/libproc/debian/control b/libproc/debian/control index 58575d3..01aa9d0 100644 --- a/libproc/debian/control +++ b/libproc/debian/control @@ -30,7 +30,7 @@ Section: libdevel Priority: optional Architecture: illumos-any Provides: libproc-dev -Depends: libproc1 (= ${binary:Version}), ${misc:Depends}, libc-dev +Depends: libproc1 (= ${binary:Version}), ${misc:Depends}, libc-dev, libc-db1-dev Description: process control library (development files) This package contains the header files and symlinks needed to compile applications that use libproc. diff --git a/libproc/debian/patches/illumos-3463.patch b/libproc/debian/patches/illumos-3463.patch new file mode 100644 index 0000000..a2aef6c --- /dev/null +++ b/libproc/debian/patches/illumos-3463.patch @@ -0,0 +1,48 @@ +From f6dcd367bb2ab63785ea4839111eb4846066404d Mon Sep 17 00:00:00 2001 +From: "Joshua M. Clulow" <jmc@joyent.com> +Date: Fri, 11 Jan 2013 08:35:07 -0800 +Subject: [PATCH] 3463 agent lwp clobbers amd64 abi stack redzone Reviewed by: + Robert Mustacchi <rm@joyent.com> Reviewed by: Richard Lowe + <richlowe@richlowe.net> Approved by: Garrett D'Amore + <garrett@damore.org> + +--- + usr/src/lib/libproc/common/Psyscall.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/usr/src/lib/libproc/common/Psyscall.c b/usr/src/lib/libproc/common/Psyscall.c +index 1261eb4..a6cc285 100644 +--- a/usr/src/lib/libproc/common/Psyscall.c ++++ b/usr/src/lib/libproc/common/Psyscall.c +@@ -22,8 +22,9 @@ + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ +- +-#pragma ident "%Z%%M% %I% %E% SMI" ++/* ++ * Copyright (c) 2013, Joyent Inc. All rights reserved. ++ */ + + #include <stdio.h> + #include <stdlib.h> +@@ -352,6 +353,16 @@ + #ifdef _LP64 + if (model == PR_MODEL_LP64) { + sp = P->status.pr_lwp.pr_reg[R_SP] + STACK_BIAS; ++#if defined(__amd64) ++ /* ++ * To offset the expense of computerised subtraction, the AMD64 ++ * ABI allows a process the use of a 128-byte area beyond the ++ * location pointed to by %rsp. We must advance the agent's ++ * stack pointer by at least the size of this region or else it ++ * may corrupt this temporary storage. ++ */ ++ sp -= STACK_RESERVE64; ++#endif + sp = PSTACK_ALIGN64(sp); + } else { + #endif +-- +1.7.10 + diff --git a/libproc/debian/patches/series b/libproc/debian/patches/series index faf87d7..587e645 100644 --- a/libproc/debian/patches/series +++ b/libproc/debian/patches/series @@ -1,3 +1,4 @@ libproc-NULL-0.patch libproc-avoid-libzonecfg.h.patch libproc-avoid-project.h.patch +illumos-3463.patch |