CVS commit: pkgsrc/sysutils/qpasswd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Dec 17 16:32:19 UTC 2018

Modified Files:
        pkgsrc/sysutils/qpasswd: distinfo
        pkgsrc/sysutils/qpasswd/patches: patch-qpasswd.h

Log Message:
Handle _XOPEN_SOURCE on SunOS. Should fix SmartOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/qpasswd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h

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

Modified files:

Index: pkgsrc/sysutils/qpasswd/distinfo
diff -u pkgsrc/sysutils/qpasswd/distinfo:1.1 pkgsrc/sysutils/qpasswd/distinfo:1.2
--- pkgsrc/sysutils/qpasswd/distinfo:1.1        Sun Aug  5 15:00:46 2018
+++ pkgsrc/sysutils/qpasswd/distinfo    Mon Dec 17 16:32:18 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2018/08/05 15:00:46 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2018/12/17 16:32:18 schmonz Exp $
 
 SHA1 (qpasswd-0.5.tar.bz2) = 72cb41406cf1c3542fc70aefbbde74e7c3dd4cf5
 RMD160 (qpasswd-0.5.tar.bz2) = 0b596c1c487bd9d7c45d2710687f17e2b509a64d
@@ -6,4 +6,4 @@ SHA512 (qpasswd-0.5.tar.bz2) = 3ff454b19
 Size (qpasswd-0.5.tar.bz2) = 71473 bytes
 SHA1 (patch-Makefile) = c0da81b6a27bc75c43e04bd88c7555ac67352ac9
 SHA1 (patch-params.h) = 5836dc6d86b64efb54f23a8ea5558b3d00bb84ce
-SHA1 (patch-qpasswd.h) = 1d63eb7f55022d1c6f8dea665c5472346c992157
+SHA1 (patch-qpasswd.h) = 44e95989e51bec9620e587a27613ad6728af89e0

Index: pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h
diff -u pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h:1.1 pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h:1.2
--- pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h:1.1 Sun Aug  5 15:00:46 2018
+++ pkgsrc/sysutils/qpasswd/patches/patch-qpasswd.h     Mon Dec 17 16:32:19 2018
@@ -1,10 +1,25 @@
-$NetBSD: patch-qpasswd.h,v 1.1 2018/08/05 15:00:46 schmonz Exp $
+$NetBSD: patch-qpasswd.h,v 1.2 2018/12/17 16:32:19 schmonz Exp $
 
-Avoid Linuxisms.
+Avoid Linuxisms. Handle _XOPEN_SOURCE on SunOS.
 
 --- qpasswd.h.orig     2004-01-13 16:10:18.000000000 +0000
 +++ qpasswd.h
-@@ -8,14 +8,13 @@
+@@ -1,21 +1,28 @@
+ #ifndef QP_QPASSWD_H
+ #define QP_QPASSWD_H
+ 
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
++#else
+ #define _XOPEN_SOURCE  /* needed for crypt(3) */
++#endif
+ #define _BSD_SOURCE    /* needed by initgroups(3) + fchdir(2) */
+ 
+ #include <sys/types.h>
  #include <sys/time.h>
  #include <sys/stat.h>
  #include <sys/mman.h>