summaryrefslogtreecommitdiffstats
path: root/chat-libs
diff options
context:
space:
mode:
authorJulien ROZO2012-04-20 13:58:54 +0200
committerJulien ROZO2012-04-20 13:58:54 +0200
commit16f421a1c0388866710019ada7d79d3a06698a1e (patch)
treec71b3e404e0a1aba5f59b7df10eaac879c490120 /chat-libs
parent6d56ad6b24a346bff86383463cbdb05ff83eacc8 (diff)
libmsn: updated version to 4.2.1
removed openssl and header for kdenetwork4 patches, included upstream
Diffstat (limited to 'chat-libs')
-rwxr-xr-xchat-libs/libmsn/DETAILS6
-rw-r--r--chat-libs/libmsn/HISTORY5
-rwxr-xr-xchat-libs/libmsn/PRE_BUILD9
-rw-r--r--chat-libs/libmsn/fix-header.patch12
-rw-r--r--chat-libs/libmsn/openssl-1.0.0.patch12
5 files changed, 8 insertions, 36 deletions
diff --git a/chat-libs/libmsn/DETAILS b/chat-libs/libmsn/DETAILS
index c9ab8c8db1..139aad0127 100755
--- a/chat-libs/libmsn/DETAILS
+++ b/chat-libs/libmsn/DETAILS
@@ -1,7 +1,7 @@
SPELL=libmsn
- VERSION=4.2
- PATCHLEVEL=1
- SOURCE_HASH=sha512:8bdb25c08f36e0f3b10d190cdef703fecba419fcd5e4cd9d56c94ddff2e5f21b033204511b15d091302aa8ef41f7dff46996d2497f98570c0fc337427a7084d0
+ VERSION=4.2.1
+ PATCHLEVEL=0
+ SOURCE_HASH=sha512:e657f6c18ee608c6b3c028896544fc61d54e5f7dd0abe670d1e1b218c7210933c57086466f86d667d42d26358b6ad579a13a7a108882e9c5d7768fb97fd83ce6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 184d221b2c..563b9a18cb 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,8 @@
+2012-04-20 Julien "_kaze_" ROZO <julien@rozo.org>
+ * DETAILS: updated version to 4.2.1
+ * PRE_BUILD, fix-header.patch, openssl-1.0.0.patch: removed patches,
+ included upstream
+
2011-11-23 Bor Kraljič <pyrobor@ver.si>
* fix-header.patch: added patch (fixes compile of kdenetwork4)
patch was taken from Arch Linux
diff --git a/chat-libs/libmsn/PRE_BUILD b/chat-libs/libmsn/PRE_BUILD
deleted file mode 100755
index 1f1604466f..0000000000
--- a/chat-libs/libmsn/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Only apply with OpenSSL 1.0.0+
-if [[ "$(installed_version openssl|sed 's:[a-z]::g'|sed 's:\.::g'|sed 's:^0::')" -ge "100" ]]; then
- message "${MESSAGE_COLOR}Applying OpenSSL 1.0.0+ patch...${DEFAULT_COLOR}" &&
- patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
-fi &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-header.patch
diff --git a/chat-libs/libmsn/fix-header.patch b/chat-libs/libmsn/fix-header.patch
deleted file mode 100644
index 82fae6fc44..0000000000
--- a/chat-libs/libmsn/fix-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libmsn-4.2/msn/CMakeLists.txt.xmlParser_h libmsn-4.2/msn/CMakeLists.txt
---- libmsn-4.2/msn/CMakeLists.txt.xmlParser_h 2010-01-05 06:07:08.000000000 -0600
-+++ libmsn-4.2/msn/CMakeLists.txt 2011-11-18 17:00:37.758298054 -0600
-@@ -37,7 +37,7 @@ set(msn_HEADERS
- buddy.h
- passport.h
- sstream_fix.h
-- soap.h
-+ soap.h xmlParser.h
- p2p.h
- msnobject.h
- libmsn_export.h)
diff --git a/chat-libs/libmsn/openssl-1.0.0.patch b/chat-libs/libmsn/openssl-1.0.0.patch
deleted file mode 100644
index 73d7ba9f34..0000000000
--- a/chat-libs/libmsn/openssl-1.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libmsn-4.1.orig/msntest/msntest.cpp libmsn-4.1/msntest/msntest.cpp
---- libmsn-4.1.orig/msntest/msntest.cpp 2010-01-05 13:07:08.000000000 +0100
-+++ libmsn-4.1/msntest/msntest.cpp 2010-12-29 10:37:11.000000000 +0100
-@@ -259,7 +259,7 @@
- if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
- {
- BIO *bio_socket_new;
-- SSL_METHOD *meth=NULL;
-+ const SSL_METHOD *meth=NULL;
- meth=SSLv23_client_method();
- SSLeay_add_ssl_algorithms();
- mySocketsSsl[i].ctx = SSL_CTX_new(meth);