CVS commit: pkgsrc/sysutils/ipmitool

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep  6 09:47:02 UTC 2018

Modified Files:
        pkgsrc/sysutils/ipmitool: Makefile distinfo
Added Files:
        pkgsrc/sysutils/ipmitool/patches: patch-lib_ipmi__main.c

Log Message:
ipmitool: Avoid defines that result in getpass() failures on Darwin.

Inspired by a Homebrew patch, fixes joyent/pkgsrc#79.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/ipmitool/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/ipmitool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ipmitool/Makefile
diff -u pkgsrc/sysutils/ipmitool/Makefile:1.19 pkgsrc/sysutils/ipmitool/Makefile:1.20
--- pkgsrc/sysutils/ipmitool/Makefile:1.19      Fri Dec 22 21:45:23 2017
+++ pkgsrc/sysutils/ipmitool/Makefile   Thu Sep  6 09:47:02 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2017/12/22 21:45:23 markd Exp $
+# $NetBSD: Makefile,v 1.20 2018/09/06 09:47:02 jperkin Exp $
 #
 
 DISTNAME=              ipmitool-1.8.18
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ipmitool/}
 

Index: pkgsrc/sysutils/ipmitool/distinfo
diff -u pkgsrc/sysutils/ipmitool/distinfo:1.10 pkgsrc/sysutils/ipmitool/distinfo:1.11
--- pkgsrc/sysutils/ipmitool/distinfo:1.10      Mon Jan  8 22:37:57 2018
+++ pkgsrc/sysutils/ipmitool/distinfo   Thu Sep  6 09:47:02 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/01/08 22:37:57 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2018/09/06 09:47:02 jperkin Exp $
 
 SHA1 (ipmitool-1.8.18.tar.gz) = b85b7d01a3b8296227505ee0ad078134fc2c81ff
 RMD160 (ipmitool-1.8.18.tar.gz) = d1426f799b76f26aa98357c0c36fa68f3fa3c883
@@ -7,4 +7,5 @@ Size (ipmitool-1.8.18.tar.gz) = 995313 b
 SHA1 (patch-ad) = 4af586b36f1744d263c66ed28aa17a9f9840a415
 SHA1 (patch-ae) = 67828b62b46a30b204dd436681c5ecac39bb29b3
 SHA1 (patch-lib_ipmi__cfgp.c) = 3b16d340fce1bdaee66b15430c25f19f4d38ae08
+SHA1 (patch-lib_ipmi__main.c) = 4d90e86dda16ea0b596573d88833e348c11ffb24
 SHA1 (patch-src_plugins_lanplus_lanplus__crypt__impl.c) = 8aaa1c6328bd6c0559ae9863cad671cdd32ab514

Added files:

Index: pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__main.c
diff -u /dev/null pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__main.c:1.1
--- /dev/null   Thu Sep  6 09:47:02 2018
+++ pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__main.c     Thu Sep  6 09:47:02 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_ipmi__main.c,v 1.1 2018/09/06 09:47:02 jperkin Exp $
+
+Avoid defines that result in getpass() failures on Darwin.
+
+--- lib/ipmi_main.c.orig       2016-07-31 06:56:33.000000000 +0000
++++ lib/ipmi_main.c
+@@ -29,11 +29,13 @@
+  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  */
++#if !defined(__APPLE__)
+ #define _XOPEN_SOURCE 700
+ #define _BSD_SOURCE || \
+       (_XOPEN_SOURCE >= 500 || \
+       _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \
+       !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>