diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 0c9ccef9a8..91fefe17bb 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -264,18 +264,18 @@ set_default AQBANKING3 yes if [ "$AQBANKING3" != "yes" ]; then set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz" else - set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=13&file=01&dummy=gwenhywfar-3.4.1.tar.gz" + set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz" + set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff fi set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar -set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.17.tar.gz" +set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz" # ktoblzcheck is being installed into GWENHYWFAR_DIR if [ "$AQBANKING3" != "yes" ]; then set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz" else - set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=16&file=01&dummy=aqbanking-3.7.2.tar.gz" - set_default AQBANKING_PATCH `pwd`/aqbanking-3.7.2.patch + set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz" fi set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking set_default AQBANKING_WITH_QT yes diff --git a/packaging/win32/gwenhywfar-3.6.0-patch.diff b/packaging/win32/gwenhywfar-3.6.0-patch.diff new file mode 100644 index 0000000000..b346d45592 --- /dev/null +++ b/packaging/win32/gwenhywfar-3.6.0-patch.diff @@ -0,0 +1,76 @@ +--- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgrkeys.c Sun Dec 7 16:56:04 2008 ++++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgrkeys.c Tue Jan 13 01:05:44 2009 +@@ -74,6 +74,7 @@ + + + ++GWENHYWFAR_CB + void GWEN_CryptMgrKeys_FreeData(void *bp, void *p) { + GWEN_CRYPTMGR_KEYS *xcm; + +@@ -104,6 +105,7 @@ + + + ++GWENHYWFAR_CB + int GWEN_CryptMgrKeys_SignData(GWEN_CRYPTMGR *cm, + const uint8_t *pData, uint32_t lData, + GWEN_BUFFER *dbuf) { +@@ -176,6 +178,7 @@ + + + ++GWENHYWFAR_CB + int GWEN_CryptMgrKeys_VerifyData(GWEN_CRYPTMGR *cm, + const uint8_t *pData, uint32_t lData, + const uint8_t *pSignature, uint32_t lSignature) { +@@ -271,6 +274,7 @@ + + + ++GWENHYWFAR_CB + int GWEN_CryptMgrKeys_EncryptKey(GWEN_CRYPTMGR *cm, + const uint8_t *pData, uint32_t lData, + GWEN_BUFFER *dbuf) { +@@ -322,6 +326,7 @@ + + + ++GWENHYWFAR_CB + int GWEN_CryptMgrKeys_DecryptKey(GWEN_CRYPTMGR *cm, + const uint8_t *pData, uint32_t lData, + GWEN_BUFFER *dbuf) { +--- gwenhywfar-3.6.0-old/src/cryptmsg/cryptmgr_be.h Tue Dec 2 17:06:50 2008 ++++ gwenhywfar-3.6.0/src/cryptmsg/cryptmgr_be.h Tue Jan 13 01:17:30 2009 +@@ -22,19 +22,19 @@ + GWEN_INHERIT_FUNCTION_LIB_DEFS(GWEN_CRYPTMGR, GWENHYWFAR_API) + + +-typedef int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm, +- const uint8_t *pData, uint32_t lData, +- GWEN_BUFFER *dbuf); +-typedef int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm, +- const uint8_t *pData, uint32_t lData, +- GWEN_BUFFER *dbuf); ++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_SIGNDATA_FN)(GWEN_CRYPTMGR *cm, ++ const uint8_t *pData, uint32_t lData, ++ GWEN_BUFFER *dbuf); ++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_ENCRYPTKEY_FN)(GWEN_CRYPTMGR *cm, ++ const uint8_t *pData, uint32_t lData, ++ GWEN_BUFFER *dbuf); + +-typedef int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm, +- const uint8_t *pData, uint32_t lData, +- const uint8_t *pSignature, uint32_t lSignature); +-typedef int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm, +- const uint8_t *pData, uint32_t lData, +- GWEN_BUFFER *dbuf); ++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_VERIFYDATA_FN)(GWEN_CRYPTMGR *cm, ++ const uint8_t *pData, uint32_t lData, ++ const uint8_t *pSignature, uint32_t lSignature); ++typedef GWENHYWFAR_CB int (*GWEN_CRYPTMGR_DECRYPTKEY_FN)(GWEN_CRYPTMGR *cm, ++ const uint8_t *pData, uint32_t lData, ++ GWEN_BUFFER *dbuf); + + + diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 001ec6f120..fe0ccf3339 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -870,6 +870,8 @@ function inst_gwenhywfar() { CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl" else + [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] && \ + patch -p1 < $GWENHYWFAR_PATCH ./configure ${HOST_XCOMPILE} \ --with-openssl-includes=$_OPENSSL_UDIR/include \ --with-openssl-libs=$_OPENSSL_UDIR/lib \ @@ -957,14 +959,15 @@ function inst_aqbanking() { qpushd $TMP_UDIR/aqbanking-* _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS}" _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}" - if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ]; then - patch -p1 < $AQBANKING_PATCH - make -f Makefile.cvs - fi if test x$CROSS_COMPILE = xyes; then XMLMERGE="xmlmerge" else - XMLMERGE="${GWENHYWFAR_UDIR}/bin/xmlmerge" + XMLMERGE="${_GWENHYWFAR_UDIR}/bin/xmlmerge" + fi + if test x$AQBANKING3 = xyes; then + _AQ_BACKENDS="aqhbci aqofxconnect" + else + _AQ_BACKENDS="aqdtaus aqhbci aqofxconnect" fi if test x$AQBANKING_WITH_QT = xyes; then inst_qt4 @@ -972,7 +975,7 @@ function inst_aqbanking() { --with-gwen-dir=${_GWENHYWFAR_UDIR} \ --with-xmlmerge=${XMLMERGE} \ --with-frontends="cbanking qbanking" \ - --with-backends="aqhbci aqofxconnect" \ + --with-backends="${_AQ_BACKENDS}" \ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \ qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \ @@ -985,7 +988,7 @@ function inst_aqbanking() { --with-gwen-dir=${_GWENHYWFAR_UDIR} \ --with-xmlmerge=${XMLMERGE} \ --with-frontends="cbanking" \ - --with-backends="aqdtaus aqhbci aqofxconnect" \ + --with-backends="${_AQ_BACKENDS}" \ CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \ LDFLAGS="${_AQ_LDFLAGS} ${GMP_LDFLAGS}" \ --prefix=${_AQBANKING_UDIR}