From f8b4c7552bd2d08a95ae1440dfb4272366bf8a33 Mon Sep 17 00:00:00 2001
From: marino <marino@pkgsrc.org>
Date: Tue, 9 Oct 2012 15:47:41 +0000
Subject: chat/libmsn: Fix build on gcc 4.7.2

Add <unistd.h> to solve "unlink not declared in scope" error in gcc47.
---
 chat/libmsn/distinfo         |  4 ++--
 chat/libmsn/patches/patch-aa | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'chat')

diff --git a/chat/libmsn/distinfo b/chat/libmsn/distinfo
index c6b4b9c6eb6..0f966dd8bde 100644
--- a/chat/libmsn/distinfo
+++ b/chat/libmsn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/04/10 00:11:49 markd Exp $
+$NetBSD: distinfo,v 1.4 2012/10/09 15:47:41 marino Exp $
 
 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-aa) = c3db64acde455ea658e7e0afc58896d5b362f483
 SHA1 (patch-ab) = ef8cb8597f30f427d84d3fa6d23688e79f978514
diff --git a/chat/libmsn/patches/patch-aa b/chat/libmsn/patches/patch-aa
index 226bbfb72ac..f22c7e88094 100644
--- a/chat/libmsn/patches/patch-aa
+++ b/chat/libmsn/patches/patch-aa
@@ -1,20 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2010/04/10 00:11:49 markd Exp $
+$NetBSD: patch-aa,v 1.3 2012/10/09 15:47:41 marino Exp $
 
 update for modern openssl.
 use gettimeofday() rather than ftime() to prime srand().
+Fix "unlink" out of scope error on gcc4.7
 
 --- msn/util.cpp.orig	2009-07-22 19:57:10.000000000 +0000
 +++ msn/util.cpp
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,8 @@
  #include <fstream>
  #include <openssl/rand.h>
  #include <cstring>
 -#include <sys/timeb.h>
++#include <unistd.h>
 +#include <sys/time.h>
  #include "md5.h"
  #include "libsiren/siren7.h"
  
-@@ -259,15 +259,15 @@ namespace MSN 
+@@ -259,15 +260,15 @@ namespace MSN
  
          unsigned char workvec[8];
          RAND_bytes(workvec, 8);
@@ -34,7 +36,7 @@ use gettimeofday() rather than ftime() to prime srand().
  
          unsigned char output[72];
          memset(&output,0,72);
-@@ -278,7 +278,7 @@ namespace MSN 
+@@ -278,7 +279,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 +45,7 @@ use gettimeofday() rather than ftime() to prime srand().
  
          MSGUSRKEY.uStructHeaderSize=28;
          MSGUSRKEY.uCryptMode=1;
-@@ -367,10 +367,10 @@ namespace MSN 
+@@ -367,10 +368,10 @@ namespace MSN
  
      std::string new_branch()
      {
-- 
cgit v1.2.3