From 9c9402f0277e15a7d01e0394cd4a506d343ccc26 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 22 Feb 2005 18:22:17 +0000
Subject: Update to 2.2.2:

* The SSL validation fix from 2.2.1 [64414] is now completely fixed. (Part
  of the fix didn't actually make it into 2.2.1)
* HTTPS certificate validation now works when using an HTTP proxy. [68583]
* HTTP proxy code deals better with proxies that try to make the user do
  HTML-form-based authentication. [68531]
* 64-bit fixes for NTLM auth code. [70323, from Michael Zucchi]
---
 net/libsoup-devel/Makefile         |  4 ++--
 net/libsoup-devel/distinfo         |  8 ++++----
 net/libsoup-devel/patches/patch-aa | 12 +++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'net')

diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile
index 5d3b8a78bb7..1014b1c4674 100644
--- a/net/libsoup-devel/Makefile
+++ b/net/libsoup-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/10/15 21:22:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/22 18:22:17 jmmv Exp $
 #
 
-DISTNAME=		libsoup-2.2.1
+DISTNAME=		libsoup-2.2.2
 PKGNAME=		${DISTNAME:S/soup/soup-devel/}
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libsoup/2.2/}
diff --git a/net/libsoup-devel/distinfo b/net/libsoup-devel/distinfo
index 0cabd9fec53..ef073a74794 100644
--- a/net/libsoup-devel/distinfo
+++ b/net/libsoup-devel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/19 22:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/02/22 18:22:17 jmmv Exp $
 
-SHA1 (libsoup-2.2.1.tar.bz2) = e2dbe6b8259048192632068a37dd0843d2775ac2
-Size (libsoup-2.2.1.tar.bz2) = 403907 bytes
-SHA1 (patch-aa) = 87de77a96b6f86bd9135f1955f789ff26ea36ff0
+SHA1 (libsoup-2.2.2.tar.bz2) = 421c18e4e64c21f087ea784502935e0bab71aaa0
+Size (libsoup-2.2.2.tar.bz2) = 404013 bytes
+SHA1 (patch-aa) = ea28dabf030dfc36b47360bee0fc5f23926f3fa0
diff --git a/net/libsoup-devel/patches/patch-aa b/net/libsoup-devel/patches/patch-aa
index 0d8e12e55a6..47a359100a0 100644
--- a/net/libsoup-devel/patches/patch-aa
+++ b/net/libsoup-devel/patches/patch-aa
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2005/02/19 22:36:20 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/22 18:22:17 jmmv Exp $
 
---- libsoup/soup-gnutls.c.orig	2004-09-30 16:49:07.000000000 +0200
+--- libsoup/soup-gnutls.c.orig	2004-10-20 18:31:22.000000000 +0200
 +++ libsoup/soup-gnutls.c
-@@ -61,7 +61,6 @@ verify_certificate (gnutls_session sessi
+@@ -63,7 +63,9 @@ verify_certificate (gnutls_session sessi
  	}
  
  	if (status & GNUTLS_CERT_INVALID ||
--	    status & GNUTLS_CERT_NOT_TRUSTED ||
++#if defined(GNUTLS_CERT_NOT_TRUSTED)
+ 	    status & GNUTLS_CERT_NOT_TRUSTED ||
++#endif
  	    status & GNUTLS_CERT_REVOKED)
  	{
- 		g_warning ("The certificate is not trusted.");
+ 		g_set_error (err, SOUP_SSL_ERROR,
-- 
cgit v1.2.3