git: 4b3fa9ae5597 - main - net-im/signald: Update log4j to 2.16, fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Dec 2021 22:58:17 UTC
The branch main has been updated by grembo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4b3fa9ae55975e0a94dca040136b526887cdc810
commit 4b3fa9ae55975e0a94dca040136b526887cdc810
Author: Michael Gmelin <grembo@FreeBSD.org>
AuthorDate: 2021-12-14 22:49:17 +0000
Commit: Michael Gmelin <grembo@FreeBSD.org>
CommitDate: 2021-12-14 22:49:17 +0000
net-im/signald: Update log4j to 2.16, fix build
---
net-im/signald/Makefile | 10 +++++-----
net-im/signald/distinfo | 10 +++++-----
net-im/signald/files/patch-build.gradle | 4 ++--
net-im/signald/pkg-plist | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/net-im/signald/Makefile b/net-im/signald/Makefile
index cc2936fd3b78..72481db7cab1 100644
--- a/net-im/signald/Makefile
+++ b/net-im/signald/Makefile
@@ -1,6 +1,6 @@
PORTNAME= signald
DISTVERSION= 0.15.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im java
MASTER_SITES= https://plugins.gradle.org/m2/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/:buildconfig \
https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.0/:jackann \
@@ -19,8 +19,8 @@ MASTER_SITES= https://plugins.gradle.org/m2/gradle/plugin/de/fuerstenau/BuildCon
https://repo.maven.apache.org/maven2/com/squareup/okhttp3/logging-interceptor/4.9.1/:okhttp_interceptor \
https://repo.maven.apache.org/maven2/com/squareup/okio/2.6.0/:okjvm \
https://repo.maven.apache.org/maven2/info/picocli/picocli/4.5.2/:picocli \
- https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.15.0/:log4j_api \
- https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-core/2.15.0/:log4j_core \
+ https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.16.0/:log4j_api \
+ https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-core/2.16.0/:log4j_core \
https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.66/:bcprov \
https://repo.maven.apache.org/maven2/org/flywaydb/flyway-core/7.5.3/:flyway \
https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/:jetann \
@@ -45,8 +45,8 @@ DISTFILES= BuildConfigPlugin-1.1.8.jar:buildconfig \
kotlin-stdlib-common-1.3.71.jar:jetkotstdcommon \
libphonenumber-8.12.17.jar:libphone \
logging-interceptor-4.9.1.jar:okhttp_interceptor \
- log4j-api-2.15.0.jar:log4j_api \
- log4j-core-2.15.0.jar:log4j_core \
+ log4j-api-2.16.0.jar:log4j_api \
+ log4j-core-2.16.0.jar:log4j_core \
okhttp-4.9.1.jar:okhttp \
okio-2.6.0.jar:okjvm \
picocli-4.5.2.jar:picocli \
diff --git a/net-im/signald/distinfo b/net-im/signald/distinfo
index 771c2ddde449..fdc9fab998e4 100644
--- a/net-im/signald/distinfo
+++ b/net-im/signald/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1639302771
+TIMESTAMP = 1639521427
SHA256 (BuildConfigPlugin-1.1.8.jar) = 99b5256936af67431a8a92902f253f525837ac3639a5ff05ed2225febaa710af
SIZE (BuildConfigPlugin-1.1.8.jar) = 52133
SHA256 (annotations-13.0.jar) = ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478
@@ -25,10 +25,10 @@ SHA256 (libphonenumber-8.12.17.jar) = 729483057ef874b01537da8395d67e23b419d504f8
SIZE (libphonenumber-8.12.17.jar) = 350448
SHA256 (logging-interceptor-4.9.1.jar) = 08ae52d4e7ab4dde8f94970bbeb1545b51934d4b3f0802f6e816b0522902fa9d
SIZE (logging-interceptor-4.9.1.jar) = 15680
-SHA256 (log4j-api-2.15.0.jar) = c8c33e7e8e05496dae69cf0caac8c3092cffd937a164526e92922d2d566d0a55
-SIZE (log4j-api-2.15.0.jar) = 301804
-SHA256 (log4j-core-2.15.0.jar) = 419a8512895971b7b4f4f33e620d361254e5c9552b904b0474b09ddd4a6a220b
-SIZE (log4j-core-2.15.0.jar) = 1789769
+SHA256 (log4j-api-2.16.0.jar) = cbbcef7b57fef115a788395e6e11cdf92c01c1d606652c493d40d3c81766b9fc
+SIZE (log4j-api-2.16.0.jar) = 301892
+SHA256 (log4j-core-2.16.0.jar) = 5d241620b10e3f1475320bc9552cf7bcfa27eeb9b1b6a891449e76db4b4a02a8
+SIZE (log4j-core-2.16.0.jar) = 1789565
SHA256 (okhttp-4.9.1.jar) = 6afdd8f35f4eb60df965c290fa3acf29443fa986545113d0729b8461f6571f8f
SIZE (okhttp-4.9.1.jar) = 791390
SHA256 (okio-2.6.0.jar) = 4d84ef686277b58eb05691ac19cd3befa3429a27274982ee65ea0f07044bcc00
diff --git a/net-im/signald/files/patch-build.gradle b/net-im/signald/files/patch-build.gradle
index ca3f75b343ac..b6524396fd0c 100644
--- a/net-im/signald/files/patch-build.gradle
+++ b/net-im/signald/files/patch-build.gradle
@@ -49,8 +49,8 @@
implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.3.2'
- implementation 'org.apache.logging.log4j:log4j-api:2.14.0'
- implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
-+ implementation 'org.apache.logging.log4j:log4j-api:2.15.0'
-+ implementation 'org.apache.logging.log4j:log4j-core:2.15.0'
++ implementation 'org.apache.logging.log4j:log4j-api:2.16.0'
++ implementation 'org.apache.logging.log4j:log4j-core:2.16.0'
implementation 'org.slf4j:slf4j-nop:1.8.0-beta4'
+ implementation 'org.slf4j:slf4j-api:1.8.0-beta4'
implementation 'info.picocli:picocli:4.5.2'
diff --git a/net-im/signald/pkg-plist b/net-im/signald/pkg-plist
index d2711504310c..d67c9762ee76 100644
--- a/net-im/signald/pkg-plist
+++ b/net-im/signald/pkg-plist
@@ -11,8 +11,8 @@ man/man7/signald.7.gz
%%DATADIR%%/lib/kotlin-stdlib-1.3.71.jar
%%DATADIR%%/lib/kotlin-stdlib-common-1.3.71.jar
%%DATADIR%%/lib/libphonenumber-8.12.17.jar
-%%DATADIR%%/lib/log4j-api-2.14.0.jar
-%%DATADIR%%/lib/log4j-core-2.14.0.jar
+%%DATADIR%%/lib/log4j-api-2.16.0.jar
+%%DATADIR%%/lib/log4j-core-2.16.0.jar
%%DATADIR%%/lib/logging-interceptor-4.9.1.jar
%%DATADIR%%/lib/okhttp-4.9.1.jar
%%DATADIR%%/lib/okio-2.6.0.jar