From 012c4b7f27441c85d7f9c46a619a3b356c94cab7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 12 Aug 2012 00:04:05 +0000
Subject: Sun Aug 12 00:04:05 UTC 2012

---
 community/wvstreams/PKGBUILD                    | 14 ++++++++++----
 community/wvstreams/openssl-buildfix.patch      | 14 ++++++++++++++
 community/wvstreams/wvstreams-4.6.1-gcc47.patch | 10 ++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 community/wvstreams/openssl-buildfix.patch
 create mode 100644 community/wvstreams/wvstreams-4.6.1-gcc47.patch

(limited to 'community/wvstreams')

diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index fb668c1d2..9b68ab184 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 59490 2011-11-26 18:58:32Z bluewind $
+# $Id: PKGBUILD 74964 2012-08-10 12:12:57Z bluewind $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=wvstreams
 pkgver=4.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A network programming library written in C++"
 arch=('i686' 'x86_64')
 url="http://alumnit.ca/wiki/?page=WvStreams"
 license=('LGPL')
 depends=('zlib' 'pam' 'xplc' 'openssl' 'readline')
 source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz 
-wvstreams-4.6.1-glibc212.patch)
+wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch openssl-buildfix.patch)
 md5sums=('2760dac31a43d452a19a3147bfde571c'
-         '5f6e24864209055239cb4e7c9bbd4a41')
+         '5f6e24864209055239cb4e7c9bbd4a41'
+         '918be13d35205385a39077403ce36388'
+         'df423c68134a09439b3961c34635e0b4')
 options=('!makeflags')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
   patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
+  patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
+  patch -p1 -i "$srcdir/openssl-buildfix.patch"
+
   ./configure --prefix=/usr \
      --sysconfdir=/etc \
      --localstatedir=/var \
diff --git a/community/wvstreams/openssl-buildfix.patch b/community/wvstreams/openssl-buildfix.patch
new file mode 100644
index 000000000..1b0445d9e
--- /dev/null
+++ b/community/wvstreams/openssl-buildfix.patch
@@ -0,0 +1,14 @@
+--- wvstreams-4.6.1/crypto/wvx509.cc    2008-10-23 22:23:49.000000000 +0200
++++ wvstreams-4.6.1-1/crypto/wvx509.cc  2010-01-27 11:09:06.000000000 +0100
+@@ -1157,7 +1157,11 @@
+
+         if (ext)
+         {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++            const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#else
+             X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#endif
+             if (!method)
+             {
+                 WvDynBuf buf;
\ No newline at end of file
diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch
new file mode 100644
index 000000000..3d6704832
--- /dev/null
+++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch
@@ -0,0 +1,10 @@
+--- wvstreams-4.6.1-dist/include/wvuid.h	2012-01-05 10:18:58.713661236 +0100
++++ wvstreams-4.6.1/include/wvuid.h	2012-01-05 10:27:42.198435328 +0100
+@@ -7,6 +7,7 @@
+ #ifndef __WVUID_H
+ #define __WVUID_H
+ 
++#include <unistd.h>
+ #include "wvstring.h"
+ 
+ #if WIN32
-- 
cgit v1.2.3-54-g00ecf