From 3a289f68bfbc4fa3d03a4c75750a7cd7eab7f412 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 30 Oct 2009 19:32:11 +0000
Subject: Update to xmlsec1-1.2.13 to fix build breakage with current OpenSSL.
 Changes: mostly bugfixes

---
 security/xmlsec1/Makefile         |  5 ++---
 security/xmlsec1/PLIST            |  3 ++-
 security/xmlsec1/distinfo         | 11 +++++------
 security/xmlsec1/patches/patch-aa | 16 ----------------
 security/xmlsec1/patches/patch-ab | 17 +++++++++++++----
 5 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 security/xmlsec1/patches/patch-aa

(limited to 'security')

diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 151b86841aa..b8a5c51ce5f 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:12 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/10/30 19:32:11 tnn Exp $
 #
 
-DISTNAME=		xmlsec1-1.2.6
-PKGREVISION=		6
+DISTNAME=		xmlsec1-1.2.13
 CATEGORIES=		security
 MASTER_SITES=		http://www.aleksey.com/xmlsec/download/
 
diff --git a/security/xmlsec1/PLIST b/security/xmlsec1/PLIST
index 7ec6b01e7e1..6fa381f1eba 100644
--- a/security/xmlsec1/PLIST
+++ b/security/xmlsec1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/10/30 19:32:11 tnn Exp $
 bin/xmlsec1
 bin/xmlsec1-config
 include/xmlsec1/xmlsec/app.h
@@ -44,6 +44,7 @@ lib/pkgconfig/xmlsec1.pc
 lib/xmlsec1Conf.sh
 man/man1/xmlsec1-config.1
 man/man1/xmlsec1.1
+share/aclocal/xmlsec1.m4
 share/doc/xmlsec1/api/home.png
 share/doc/xmlsec1/api/images/encryption-structure.png
 share/doc/xmlsec1/api/images/key.png
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index b95499ed266..c1330c66944 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/14 02:26:39 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/10/30 19:32:11 tnn Exp $
 
-SHA1 (xmlsec1-1.2.6.tar.gz) = de5b7a70825d96ee9ee7e1aa43194df8412cf72d
-RMD160 (xmlsec1-1.2.6.tar.gz) = bdc7692be5c4f4c27c177fe5271b13382a44d452
-Size (xmlsec1-1.2.6.tar.gz) = 1595648 bytes
-SHA1 (patch-aa) = 1718c051201bf7803057b2a8ad7b004f90e35147
-SHA1 (patch-ab) = c44049b2592b03823dbbebc70ee5cb4a58adb646
+SHA1 (xmlsec1-1.2.13.tar.gz) = 7953be1ba966fe7ca379839631299bd6963c418f
+RMD160 (xmlsec1-1.2.13.tar.gz) = 4743dbf406cc63db60ececb3257967398a1416a6
+Size (xmlsec1-1.2.13.tar.gz) = 1576354 bytes
+SHA1 (patch-ab) = 34856f6c7d810f9bd51b871ccb870b28f05b1fd8
 SHA1 (patch-ac) = 550f37db0db36ce5fa88c6c0d0acd6725aa69470
diff --git a/security/xmlsec1/patches/patch-aa b/security/xmlsec1/patches/patch-aa
deleted file mode 100644
index c923da34c62..00000000000
--- a/security/xmlsec1/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/01/05 19:00:11 joerg Exp $
-
---- src/openssl/x509vfy.c.orig	2006-01-02 13:44:25.000000000 +0000
-+++ src/openssl/x509vfy.c
-@@ -499,7 +499,11 @@ xmlSecOpenSSLX509StoreInitialize(xmlSecK
- 	}    
- 	X509_LOOKUP_add_dir(lookup, (char*)path, X509_FILETYPE_DEFAULT);
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x00908000L
-     ctx->xst->depth = 9; /* the default cert verification path in openssl */	
-+#else
-+    X509_STORE_set_depth(ctx->xst, 9);
-+#endif
- 	
-     ctx->untrusted = sk_X509_new_null();
-     if(ctx->untrusted == NULL) {
diff --git a/security/xmlsec1/patches/patch-ab b/security/xmlsec1/patches/patch-ab
index e1d76ae21eb..a13e5751a8f 100644
--- a/security/xmlsec1/patches/patch-ab
+++ b/security/xmlsec1/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2006/10/14 02:26:39 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2009/10/30 19:32:11 tnn Exp $
 
---- configure.orig	2004-08-26 08:00:34.000000000 +0200
-+++ configure	2006-10-14 04:22:49.000000000 +0200
-@@ -25371,7 +25371,7 @@ fi
+--- configure.orig	2009-09-12 22:09:00.000000000 +0200
++++ configure
+@@ -23233,7 +23233,7 @@ else
+ fi
+ 
+ 
+-if test "z$shrext" == "z" ; then
++if test "z$shrext" = "z" ; then
+     shrext=$shrext_cmds
+ fi
+ 
+@@ -24720,7 +24720,7 @@ fi
  
  
  
-- 
cgit v1.2.3