From 877c83391dba61a1a04dc037e361aeaaf3ed1968 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Tue, 6 Jan 2004 14:55:43 +0000 Subject: Upgrade to version 1.3.0 --- security/saferpay/Makefile | 2 +- security/saferpay/distinfo | 2 +- security/saferpay/files/patch-IcctSign.cpp | 46 ++++++------------------------ security/saferpay/files/patch-idpapp.mk | 21 +++++--------- security/saferpay/files/patch-idphttp.cpp | 11 ------- security/saferpay/files/patch-saferpay.c | 20 ++++++------- security/saferpay/files/patch-saferpay.mk | 25 +++++++--------- 7 files changed, 37 insertions(+), 90 deletions(-) delete mode 100644 security/saferpay/files/patch-idphttp.cpp (limited to 'security') diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile index 2b713f7b7bee..b583f56da74e 100644 --- a/security/saferpay/Makefile +++ b/security/saferpay/Makefile @@ -6,7 +6,7 @@ # PORTNAME= saferpay -PORTVERSION= 1.2.8 +PORTVERSION= 1.3.0 CATEGORIES= security MASTER_SITES= http://www.saferpay.com/download/ DISTFILES= ${PORTNAME}_${PORTVERSION}_linux-g++_src.tar.gz diff --git a/security/saferpay/distinfo b/security/saferpay/distinfo index 99d7baa96308..03f10e0645d8 100644 --- a/security/saferpay/distinfo +++ b/security/saferpay/distinfo @@ -1 +1 @@ -MD5 (saferpay_1.2.8_linux-g++_src.tar.gz) = 7147967b96ca0fc924074eb5879a8e3a +MD5 (saferpay_1.3.0_linux-g++_src.tar.gz) = f226bc87fa57aa77c3c940454d9f6cf0 diff --git a/security/saferpay/files/patch-IcctSign.cpp b/security/saferpay/files/patch-IcctSign.cpp index 8737cb899f6a..6325a978f2ec 100644 --- a/security/saferpay/files/patch-IcctSign.cpp +++ b/security/saferpay/files/patch-IcctSign.cpp @@ -1,5 +1,5 @@ ---- saferpay/IcctSign.cpp.orig Wed Feb 19 12:17:14 2003 -+++ saferpay/IcctSign.cpp Wed Feb 19 12:19:52 2003 +--- saferpay/IcctSign.cpp.orig Wed Sep 24 15:13:06 2003 ++++ saferpay/IcctSign.cpp Tue Jan 6 15:46:01 2004 @@ -32,7 +32,11 @@ #define RSA_generate_key_S RSA_generate_key #endif @@ -12,7 +12,7 @@ ULONG cbMessage, /*[out]*/ UCHAR* pDigest, ULONG* pcbDigest) { RSA *pPrivateKey = RSA_new(); -@@ -59,7 +63,11 @@ +@@ -64,7 +68,12 @@ return -1; } @@ -21,42 +21,12 @@ +#else HRESULT ICCT_Verify(UCHAR* pucPublicKey, int cbPublicKey, UCHAR* pMessage, ULONG cbMessage, +#endif ++ /*[in]*/ UCHAR* pDigest, ULONG cbDigest) { RSA *pPublicKey = RSA_new(); -@@ -91,7 +99,11 @@ - return -1; - } - -+#ifdef HAVE_SSLENGINE_H -+HRESULT ICCT_CryptDigest(const UCHAR* pucPublicKey, int cbPublicKey, -+#else - HRESULT ICCT_CryptDigest(UCHAR* pucPublicKey, int cbPublicKey, -+#endif - UCHAR* pDigest, ULONG cbDigest, UCHAR * pOut, ULONG * cbOut) - { - RSA *pPublicKey = RSA_new(); -@@ -126,7 +138,11 @@ - return -1; +@@ -255,3 +264,4 @@ + } } - -+#ifdef HAVE_SSLENGINE_H -+HRESULT ICCT_DecryptDigest(const UCHAR* pucPrivateKey, int cbPrivateKey, -+#else - HRESULT ICCT_DecryptDigest(UCHAR* pucPrivateKey, int cbPrivateKey, -+#endif - UCHAR * pIn, ULONG cbIn, UCHAR* pDigest, ULONG * cbDigest) - { - RSA *pPrivateKey = RSA_new(); -@@ -158,7 +174,11 @@ - int* cbPrivateKey, UCHAR* Seed, - int cbSeed) - { -+#ifdef HAVE_SSLENGINE_H -+ RSA *pPrivateKey = RSA_new_method((ENGINE *)RSA_PKCS1_SSLeay()); -+#else - RSA *pPrivateKey = RSA_new_method(RSA_PKCS1_SSLeay()); -+#endif - - UCHAR* pPubK = pucPublicKey; - UCHAR* pPrivK = pucPrivateKey; + */ ++ diff --git a/security/saferpay/files/patch-idpapp.mk b/security/saferpay/files/patch-idpapp.mk index 5e5e40e66954..e8c0a76f49a1 100644 --- a/security/saferpay/files/patch-idpapp.mk +++ b/security/saferpay/files/patch-idpapp.mk @@ -1,31 +1,24 @@ ---- saferpay/idpapp.mk.orig Thu Aug 8 16:15:49 2002 -+++ saferpay/idpapp.mk Wed Feb 19 11:06:35 2003 -@@ -7,24 +7,12 @@ - +--- saferpay/idpapp.mk.orig Tue Jan 6 15:33:08 2004 ++++ saferpay/idpapp.mk Tue Jan 6 15:34:28 2004 +@@ -1,17 +1,11 @@ ####### Compiler, tools and options --# new ssl --SSLVERSION = openssl-0.9.6c +-SSLVERSION = openssl-0.9.7b -SSLEAYDIR = ./ssl -SSLINCDIR = -I ./ssl +SSLINCDIR = -I /usr/include/openssl -- -- --#CC = /project/gcc31/bin/gcc --#CXX = /project/gcc31/bin/g++ - -CC = gcc -CXX = g++ - -CFLAGS = -pipe -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -O2 -fPIC -CXXFLAGS= -pipe -DUNIX -O2 -fPIC -+CFLAGS += -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -fPIC -+CXXFLAGS += -DUNIX -fPIC ++CFLAGS += -pipe -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -O2 -fPIC ++CXXFLAGS+= -pipe -DUNIX -O2 -fPIC INCPATH = -I"./xml" -I"./jni" -I"./sxfc" $(SSLINCDIR) --#LINK = /project/gcc31/bin/g++ -LINK = g++ -+LINK = ${CXX} ++LINK += ${CXX} LFLAGS = -fPIC -shared LIBS = /usr/lib/libssl.a /usr/lib/libcrypto.a AR = ar cq diff --git a/security/saferpay/files/patch-idphttp.cpp b/security/saferpay/files/patch-idphttp.cpp deleted file mode 100644 index 179c6f37f3b5..000000000000 --- a/security/saferpay/files/patch-idphttp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- saferpay/idphttp.cpp.orig Wed Feb 19 10:57:14 2003 -+++ saferpay/idphttp.cpp Wed Feb 19 10:58:07 2003 -@@ -374,7 +374,7 @@ - public: - SslConnection() - { -- SSLeay_add_ssl_algorithms(); -+ SSL_library_init(); - SSL_load_error_strings(); - - ctx = SSL_CTX_new(SSLv23_method()); diff --git a/security/saferpay/files/patch-saferpay.c b/security/saferpay/files/patch-saferpay.c index f3221c6024c2..1a936e37777b 100644 --- a/security/saferpay/files/patch-saferpay.c +++ b/security/saferpay/files/patch-saferpay.c @@ -1,11 +1,11 @@ ---- saferpay/saferpay.c.orig Tue Feb 18 16:51:58 2003 -+++ saferpay/saferpay.c Tue Feb 18 16:52:14 2003 +--- saferpay/saferpay.c.orig Tue Jan 6 15:12:14 2004 ++++ saferpay/saferpay.c Tue Jan 6 15:12:28 2004 @@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include "idpapi.h" - #include "idperrc.h" - + #include + #include + #include +-#include ++#include + #include "idpapi.h" + #include "idperrc.h" + diff --git a/security/saferpay/files/patch-saferpay.mk b/security/saferpay/files/patch-saferpay.mk index e1f4f05c6e83..3ecfef17c65c 100644 --- a/security/saferpay/files/patch-saferpay.mk +++ b/security/saferpay/files/patch-saferpay.mk @@ -1,25 +1,20 @@ ---- saferpay/saferpay.mk.orig Tue Feb 18 16:58:08 2003 -+++ saferpay/saferpay.mk Tue Feb 18 16:58:50 2003 -@@ -7,18 +7,11 @@ - +--- saferpay/saferpay.mk.orig Tue Jul 22 16:08:35 2003 ++++ saferpay/saferpay.mk Tue Jan 6 15:10:05 2004 +@@ -1,13 +1,11 @@ ####### Compiler, tools and options - --#CC = /project/gcc31/bin/gcc --#CXX = /project/gcc31/bin/g++ -- -CC = gcc -CXX = g++ -- + -CFLAGS = -pipe -fPIC -O2 -CXXFLAGS= -pipe -fPIC -O2 -+CFLAGS += -fPIC -+CXXFLAGS += -fPIC -+LFLAGS = -fPIC -Lout ++CFLAGS += -fPIC ++CXXFLAGS += -fPIC INCPATH = --#LINK = /project/gcc31/bin/g++ + -LINK = g++ --LFLAGS = -fPIC -+LINK = $(CXX) +-LFLAGS = -fPIC -ldl ++LINK += $(CXX) -Lout ++LFLAGS += -fPIC LIBS = -lidpapp MOC = $(QTDIR)/bin/moc -- cgit v1.2.3