Fix building with newer glibc snapshots with a patch from upstream cvs #102080 by Alexey Maximov/Hanno Meyer-Thurow/Mark Loeser.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 106 insertions, 9 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index d01e55f72ebb..613708dcb07d 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.65 2005/08/12 02:43:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.66 2005/08/18 00:24:41 vapier Exp $
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.12-quota.patch, strace-4.5.12.ebuild:
+  Fix building with newer glibc snapshots with a patch from upstream cvs
+  #102080 by Alexey Maximov/Hanno Meyer-Thurow/Mark Loeser.
 
 *strace-4.5.12 (12 Aug 2005)
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index b58205574d83..7857cf4d10aa 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -4,10 +4,10 @@ Hash: SHA1
 MD5 4474209bd9ff4ef6827bc37e512e6885 strace-4.5.2.ebuild 1311
 MD5 c9d8ca6c43099729a9c981ed49e94ce3 strace-4.5.9.ebuild 1429
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 b808bf15821fbf508b3021a17bb6729b strace-4.5.12.ebuild 1820
+MD5 9b254377b6c0e95490aacf1935557090 strace-4.5.12.ebuild 1923
 MD5 0ad191371a52a40b85dfb14db954593a strace-4.5.11.ebuild 1675
 MD5 85f383eadb2ed8c50c1a494e679bd2a2 strace-4.5.1.ebuild 1294
-MD5 f3d9fe0b3f123bacc95b67a2be78f6ce ChangeLog 7760
+MD5 5f5008027563ad81f28b3f22054203ce ChangeLog 8002
 MD5 7a45d471b2608afbcfac7b22f86726ce strace-4.5.7.ebuild 1139
 MD5 38e4a65d3a6a6e39695752ba68b2db78 files/digest-strace-4.5.1 65
 MD5 ff683dfacf57a09947ca5e6c4406249d files/strace-superh-update.patch 300
@@ -22,11 +22,12 @@ MD5 332b30ad46b6f4ee72387a779580f321 files/digest-strace-4.5.7 65
 MD5 b7c93d383818fc6aa8ac330514b866e0 files/strace-4.5.1-2.6.patch 5756
 MD5 9b1d73be67c2e1359d1490b62a2bb84e files/digest-strace-4.5.12 66
 MD5 b2d46a601a4bd117795f40178cf40612 files/digest-strace-4.5.2 65
+MD5 a60a27ad25c9a4be8f74cac3b50d26e1 files/strace-4.5.12-quota.patch 2947
 MD5 3eb9b0a09aef20e2fd45e7f6e73557d1 files/strace-4.5.11-fbsd.patch 4767
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC/A0ZgIKl8Uu19MoRAoWrAJ4hZQXq+x/FIo5tHlMo0lCRvCJB1wCbB1SD
-pQNidJp2UkIVcKHlBR2xTNc=
-=5YwI
+iD8DBQFDA9VfgIKl8Uu19MoRAmN1AJ4hD5Y0ntAZAa8vOc0YdbtbajbbsACePKtg
+t2d7z10xtkF2ZWPnP59sToM=
+=wEUN
 -----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/strace-4.5.12-quota.patch b/dev-util/strace/files/strace-4.5.12-quota.patch
new file mode 100644
index 000000000000..161d0fc45e66
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.12-quota.patch
@@ -0,0 +1,89 @@
+Changes from upstream cvs to fix breakage with newer glibc's
+
+http://bugs.gentoo.org/102080
+
+--- strace-4.5.12/configure.ac
++++ strace-4.5.12/configure.ac
+@@ -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>])
+ 
+--- strace-4.5.12/resource.c
++++ strace-4.5.12/resource.c
+@@ -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("}");
+ 		}
+ 
diff --git a/dev-util/strace/strace-4.5.12.ebuild b/dev-util/strace/strace-4.5.12.ebuild
index b37b839f1fbe..119b16a6302e 100644
--- a/dev-util/strace/strace-4.5.12.ebuild
+++ b/dev-util/strace/strace-4.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.1 2005/08/12 02:43:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.2 2005/08/18 00:24:41 vapier Exp $
 
 inherit flag-o-matic
 
@@ -17,12 +17,14 @@ DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	if [[ ${CTARGET:-${CHOST}} == *-freebsd* ]] ; then
 		epatch ${FILESDIR}/${P}-fbsd.patch
-		aclocal && autoconf && automake || die "autotools failed"
 	fi
+	# Fix support for newer glibc snapshots #102080
+	epatch "${FILESDIR}"/${P}-quota.patch
+	aclocal && autoheader && autoconf && automake || die "autotools failed"
 
 	# Fix SuperH support
 	epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch