[packages/libmsn] - up to 4.2.1

[arekm]

commit 44360aef34b0f335f386b984375e1be5697769e0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Sep 18 14:28:48 2018 +0200

    - up to 4.2.1

 libmsn.spec   |  4 +++-
 openssl.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/libmsn.spec b/libmsn.spec
index 0538f33..e01e4c9 100644
--- a/libmsn.spec
+++ b/libmsn.spec
@@ -2,12 +2,13 @@ Summary:	MSN Library
 Summary(pl.UTF-8):	Biblioteka MSN
 Name:		libmsn
 Version:	4.2.1
-Release:	5
+Release:	6
 License:	GPL
 Group:		Libraries
 Source0:	http://download.sourceforge.net/libmsn/%{name}-%{version}.tar.bz2
 # Source0-md5:	38e46e589720eefd71f92b6b76993bf0
 Patch0:		c++.patch
+Patch1:		openssl.patch
 URL:		http://sourceforge.net/projects/libmsn/
 BuildRequires:	cmake
 BuildRequires:	libstdc++-devel
@@ -37,6 +38,7 @@ Pliki nagłówkowe biblioteki MSN.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..79dde19
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,33 @@
+diff -ur libmsn-4.2.1/msn.org/util.cpp libmsn-4.2.1/msn/util.cpp
+--- libmsn-4.2.1/msn.org/util.cpp	2018-09-18 14:23:13.661891159 +0200
++++ libmsn-4.2.1/msn/util.cpp	2018-09-18 14:27:19.535811491 +0200
+@@ -260,15 +260,15 @@
+ 
+         unsigned char workvec[8];
+         RAND_bytes(workvec, 8);
+-        des_key_schedule ks1,ks2,ks3;
++        DES_key_schedule ks1,ks2,ks3;
+ 
+         const char *one=key3.c_str();
+         const char *two=key3.c_str()+8;
+         const char *three=key3.c_str()+16;
+ 
+-        des_set_key((C_Block *)one,ks1);
+-        des_set_key((C_Block *)two,ks2);
+-        des_set_key((C_Block *)three,ks3);
++        DES_set_key((DES_cblock *)one,&ks1);
++        DES_set_key((DES_cblock *)two,&ks2);
++        DES_set_key((DES_cblock *)three,&ks3);
+ 
+         unsigned char output[72];
+         memset(&output,0,72);
+@@ -279,7 +279,7 @@
+         // ugly, but I think it is working properly
+         std::ostringstream buf_;
+         buf_ << nonce << "\x08\x08\x08\x08\x08\x08\x08\x08";
+-        DES_ede3_cbc_encrypt((const unsigned char*)buf_.str().c_str(),output,buf_.str().size(),&ks1,&ks2,&ks3,(C_Block *)workvec,DES_ENCRYPT);
++        DES_ede3_cbc_encrypt((const unsigned char*)buf_.str().c_str(),output,buf_.str().size(),&ks1,&ks2,&ks3,(DES_cblock *)workvec,DES_ENCRYPT);
+ 
+         MSGUSRKEY.uStructHeaderSize=28;
+         MSGUSRKEY.uCryptMode=1;
+Only in libmsn-4.2.1/msn: util.cpp~
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmsn.git/commitdiff/44360aef34b0f335f386b984375e1be5697769e0