[arch-commits] Commit in libmsn/trunk (PKGBUILD openssl1.patch)

[Andrea Scarpino]

    Date: Thursday, April 1, 2010 @ 09:10:57
  Author: andrea
Revision: 75410

upgpkg: libmsn 4.1-2
openssl rebuild

Added:
  libmsn/trunk/openssl1.patch
Modified:
  libmsn/trunk/PKGBUILD

----------------+
 PKGBUILD       |   14 +++++++++++---
 openssl1.patch |   17 +++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-04-01 13:03:22 UTC (rev 75409)
+++ PKGBUILD    2010-04-01 13:10:57 UTC (rev 75410)
@@ -4,22 +4,30 @@
 
 pkgname=libmsn
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('769d3cf0e5625263fbc23321c1ddfcb0')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2";
+       'openssl1.patch')
+md5sums=('769d3cf0e5625263fbc23321c1ddfcb0'
+       'c8d7e2113d967a1d38a531e9fe8e7861')
 
 build() {
   cd ${srcdir}
+  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release || return 1
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/build
   make DESTDIR=${pkgdir} install
 }

Added: openssl1.patch
===================================================================
--- openssl1.patch                              (rev 0)
+++ openssl1.patch      2010-04-01 13:10:57 UTC (rev 75410)
@@ -0,0 +1,17 @@
+--- libmsn-4.1/msntest/msntest.cpp~    2010-04-01 15:05:13.248056050 +0200
++++ libmsn-4.1/msntest/msntest.cpp     2010-04-01 15:07:18.938878993 +0200
+@@ -259,7 +259,13 @@
+                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
+                     {
+                         BIO *bio_socket_new;
+-                        SSL_METHOD *meth=NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++                      const SSL_METHOD *meth=NULL;
++#else
++                      SSL_METHOD *meth=NULL;
++#endif
++
+                         meth=SSLv23_client_method();
+                         SSLeay_add_ssl_algorithms();
+                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);