[Midnightbsd-cvs] mports [22283] trunk/finance/openhbci: fixup build on amd64 current

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Feb 19 11:20:23 EST 2017


Revision: 22283
          http://svnweb.midnightbsd.org/mports/?rev=22283
Author:   laffer1
Date:     2017-02-19 11:20:23 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
fixup build on amd64 current

Modified Paths:
--------------
    trunk/finance/openhbci/Makefile
    trunk/finance/openhbci/pkg-plist

Added Paths:
-----------
    trunk/finance/openhbci/files/patch-src_openhbci_core_bank.cpp
    trunk/finance/openhbci/files/patch-src_openhbci_core_bank.h
    trunk/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp

Modified: trunk/finance/openhbci/Makefile
===================================================================
--- trunk/finance/openhbci/Makefile	2017-02-19 16:16:48 UTC (rev 22282)
+++ trunk/finance/openhbci/Makefile	2017-02-19 16:20:23 UTC (rev 22283)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openhbci
 PORTVERSION=	0.9.17.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance
 MASTER_SITES= 	SF/${PORTNAME}/${PORTNAME}/0.9.17
 DISTNAME=	openhbci-0.9.17-2
@@ -13,9 +13,12 @@
 LICENSE=	lgpl
 
 USES=		libtool
+USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS+=--with-openssl-includes=${OPENSSLINC} \
+		--with-openssl-libs=${OPENSSLLIB}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.9.17
 

Added: trunk/finance/openhbci/files/patch-src_openhbci_core_bank.cpp
===================================================================
--- trunk/finance/openhbci/files/patch-src_openhbci_core_bank.cpp	                        (rev 0)
+++ trunk/finance/openhbci/files/patch-src_openhbci_core_bank.cpp	2017-02-19 16:20:23 UTC (rev 22283)
@@ -0,0 +1,11 @@
+--- src/openhbci/core/bank.cpp.orig	2003-04-25 01:45:54 UTC
++++ src/openhbci/core/bank.cpp
+@@ -39,7 +39,7 @@ instituteMessage::instituteMessage()
+ instituteMessage::~instituteMessage(){
+ }
+ 
+-const bool instituteMessage::operator==(const instituteMessage &msg) {
++bool instituteMessage::operator==(const instituteMessage &msg) const {
+     return (_date == msg._date &&
+ 			0 == _time.compare(msg._time) &&
+ 			_subject == msg._subject &&


Property changes on: trunk/finance/openhbci/files/patch-src_openhbci_core_bank.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/finance/openhbci/files/patch-src_openhbci_core_bank.h
===================================================================
--- trunk/finance/openhbci/files/patch-src_openhbci_core_bank.h	                        (rev 0)
+++ trunk/finance/openhbci/files/patch-src_openhbci_core_bank.h	2017-02-19 16:20:23 UTC (rev 22283)
@@ -0,0 +1,11 @@
+--- src/openhbci/core/bank.h.orig	2003-06-13 21:50:00 UTC
++++ src/openhbci/core/bank.h
+@@ -97,7 +97,7 @@ public:
+     instituteMessage();
+     ~instituteMessage();
+ 
+-	const bool operator==(const instituteMessage &msg);
++    bool operator==(const instituteMessage &msg) const;
+ 
+     /** Returns the Date of arrival. */
+     const Date &date() const { return _date;};


Property changes on: trunk/finance/openhbci/files/patch-src_openhbci_core_bank.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp
===================================================================
--- trunk/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp	                        (rev 0)
+++ trunk/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp	2017-02-19 16:20:23 UTC (rev 22283)
@@ -0,0 +1,80 @@
+--- src/openhbci/core/deskey.cpp.orig	2002-12-10 15:54:07 UTC
++++ src/openhbci/core/deskey.cpp
+@@ -42,11 +42,11 @@
+ namespace HBCI {
+ 
+ DESKey::DESKey(string password) {
+-	des_cblock left, right;
++	DES_cblock left, right;
+ 	keyData = "";
+ 	
+ 	// transform password to 2 keys
+-	des_string_to_2keys(password.c_str(), &left, &right);
++	DES_string_to_2keys(password.c_str(), &left, &right);
+ 	
+ 	// set the keydata
+ 	for (int i=0; i<8; i++)
+@@ -64,8 +64,8 @@ DESKey::~DESKey(){
+ 
+ DESKey DESKey::createKey() {
+ 	int result = 1;
+-	des_cblock nativeDESKey;
+-	des_key_schedule key;
++	DES_cblock nativeDESKey;
++	DES_key_schedule key;
+ 
+ 	DESKey *newKey = new DESKey();
+ 	newKey->keyData = "";
+@@ -73,16 +73,16 @@ DESKey DESKey::createKey() {
+  	RAND_seed(getRndData(1024), 1024);
+ 
+ 	while (result != 0) {
+-		des_random_key(&nativeDESKey);
+-		result = des_set_key_checked(&nativeDESKey, key);
++		DES_random_key(&nativeDESKey);
++		result = DES_set_key_checked(&nativeDESKey, &key);
+ 	}
+ 	for (int i=0; i<8; i++)
+ 		newKey->keyData += nativeDESKey[i];
+ 	
+  	result = 1;
+ 	while (result != 0) {
+-		des_random_key(&nativeDESKey);
+-		result = des_set_key_checked(&nativeDESKey, key);
++		DES_random_key(&nativeDESKey);
++		result = DES_set_key_checked(&nativeDESKey, &key);
+ 	}
+ 	for (int i=0; i<8; i++)
+ 		newKey->keyData += nativeDESKey[i];
+@@ -116,24 +116,24 @@ bool DESKey::crypt(int enDeCrypt) {
+ 	//2-key-tripple-des
+ 	//dataToCrypt.length() % 8 has to be 0, padding/ depadding in calling method
+ 	
+-	des_cblock left, right;
++	DES_cblock left, right;
+ 	keyData.copy((char*) &left,8);	
+ 	keyData.copy((char*) &right,8,8);
+ 
+-	des_cblock initVector;
+-	des_key_schedule key1, key2;
++	DES_cblock initVector;
++	DES_key_schedule key1, key2;
+ 	unsigned char source[intData.length()];
+ 	unsigned char dest[intData.length()];
+ 	for (unsigned int i=0; i<intData.length(); i++)
+ 		source[i]=intData[i];
+ 		
+-	des_set_key(&left, key1);
+-	des_set_key(&right, key2);
++	DES_set_key(&left, &key1);
++	DES_set_key(&right, &key2);
+ 	for (int i=0; i<8; i++)
+ 		initVector[i] = 0;	
+ 
+-	des_ede2_cbc_encrypt((unsigned char*) &source, (unsigned char*) &dest, intData.length(),
+-		key1, key2, &initVector, enDeCrypt);
++	DES_ede2_cbc_encrypt((unsigned char*) &source, (unsigned char*) &dest, intData.length(),
++		&key1, &key2, &initVector, enDeCrypt);
+ 
+ 	intData = string((const char*) &dest, intData.length());
+ 	


Property changes on: trunk/finance/openhbci/files/patch-src_openhbci_core_deskey.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/finance/openhbci/pkg-plist
===================================================================
--- trunk/finance/openhbci/pkg-plist	2017-02-19 16:16:48 UTC (rev 22282)
+++ trunk/finance/openhbci/pkg-plist	2017-02-19 16:20:23 UTC (rev 22283)
@@ -30,10 +30,10 @@
 include/openhbci/init_plugins.h
 include/openhbci/interactor.h
 include/openhbci/interactorcb.h
+include/openhbci/job.h
+include/openhbci/libloader.h
 include/openhbci/limit.h
 include/openhbci/listwrappers.h
-include/openhbci/job.h
-include/openhbci/libloader.h
 include/openhbci/loader.h
 include/openhbci/medium.h
 include/openhbci/mediumplugin.h
@@ -42,10 +42,10 @@
 include/openhbci/mediumrdhbase.h
 include/openhbci/messagequeue.h
 include/openhbci/outbox.h
+include/openhbci/outboxaccjobs.h
 include/openhbci/outboxjob.h
+include/openhbci/outboxjobkeys.h
 include/openhbci/outboxjobs.h
-include/openhbci/outboxjobkeys.h
-include/openhbci/outboxaccjobs.h
 include/openhbci/outboxstojobs.h
 include/openhbci/parser.h
 include/openhbci/plugin.h
@@ -67,16 +67,11 @@
 include/openhbci/userparams.h
 include/openhbci/value.h
 lib/libopenhbci.a
-lib/libopenhbci.la
 lib/libopenhbci.so
 lib/libopenhbci.so.14
+lib/libopenhbci.so.14.0.2
+lib/openhbci/plugins/14/media/rdhfile.a
+lib/openhbci/plugins/14/media/rdhfile.so
 lib/openhbci/plugins/14/media/rdhfile.so.0
-lib/openhbci/plugins/14/media/rdhfile.so
-lib/openhbci/plugins/14/media/rdhfile.la
-lib/openhbci/plugins/14/media/rdhfile.a
+lib/openhbci/plugins/14/media/rdhfile.so.0.0.0
 share/aclocal/openhbci.m4
- at dirrm lib/openhbci/plugins/14/media
- at dirrm lib/openhbci/plugins/14
- at dirrm lib/openhbci/plugins
- at dirrm lib/openhbci
- at dirrm include/openhbci



More information about the Midnightbsd-cvs mailing list