svn commit: r366532 - head/net-mgmt/send/files

[Hiroki Sato]

Author: hrs
Date: Fri Aug 29 16:56:34 2014
New Revision: 366532
URL: http://svnweb.freebsd.org/changeset/ports/366532
QAT: https://qat.redports.org/buildarchive/r366532/

Log:
  Fix build on branches with OpenSSL 0.9.8.

Modified:
  head/net-mgmt/send/files/patch-include-cga_keyutils.h
  head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h

Modified: head/net-mgmt/send/files/patch-include-cga_keyutils.h
==============================================================================
--- head/net-mgmt/send/files/patch-include-cga_keyutils.h	Fri Aug 29 16:51:53 2014	(r366531)
+++ head/net-mgmt/send/files/patch-include-cga_keyutils.h	Fri Aug 29 16:56:34 2014	(r366532)
@@ -1,10 +1,10 @@
---- include/cga_keyutils.h.orig	2014-08-20 04:17:35.000000000 +0900
-+++ include/cga_keyutils.h	2014-08-20 04:17:58.000000000 +0900
+--- include/cga_keyutils.h.orig	2010-08-28 17:58:02.000000000 +0900
++++ include/cga_keyutils.h	2014-08-30 01:53:41.000000000 +0900
 @@ -36,6 +36,9 @@
  #include <openssl/x509.h>
  #include <openssl/evp.h>
  #include <openssl/stack.h>
-+#ifndef STACK
++#if OPENSSL_VERSION_NUMBER >= 0x0090900fL
 +#define	STACK _STACK
 +#endif
  #include <cga.h>

Modified: head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h
==============================================================================
--- head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h	Fri Aug 29 16:51:53 2014	(r366531)
+++ head/net-mgmt/send/files/patch-include-pkixip_ext_asn.h	Fri Aug 29 16:56:34 2014	(r366532)
@@ -1,11 +1,11 @@
---- include/pkixip_ext_asn.h.orig	2014-08-20 04:16:53.000000000 +0900
-+++ include/pkixip_ext_asn.h	2014-08-20 04:17:09.000000000 +0900
+--- include/pkixip_ext_asn.h.orig	2010-08-28 17:58:02.000000000 +0900
++++ include/pkixip_ext_asn.h	2014-08-30 01:54:23.000000000 +0900
 @@ -33,6 +33,10 @@
  #ifndef	_PKIXIP_EXT_ASN_H
  #define	_PKIXIP_EXT_ASN_H
  
 +#include <openssl/stack.h>
-+#ifndef STACK
++#if OPENSSL_VERSION_NUMBER >= 0x0090900fL
 +#define	STACK	_STACK
 +#endif
  #include <openssl/asn1t.h>