Re: pkg/45323 (sysutils/strace bogus syscall list generation (NetBSD 5 & before))

[Robert Elz <kre%munnari.OZ.AU@localhost>]

The following reply was made to PR pkg/45323; it has been noted by GNATS.

From: Robert Elz <kre%munnari.OZ.AU@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/45323 (sysutils/strace bogus syscall list generation (NetBSD 5 
& before))
Date: Sat, 03 Sep 2011 21:33:16 +0700

   |  No patch :-)
 
 Ugh - I'm an idiot - I didn't see that even when I saw my own message
 come back....   This time it is appended!
 
   |  That is strange... make makepatchsum should work...
 
 No idea why, and it is just patch-av (both times), none of the others
 had a problem, perhaps there's something in that patch that is messing
 things up.
 
 kre
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/NetBSD/pkgsrc/sysutils/strace/distinfo,v
 retrieving revision 1.17
 diff -u -r1.17 distinfo
 --- distinfo   1 Sep 2011 13:00:49 -0000       1.17
 +++ distinfo   3 Sep 2011 14:07:37 -0000
 @@ -24,13 +24,13 @@
  SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
  SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
  SHA1 (patch-au) = 39ce7d7234ac3df0a7db24d0310989015b981a91
 -SHA1 (patch-av) = 614d46d4da04dac3d9fadcb1cd744bab860361c3
 +SHA1 (patch-av) = fa71fcd3a91f2ed58d9880cf8ae76250eaaadf6d
  SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
  SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
  SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
  SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
  SHA1 (patch-ba) = be8e2f79bd8818b99bdce63fb73802f1a4014b2f
  SHA1 (patch-bb) = e7e309d96ec9fa2398a968f29f7e6549ff81e37e
 -SHA1 (patch-bc) = 051f1efbbb319dc06153736ac44677f65ea13cd0
 +SHA1 (patch-bc) = 7eece85b62383a0f6cb3b8e9dbe2a9a0316c6c02
  SHA1 (patch-bd) = 6ad13b8b0130886cc87218d9acfe46d8f9fc82ef
  SHA1 (patch-be) = 6326b50b3d9be0524d67770d67530069866edd9e
 Index: patches/patch-bc
 ===================================================================
 RCS file: /cvsroot/NetBSD/pkgsrc/sysutils/strace/patches/patch-bc,v
 retrieving revision 1.2
 diff -u -r1.2 patch-bc
 --- patches/patch-bc   30 Aug 2011 10:43:11 -0000      1.2
 +++ patches/patch-bc   3 Sep 2011 14:07:29 -0000
 @@ -2,7 +2,7 @@
  
  --- quota.c.orig      2006-10-16 03:30:53.000000000 +0300
  +++ quota.c   2011-08-30 12:49:51.000000000 +0300
 -@@ -687,14 +687,17 @@
 +@@ -687,14 +687,20 @@
   
   #endif /* Linux */
   
 @@ -17,8 +17,11 @@
  +#ifdef ALLBSD
   #include <ufs/ufs/quota.h>
  +#ifdef __NetBSD__
 ++#include <sys/param.h>
 ++#if __NetBSD_Version__ >= 599004700
  +#include <ufs/ufs/quota1.h>
  +#endif
 ++#endif
   #endif
   
   static const struct xlat quotacmds[] = {