From nobody Mon Mar 7 13:58:28 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 509B819FFC78; Mon, 7 Mar 2022 13:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC0RS1mRDz3FKB; Mon, 7 Mar 2022 13:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646661508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qAjiXPXrUsE5OVxIF9zsGcr/sdcg5jbRPTaXeOOOBtQ=; b=XIWEiYHuESMEomE+S5pqTjtimmKakmxDszDwf1tJOi6Z3dMdjEQc2it/HzVX99ozdIFLHH zXhl25uN/KO4W5hOzSUK30zg91AN88zjm6kCp4NwUIDdBeDGqRiGfhk5n4zILmXcj7FGsH j+hqmo6brG3nD35aswRkUFGifYyLGsoJeiG3jL5B7PTc/hKxbpkZGW9tRuuu0QJEa4ksOB hMvi9c8a3kOY3pYCh8abyOkTMC1N95I5NgUdJ0m7W9oGzP5I4UEx+t5qMKlAAnt+bo3E1u HUY3BdaRRpYt0HRzSXz5YqUbyQJOVRVxewxIbT0ZIw9tMAbzxA9kp/4R+ulcIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C7FC1816; Mon, 7 Mar 2022 13:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227DwSMs001059; Mon, 7 Mar 2022 13:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227DwSJh001058; Mon, 7 Mar 2022 13:58:28 GMT (envelope-from git) Date: Mon, 7 Mar 2022 13:58:28 GMT Message-Id: <202203071358.227DwSJh001058@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: b34b6515e4da - 2022Q1 - finance/ktoblzcheck: Update bank data List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: b34b6515e4daadd960ff7e992263656ce5383a06 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646661508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qAjiXPXrUsE5OVxIF9zsGcr/sdcg5jbRPTaXeOOOBtQ=; b=enmjopiIzeR4ipzNWsVo6rGfR+YY3YRb0jJ3oZ88arXoV97+qMvax7xR0tB6XL2saeCX2L BM9ljE7fsEPVU1dSIRQZw4SHFsgfO3saoY5jq5WGhvn4faDoCpOab6mQh6WAN6Chl59X4v DyWSj3U+0DLTReuPVghmJra4xjq04KM3SlqoIk562rIMuEglEpCInF5DusnSdxbE8h+y41 /ppPhfwU4FN4paoSgF1oeo2/I6Zh/OpG7aLepS0/Z+W9osAk7swNQWjPPs7NZdzLdV4ioZ nFdRvPdRFYbkuPk9BGvhv408GiKcOefZCGuJooG/dmAkCsDoxheTH2mYlKtOgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646661508; a=rsa-sha256; cv=none; b=GZCghI3MbeRYWeMjAoQdVJkQ20tRBl5eBaF4zCY9d3IMs4rOC3oPa+niHn5ewlfQwvLWzc 2wFuYfQLtYSAcg0HiElM5iNCph9lshUrTEOBwfp9+3F335a8L+fJYBYF+/A0GwzQpO+0TK asYlCweiTfhoh/yIN/B7goszn6/ANCyCq8GvDAEo4Nmk0GWbxjRMMozHigvowsr62Wnvk6 QL43ge5HHdzGimLGgzjJshGGDSPnaBD1RqVvMTuxjRG57UAe/K11nWPvCry4z3/pPsZcrT Arttgpj4FJoBASj4lu9kP0GAIDK+unjnqCU/edRgh8z9MNNHCvdOn4LKK4M0Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b34b6515e4daadd960ff7e992263656ce5383a06 commit b34b6515e4daadd960ff7e992263656ce5383a06 Author: Jason E. Hale AuthorDate: 2022-02-22 13:59:45 +0000 Commit: Jason E. Hale CommitDate: 2022-03-07 13:58:11 +0000 finance/ktoblzcheck: Update bank data Bank data is valid from 2022-03-07 - 2022-06-05. Update check digit calculation for methods 45, B1, and C2. Add check digit caluclation for method E4. MFH: 2022Q1 (cherry picked from commit 9b1fe5df80c20028de9847767cf144595ffa4ba7) (cherry picked from commit be1d9733d1258d1f1565412164f2844e3bd26679) --- finance/ktoblzcheck/Makefile | 6 +- finance/ktoblzcheck/distinfo | 6 +- finance/ktoblzcheck/files/patch-src_lib_methods.cc | 83 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile index e9ffd5d897d5..410f29269c9a 100644 --- a/finance/ktoblzcheck/Makefile +++ b/finance/ktoblzcheck/Makefile @@ -2,7 +2,7 @@ PORTNAME= ktoblzcheck PORTVERSION= 1.53 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= finance german MASTER_SITES= SF/${PORTNAME} \ LOCAL/jhale:bankdata @@ -15,7 +15,7 @@ COMMENT= Check bank codes of German banks LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake pathfix python:3.6+,build +USES= cmake pathfix python:3.7+,build USE_LDCONFIG= yes CMAKE_ON= INSTALL_RAW_BANKDATA_FILE @@ -24,7 +24,7 @@ CMAKE_OFF= ENABLE_BANKDATA_DOWNLOAD PLIST_SUB= BANKDATA_DATE=${BANKDATA_DATE} PORTDOCS= README.md -BANKDATA_DATE= 20210308 +BANKDATA_DATE= 20220307 OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_SUB= yes diff --git a/finance/ktoblzcheck/distinfo b/finance/ktoblzcheck/distinfo index 59e8f172731a..1ba71bbd02d3 100644 --- a/finance/ktoblzcheck/distinfo +++ b/finance/ktoblzcheck/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1615403881 +TIMESTAMP = 1646591314 SHA256 (ktoblzcheck-1.53.tar.gz) = 18b9118556fe83240f468f770641d2578f4ff613cdcf0a209fb73079ccb70c55 SIZE (ktoblzcheck-1.53.tar.gz) = 531459 -SHA256 (ktoblzcheck-bankdata-20210308.tar.gz) = 935980f1d5001a90326e6fe2fc85efd46b5be32bf3402c54d2d7346bfc90eea9 -SIZE (ktoblzcheck-bankdata-20210308.tar.gz) = 308267 +SHA256 (ktoblzcheck-bankdata-20220307.tar.gz) = 87fb315c76756366a2c75abc6b078a06af93e3b90faf8044cf8c1c6436dc9466 +SIZE (ktoblzcheck-bankdata-20220307.tar.gz) = 302328 diff --git a/finance/ktoblzcheck/files/patch-src_lib_methods.cc b/finance/ktoblzcheck/files/patch-src_lib_methods.cc new file mode 100644 index 000000000000..58e7293ef25e --- /dev/null +++ b/finance/ktoblzcheck/files/patch-src_lib_methods.cc @@ -0,0 +1,83 @@ +Update methods 45, B1, and C2. Implement method E4. +https://sourceforge.net/p/ktoblzcheck/code/merge-requests/14/ + +--- src/lib/methods.cc.orig 2020-01-20 15:07:55 UTC ++++ src/lib/methods.cc +@@ -530,15 +530,15 @@ AccountNumberCheck::Result method_44(const int *accoun + return algo01(11, weight, false, 10, account); + } + ++// method 45 was extended for due-date 2018-06-04 + AccountNumberCheck::Result method_45(const int *account, int *weight) + { +- // some numbers do not have a checksum +- if (0 == account[0] || 1 == account[4]) { ++ // accountIDs starting with "0" or "48" do not have a check digit ++ // accountIDs that have "1" as the fifth digit do not have a check digit ++ if (0 == account[0] || 1 == account[4] || (4 == account[0] && 8 == account[1])) { + return AccountNumberCheck::OK; + } +- +- number2Array("2121212120", weight); +- return algo01(10, weight, true, 10, account); ++ return method_00(account, weight); + } + + AccountNumberCheck::Result method_46(const int *account, int *weight) +@@ -1644,13 +1644,13 @@ AccountNumberCheck::Result method_B0(const int *accoun + // Checked with Bundesbank-Testnumbers + AccountNumberCheck::Result method_B1(const int *account, int *weight) + { +- number2Array("1371371370", weight); +- if (AccountNumberCheck::OK == algo01(10, weight, false, 10, account)) { +- return AccountNumberCheck::OK; // variant 1 (method "05") ++ if (AccountNumberCheck::OK == method_05(account, weight)) { ++ return AccountNumberCheck::OK; // variant 1 + } +- number2Array("1731731730", weight); +- return algo01(10, weight, false, 10, account); +- // variant 2 (method "01") ++ if (AccountNumberCheck::OK == method_01(account, weight)) { ++ return AccountNumberCheck::OK; // variant 2 ++ } ++ return method_00(account, weight); //variant 3, extended for due-date 2017-06-05 + } + + // Added by Jens Gecius (new Method as of September 6th, 2004) +@@ -1824,7 +1824,10 @@ AccountNumberCheck::Result method_C2(const int *accoun + if (AccountNumberCheck::OK == method_22(account, weight)) { // variant 1 + return AccountNumberCheck::OK; + } +- return method_00(account, weight); // variant 2 ++ if (AccountNumberCheck::OK == method_00(account, weight)) { // variant 2 ++ return AccountNumberCheck::OK; ++ } ++ return method_04(account, weight); // variant 3, extended for due-date 2017-09-04 + } + + // new method C3 and C4 valid from March 5th, 2007, checked with Bundesbank-Testnumbers +@@ -2190,6 +2193,16 @@ AccountNumberCheck::Result method_E3(const int *accoun + return method_21(account, weight); // variant 2 + } + ++// new method E4 valid from 2017-06-05 ++// checked with Bundesbank-Testnumbers ++AccountNumberCheck::Result method_E4(const int *account, int *weight) ++{ ++ if (AccountNumberCheck::OK == method_02(account, weight)) { // variant 1 ++ return AccountNumberCheck::OK; ++ } ++ return method_00(account, weight); // variant 2 ++} ++ + struct method_func_s { + const char *str; + AccountNumberCheck::MethodFunc func; +@@ -2337,6 +2350,7 @@ const struct method_func_s cb_funcs[] = { + { "E1", method_E1}, + { "E2", method_E2}, + { "E3", method_E3}, ++ { "E4", method_E4}, + { 0, 0} // Important: The array has to end with the {0,0} entry, + // otherwise initMethodMap() will runaway and crash! + };