CVS commit: pkgsrc/security/gnupg21

["Hans Rosenfeld" <hans%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hans
Date:           Fri Dec 16 16:21:54 UTC 2016

Modified Files:
        pkgsrc/security/gnupg21: Makefile distinfo
Added Files:
        pkgsrc/security/gnupg21/patches: patch-g13_sh-dmcrypt.c

Log Message:
Make this build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/gnupg21/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/gnupg21/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gnupg21/patches/patch-g13_sh-dmcrypt.c

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

Modified files:

Index: pkgsrc/security/gnupg21/Makefile
diff -u pkgsrc/security/gnupg21/Makefile:1.24 pkgsrc/security/gnupg21/Makefile:1.25
--- pkgsrc/security/gnupg21/Makefile:1.24       Sun Dec  4 05:17:40 2016
+++ pkgsrc/security/gnupg21/Makefile    Fri Dec 16 16:21:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/12/04 05:17:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2016/12/16 16:21:54 hans Exp $
 
 DISTNAME=      gnupg-2.1.14
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg21-/}
@@ -30,6 +30,7 @@ TEST_TARGET=          check
 CONFIGURE_ARGS.SunOS+= ac_cv_func_getaddrinfo=yes
 
 LDFLAGS.Darwin+=       -lresolv
+LDFLAGS.SunOS+=                -lsocket
 
 .include "options.mk"
 

Index: pkgsrc/security/gnupg21/distinfo
diff -u pkgsrc/security/gnupg21/distinfo:1.11 pkgsrc/security/gnupg21/distinfo:1.12
--- pkgsrc/security/gnupg21/distinfo:1.11       Sat Aug 20 16:18:03 2016
+++ pkgsrc/security/gnupg21/distinfo    Fri Dec 16 16:21:54 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/08/20 16:18:03 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/12/16 16:21:54 hans Exp $
 
 SHA1 (gnupg-2.1.14.tar.bz2) = bc7609a3a0daf0ed0efb22f77b43e82f28e20e34
 RMD160 (gnupg-2.1.14.tar.bz2) = 22d1f1791133f48ab71e900617ad7fd13c8a4e0f
@@ -6,5 +6,6 @@ SHA512 (gnupg-2.1.14.tar.bz2) = 9f098bf5
 Size (gnupg-2.1.14.tar.bz2) = 5706058 bytes
 SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
 SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
+SHA1 (patch-g13_sh-dmcrypt.c) = a2505039fff9e1e90ab81076776542fa83f55d5e
 SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
 SHA1 (patch-tests_gpgscm_Makefile.in) = 1418ab0a3a93ae69b49db5198aa68fd3dd369548

Added files:

Index: pkgsrc/security/gnupg21/patches/patch-g13_sh-dmcrypt.c
diff -u /dev/null pkgsrc/security/gnupg21/patches/patch-g13_sh-dmcrypt.c:1.1
--- /dev/null   Fri Dec 16 16:21:54 2016
+++ pkgsrc/security/gnupg21/patches/patch-g13_sh-dmcrypt.c      Fri Dec 16 16:21:54 2016
@@ -0,0 +1,14 @@
+$NetBSD: patch-g13_sh-dmcrypt.c,v 1.1 2016/12/16 16:21:54 hans Exp $
+
+--- g13/sh-dmcrypt.c.orig      2016-05-04 11:43:16.000000000 +0200
++++ g13/sh-dmcrypt.c   2016-07-26 11:24:35.449662123 +0200
+@@ -25,6 +25,9 @@
+ #include <errno.h>
+ #include <assert.h>
+ #include <sys/types.h>
++#ifdef __sun
++#include <sys/mkdev.h>
++#endif
+ #ifdef HAVE_STAT
+ # include <sys/stat.h>
+ #endif