Update libmsn to 4.1

Changes unknown.

4 files changed, 18 insertions, 18 deletions

diff --git a/chat/libmsn/Makefile b/chat/libmsn/Makefile
index fe31d4dc07c..44ceb47195d 100644
--- a/chat/libmsn/Makefile
+++ b/chat/libmsn/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/10 00:11:49 markd Exp $
 
-DISTNAME=	libmsn-4.0-beta2
-PKGNAME=	${DISTNAME:S/-beta/beta/}
-PKGREVISION=	1
+DISTNAME=	libmsn-4.1
 CATEGORIES=	chat
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=libmsn/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/libmsn
 COMMENT=	library for connecting to Microsoft's MSN Messenger service
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/chat/libmsn/PLIST b/chat/libmsn/PLIST
index 43fe542b172..5bcdd89d4fb 100644
--- a/chat/libmsn/PLIST
+++ b/chat/libmsn/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:37:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/04/10 00:11:49 markd Exp $
 bin/msntest
 include/msn/authdata.h
 include/msn/buddy.h
+include/msn/config.h
 include/msn/connection.h
 include/msn/errorcodes.h
 include/msn/externals.h
@@ -17,6 +18,6 @@ include/msn/sstream_fix.h
 include/msn/switchboardserver.h
 include/msn/util.h
 lib/libmsn.so
-lib/libmsn.so.0.1
-lib/libmsn.so.0.1.0
+lib/libmsn.so.0.3
+lib/libmsn.so.0.3.0
 lib/pkgconfig/libmsn.pc
diff --git a/chat/libmsn/distinfo b/chat/libmsn/distinfo
index ff645fdb856..c6b4b9c6eb6 100644
--- a/chat/libmsn/distinfo
+++ b/chat/libmsn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/03/11 21:18:35 hasso Exp $
+$NetBSD: distinfo,v 1.3 2010/04/10 00:11:49 markd Exp $
 
-SHA1 (libmsn-4.0-beta2.tar.bz2) = 8ced56c64c6132b5525d8c19e5a43bab08bca2f4
-RMD160 (libmsn-4.0-beta2.tar.bz2) = 8a4f6faa3f22e87b4807c688b11051ca0c7d84c1
-Size (libmsn-4.0-beta2.tar.bz2) = 155319 bytes
-SHA1 (patch-aa) = 25b9d7f0018bd20ec664c62981aa2b51edfeebae
+SHA1 (libmsn-4.1.tar.bz2) = 94b3a9fcba491987a2fc79d30cd19a184c763526
+RMD160 (libmsn-4.1.tar.bz2) = bf3eaa30e3d0f715bdcf5cbf2030f80590972745
+Size (libmsn-4.1.tar.bz2) = 289614 bytes
+SHA1 (patch-aa) = cafa247e2c3389afb1db5e7e296b51f8b5621d18
 SHA1 (patch-ab) = ef8cb8597f30f427d84d3fa6d23688e79f978514
diff --git a/chat/libmsn/patches/patch-aa b/chat/libmsn/patches/patch-aa
index 121b9e87c85..226bbfb72ac 100644
--- a/chat/libmsn/patches/patch-aa
+++ b/chat/libmsn/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/10 08:56:39 markd Exp $
+$NetBSD: patch-aa,v 1.2 2010/04/10 00:11:49 markd Exp $
 
 update for modern openssl.
 use gettimeofday() rather than ftime() to prime srand().
 
---- msn/util.cpp.orig	2008-11-17 02:27:05.000000000 +1300
+--- msn/util.cpp.orig	2009-07-22 19:57:10.000000000 +0000
 +++ msn/util.cpp
 @@ -29,7 +29,7 @@
  #include <fstream>
@@ -12,9 +12,9 @@ use gettimeofday() rather than ftime() to prime srand().
 -#include <sys/timeb.h>
 +#include <sys/time.h>
  #include "md5.h"
+ #include "libsiren/siren7.h"
  
- #ifdef _WIN32
-@@ -244,15 +244,15 @@ namespace MSN 
+@@ -259,15 +259,15 @@ namespace MSN 
  
          unsigned char workvec[8];
          RAND_bytes(workvec, 8);
@@ -34,7 +34,7 @@ use gettimeofday() rather than ftime() to prime srand().
  
          unsigned char output[72];
          memset(&output,0,72);
-@@ -263,7 +263,7 @@ namespace MSN 
+@@ -278,7 +278,7 @@ namespace MSN 
          // ugly, but I think it is working properly
          std::ostringstream buf_;
          buf_ << nonce << "\x08\x08\x08\x08\x08\x08\x08\x08";
@@ -43,7 +43,7 @@ use gettimeofday() rather than ftime() to prime srand().
  
          MSGUSRKEY.uStructHeaderSize=28;
          MSGUSRKEY.uCryptMode=1;
-@@ -352,10 +352,10 @@ namespace MSN 
+@@ -367,10 +367,10 @@ namespace MSN 
  
      std::string new_branch()
      {