Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 66168 Details for
Bug 102080
dev-util/strace-4.5.11-r1 fails due to quota issues with glibc snapshot
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for masked glibcs
strace-4.5.12-glibc.patch (text/plain), 3.38 KB, created by
Mark Loeser (RETIRED)
on 2005-08-17 14:07:08 UTC
(
hide
)
Description:
Patch for masked glibcs
Filename:
MIME Type:
Creator:
Mark Loeser (RETIRED)
Created:
2005-08-17 14:07:08 UTC
Size:
3.38 KB
patch
obsolete
>diff -ur strace-4.5.12/configure.ac strace-4.5.12-patch/configure.ac >--- strace-4.5.12/configure.ac 2005-06-08 16:50:29.000000000 -0400 >+++ strace-4.5.12-patch/configure.ac 2005-08-17 16:57:11.000000000 -0400 >@@ -216,6 +216,8 @@ > > AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>]) > >+AC_CHECK_MEMBERS([struct dqblk.dqb_curblocks],,, [#include <sys/quota.h>]) >+ > AC_CHECK_DECLS([sys_errlist]) > AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>]) > >diff -ur strace-4.5.12/resource.c strace-4.5.12-patch/resource.c >--- strace-4.5.12/resource.c 2004-10-06 18:14:53.000000000 -0400 >+++ strace-4.5.12-patch/resource.c 2005-08-17 16:57:11.000000000 -0400 >@@ -27,7 +27,7 @@ > * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > * >- * $Id: resource.c,v 1.13 2004/10/06 22:14:53 roland Exp $ >+ * $Id: resource.c,v 1.15 2005/08/03 12:18:09 roland Exp $ > */ > > #include "defs.h" >@@ -464,6 +464,7 @@ > > #ifdef LINUX > >+#define OLD_CMD(c) ((c)<<8) > #define NEW_CMD(c) ((0x80<<16)+(c)) > #define XQM_CMD(c) (('X'<<8)+(c)) > #define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16))) >@@ -471,15 +472,15 @@ > #define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c)) > > static const struct xlat quotacmds[] = { >- { Q_QUOTAON, "Q_QUOTAON" }, >- { Q_QUOTAOFF, "Q_QUOTAOFF" }, >- { Q_GETQUOTA, "Q_GETQUOTA" }, >- { Q_SETQUOTA, "Q_SETQUOTA" }, >- { Q_SETUSE, "Q_SETUSE" }, >- { Q_SYNC, "Q_SYNC" }, >- { Q_SETQLIM, "Q_SETQLIM" }, >- { Q_GETSTATS, "Q_GETSTATS" }, >- { Q_RSQUASH, "Q_RSQUASH" }, >+ { OLD_CMD(0x1), "Q_QUOTAON" }, >+ { OLD_CMD(0x2), "Q_QUOTAOFF" }, >+ { OLD_CMD(0x3), "Q_GETQUOTA" }, >+ { OLD_CMD(0x4), "Q_SETQUOTA" }, >+ { OLD_CMD(0x5), "Q_SETUSE" }, >+ { OLD_CMD(0x6), "Q_SYNC" }, >+ { OLD_CMD(0x7), "Q_SETQLIM" }, >+ { OLD_CMD(0x8), "Q_GETSTATS" }, >+ { OLD_CMD(0x10),"Q_RSQUASH" }, > { NEW_CMD(0x1), "Q_SYNC" }, > { NEW_CMD(0x2), "Q_QUOTAON" }, > { NEW_CMD(0x3), "Q_QUOTAOFF" }, >@@ -528,21 +529,29 @@ > > if (!tcp->u_arg[3]) > tprintf("NULL"); >- else if (!verbose(tcp) || !OLD_COMMAND(cmd)) >+ else if (!verbose(tcp) || >+#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS >+ ! >+#endif >+ OLD_COMMAND(cmd)) > tprintf("%#lx", tcp->u_arg[3]); > else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk), > (char *) &dq) < 0) > tprintf("???"); > else { > tprintf("{"); >- tprintf("%u, ", dq.dqb_bhardlimit); >- tprintf("%u, ", dq.dqb_bsoftlimit); >- tprintf("%u, ", dq.dqb_curblocks); >- tprintf("%u, ", dq.dqb_ihardlimit); >- tprintf("%u, ", dq.dqb_isoftlimit); >- tprintf("%u, ", dq.dqb_curinodes); >- tprintf("%lu, ", dq.dqb_btime); >- tprintf("%lu", dq.dqb_itime); >+ tprintf("%llu, ", (unsigned long long) dq.dqb_bhardlimit); >+ tprintf("%llu, ", (unsigned long long) dq.dqb_bsoftlimit); >+#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS >+ tprintf("%llu, ", (unsigned long long) dq.dqb_curblocks); >+#else >+ tprintf("%llu, ", (unsigned long long) dq.dqb_curspace); >+#endif >+ tprintf("%llu, ", (unsigned long long) dq.dqb_ihardlimit); >+ tprintf("%llu, ", (unsigned long long) dq.dqb_isoftlimit); >+ tprintf("%llu, ", (unsigned long long) dq.dqb_curinodes); >+ tprintf("%llu, ", (unsigned long long) dq.dqb_btime); >+ tprintf("%llu", (unsigned long long) dq.dqb_itime); > tprintf("}"); > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 102080
:
65640
|
65843
| 66168