Hello community,
here is the log from the commit of package hbci4java for openSUSE:Factory
checked in at 2018-03-05 13:45:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hbci4java (Old)
and /work/SRC/openSUSE:Factory/.hbci4java.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hbci4java"
Mon Mar 5 13:45:53 2018 rev:5 rq:582574 version:2.5.12.hibiscus.2.6.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/hbci4java/hbci4java.changes 2017-12-23
12:21:37.073347473 +0100
+++ /work/SRC/openSUSE:Factory/.hbci4java.new/hbci4java.changes 2018-03-05
13:46:17.773621295 +0100
@@ -1,0 +2,5 @@
+Mon Mar 5 09:11:07 UTC 2018 - sch...@suse.de
+
+- signed-char.patch: fix conflicting char signedness
+
+-------------------------------------------------------------------
New:
----
signed-char.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hbci4java.spec ++++++
--- /var/tmp/diff_new_pack.VvbfMa/_old 2018-03-05 13:46:18.617590755 +0100
+++ /var/tmp/diff_new_pack.VvbfMa/_new 2018-03-05 13:46:18.621590610 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hbci4java
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: hbci4java
Summary: Java online banking client using the HBCI standard
-License: GPL-2.0 and LGPL-2.1
+License: GPL-2.0-only AND LGPL-2.1-only
Group: Productivity/Office/Finance
Version: 2.5.12.hibiscus.2.6.18
Release: 0
@@ -30,6 +30,7 @@
Source3: chipcard.zip
Patch0: hbci4java-jdk9.patch
Patch1: hbci4java-jdk10.patch
+Patch2: signed-char.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: gcc-c++
@@ -51,6 +52,7 @@
cp %{S:1} .
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
pushd chipcard
++++++ signed-char.patch ++++++
Index: hbci4java-2.5.12.hibiscus.2.6.18/chipcard/src/include/ctapi-tools.h
===================================================================
--- hbci4java-2.5.12.hibiscus.2.6.18.orig/chipcard/src/include/ctapi-tools.h
+++ hbci4java-2.5.12.hibiscus.2.6.18/chipcard/src/include/ctapi-tools.h
@@ -45,7 +45,7 @@ typedef struct CTAPI_ERROR {
size_t reqLen;
unsigned char response[300];
size_t resLen;
- char ret;
+ signed char ret;
unsigned short int status;
} CTAPI_ERROR;
@@ -57,7 +57,7 @@ typedef struct CTAPI_MapInt2String {
// error codes
typedef struct CTAPI_MapChar2String {
- char code;
+ signed char code;
const char* msg;
} CTAPI_MapChar2String;
@@ -141,7 +141,7 @@ bool CTAPI_initCTAPI(CTAPI
unsigned short int CTAPI_performWithCT(const char *name,unsigned short int
lenIn,unsigned char *command,unsigned short int *lenOut,unsigned char
*response);
unsigned short int CTAPI_performWithCard(const char *name,unsigned short int
lenIn,unsigned char *command,unsigned short int *lenOut,unsigned char
*response);
-char* CTAPI_getErrorString(char status);
+char* CTAPI_getErrorString(signed char status);
char* CTAPI_getStatusString(unsigned short int status);
bool CTAPI_isOK(unsigned short int status);
Index: hbci4java-2.5.12.hibiscus.2.6.18/chipcard/src/lowlevel/ctapi-tools.cpp
===================================================================
--- hbci4java-2.5.12.hibiscus.2.6.18.orig/chipcard/src/lowlevel/ctapi-tools.cpp
+++ hbci4java-2.5.12.hibiscus.2.6.18/chipcard/src/lowlevel/ctapi-tools.cpp
@@ -67,7 +67,7 @@ char* CTAPI_getStatusString(unsigned sho
return ret;
}
-char* CTAPI_getErrorString(char status)
+char* CTAPI_getErrorString(signed char status)
{
CTAPI_MapChar2String *codes=(CTAPI_MapChar2String*)CTAPI_errorMsgs;
@@ -133,7 +133,7 @@ static unsigned short int perform(unsign
memcpy(CTAPI_error.request,command,lenIn);
CTAPI_error.reqLen=lenIn;
- char err;
+ signed char err;
int retries=3;
while (retries--) {
err=(*datafunc)(ctnum,&dad,&sad,lenIn,command,&lenOut_return,response_local);
