Re: pkg/48934: broken devel/libvolume_id under NetBSD 5.2

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,

I would like to commit the following patch to devel/libvolume_id.
It fixes NetBSD 5.2 build, and OpenBSD binary may be changed.

Can I commit this patch?


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libvolume_id/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo    5 May 2014 21:13:16 -0000       1.11
+++ distinfo    24 Jun 2014 14:32:39 -0000
@@ -5,6 +5,6 @@
 Size (libvolume_id-0.81.1.tar.bz2) = 23399 bytes
 SHA1 (patch-aa) = d6fe419f1c79823f87d927ecfcc057f9c0e6009e
 SHA1 (patch-ab) = 6ef5cf4559578c30bc19db3bca896110374b348b
-SHA1 (patch-ac) = d27cb6f0275e06d9a75290328d4f66f68a2b8d9a
+SHA1 (patch-ac) = 0c120065f6cbfd405f3ade37b409a5c2725808c8
 SHA1 (patch-ad) = 894b565d3fcf03dd0fee8722066a0730c62a7af9
 SHA1 (patch-ae) = 9382586dab03ed7691d26b029d930940dc3e7302
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libvolume_id/patches/patch-ac,v
retrieving revision 1.9
diff -u -r1.9 patch-ac
--- patches/patch-ac    5 May 2014 21:13:16 -0000       1.9
+++ patches/patch-ac    24 Jun 2014 14:32:39 -0000
@@ -2,15 +2,19 @@
 
 --- util.c.orig        2009-03-02 18:17:35.000000000 +0000
 +++ util.c
-@@ -28,9 +28,9 @@
+@@ -28,9 +28,13 @@
  #include "libvolume_id.h"
  #include "util.h"
  
 -#ifdef __FreeBSD__
++#if defined(__OpenBSD__)
++#define __POSIX_VISIBLE       200809
++#endif
++
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__) || defined(__MirBSD__)
  #include <sys/param.h>
 -#if __FreeBSD_version < 800067
-+#if __FreeBSD_version < 800067 && __DragonFly_version < 200202 && 
__NetBSD_Version__ < 599001100 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 
< 1070 && __OpenBSD__
++#if __FreeBSD_version < 800067 && __DragonFly_version < 200202 && 
__NetBSD_Version__ < 599001100 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 
< 1070
  static size_t strnlen (const char *s, size_t maxlen)
  {
        size_t i;


From: "David H. Gutteridge" <dhgutteridge%sympatico.ca@localhost>, Date: Wed, 
25 Jun 2014 01:05:00 +0000 (UTC)

> The following reply was made to PR pkg/48934; it has been noted by GNATS.
> 
> From: "David H. Gutteridge" <dhgutteridge%sympatico.ca@localhost>
> To: gnats-bugs%NetBSD.org@localhost
> Cc: 
> Subject: Re: pkg/48934: broken devel/libvolume_id under NetBSD 5.2
> Date: Tue, 24 Jun 2014 20:00:01 -0400
> 
>  On 2014-06-24, at 11:15 AM, Ryo ONODERA wrote:
>  > Hi,
>  > 
>  > I feel that defining __POSIX_VISIBLE=200809 for OpenBSD is sufficient.
>  > I will commit following patch.
>  > 
>  > With this patch, hal under NetBSD/i386 5.2.2 is built successfully,
>  > and libvolume_id under OpenBSD/amd64 5.5 is built too.
>  > sysutils/hal is the only consumer of libvolume_id, and I cannot
>  > confirm functionality of libvolume_id under OpenBSD.
>  
>  That looks totally reasonable to me. OpenBSD releases without
>  strnlen(3) are at least three years old, and so EOL and not something
>  I'd worry about. (I can't test on OpenBSD either, as I don't use it.)
>  
>  Thanks,
>  
>  Dave
>  

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3