cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch log4j to 2.16.0 in older unifi versions

Browse Source
This commit is contained in:
sthen 2021-12-15 10:53:13 +00:00
parent b727c8cb24
commit c39b0dcfb8
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/unifi/5.14/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2021/12/14 10:09:15 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2021/12/15 10:53:13 sthen Exp $
V= 5.14.23
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
REVISION= 7
REVISION= 8
REPLACE_LOG4J= Yes

4
net/unifi/5.14/distinfo
View File

@ -1,12 +1,12 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (apache-log4j-2.15.0-bin.tar.gz) = /ZEH1uEo1Jd5e+nMxfgMTTNs6Gy9aO5UEqm8gpjDGjM=
SHA256 (apache-log4j-2.16.0-bin.tar.gz) = 1KUTXHYavcUGkNDU8XdZIodh9yljYd0U3xMJE8IVh5w=
SHA256 (snappy-java-1.1.8.4-libc++.8.0.jar) = bfmldHygGSXB7q5J8UtNXVbneFBBEXRAK7GB3evmB6A=
SHA256 (unifi-5.14.23.zip) = oon9HUhRmVuS/SNIP1CK0QP06rRRlbC1m4TcLZyjyTA=
SHA256 (unifi_sh_api-5.14.23) = F5FoUDnqeVlwvMemHuyFQFjj5vwTxSdw4x4g8762Ius=
SIZE (UBNT-MIB) = 4001
SIZE (UBNT-UniFi-MIB) = 13520
SIZE (apache-log4j-2.15.0-bin.tar.gz) = 15107661
SIZE (apache-log4j-2.16.0-bin.tar.gz) = 14029653
SIZE (snappy-java-1.1.8.4-libc++.8.0.jar) = 1992619
SIZE (unifi-5.14.23.zip) = 195394703
SIZE (unifi_sh_api-5.14.23) = 5174

8
net/unifi/5.14/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2021/12/13 22:14:59 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2021/12/15 10:53:14 sthen Exp $
@option is-branch
@pkgpath net/unifi
@pkgpath net/unifi/5.7
@ -105,11 +105,11 @@ share/unifi/lib/jstl-1.2.jar
share/unifi/lib/jstun-0.7.4.jar
share/unifi/lib/jul-to-slf4j-1.7.28.jar
share/unifi/lib/log4j-api-2.12.1.jar
share/unifi/lib/log4j-api-2.15.0.jar
share/unifi/lib/log4j-api-${LOG4J_V}.jar
share/unifi/lib/log4j-core-2.12.1.jar
share/unifi/lib/log4j-core-2.15.0.jar
share/unifi/lib/log4j-core-${LOG4J_V}.jar
share/unifi/lib/log4j-slf4j-impl-2.12.1.jar
share/unifi/lib/log4j-slf4j-impl-2.15.0.jar
share/unifi/lib/log4j-slf4j-impl-${LOG4J_V}.jar
share/unifi/lib/mongo-java-driver-3.4.3.jar
share/unifi/lib/openssh-1.0.jar
share/unifi/lib/org.eclipse.paho.client.mqttv3-1.1.0.jar

4
net/unifi/6.0/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2021/12/14 10:09:15 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2021/12/15 10:53:14 sthen Exp $
V= 6.0.45
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
REVISION= 5
REVISION= 6
REPLACE_LOG4J= Yes

4
net/unifi/6.0/distinfo
View File

@ -1,12 +1,12 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (apache-log4j-2.15.0-bin.tar.gz) = /ZEH1uEo1Jd5e+nMxfgMTTNs6Gy9aO5UEqm8gpjDGjM=
SHA256 (apache-log4j-2.16.0-bin.tar.gz) = 1KUTXHYavcUGkNDU8XdZIodh9yljYd0U3xMJE8IVh5w=
SHA256 (snappy-java-1.1.8.4-libc++.8.0.jar) = bfmldHygGSXB7q5J8UtNXVbneFBBEXRAK7GB3evmB6A=
SHA256 (unifi-6.0.45.zip) = I4G+AZpCqxpDEaed+O1/Psr2LG7tplrnYMJ06mfMYKQ=
SHA256 (unifi_sh_api-6.0.45) = F5FoUDnqeVlwvMemHuyFQFjj5vwTxSdw4x4g8762Ius=
SIZE (UBNT-MIB) = 4001
SIZE (UBNT-UniFi-MIB) = 13520
SIZE (apache-log4j-2.15.0-bin.tar.gz) = 15107661
SIZE (apache-log4j-2.16.0-bin.tar.gz) = 14029653
SIZE (snappy-java-1.1.8.4-libc++.8.0.jar) = 1992619
SIZE (unifi-6.0.45.zip) = 147691229
SIZE (unifi_sh_api-6.0.45) = 5174

8
net/unifi/6.0/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2021/12/13 22:14:59 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2021/12/15 10:53:14 sthen Exp $
@option is-branch
@pkgpath net/unifi
@pkgpath net/unifi/5.7
@ -106,11 +106,11 @@ share/unifi/lib/jstl-1.2.jar
share/unifi/lib/jstun-0.7.4.jar
share/unifi/lib/jul-to-slf4j-1.7.30.jar
share/unifi/lib/log4j-api-2.13.3.jar
share/unifi/lib/log4j-api-2.15.0.jar
share/unifi/lib/log4j-api-${LOG4J_V}.jar
share/unifi/lib/log4j-core-2.13.3.jar
share/unifi/lib/log4j-core-2.15.0.jar
share/unifi/lib/log4j-core-${LOG4J_V}.jar
share/unifi/lib/log4j-slf4j-impl-2.13.3.jar
share/unifi/lib/log4j-slf4j-impl-2.15.0.jar
share/unifi/lib/log4j-slf4j-impl-${LOG4J_V}.jar
share/unifi/lib/mongo-java-driver-3.4.3.jar
share/unifi/lib/openssh-1.0.jar
share/unifi/lib/org.eclipse.paho.client.mqttv3-1.1.0.jar

15
net/unifi/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.27 2021/12/14 10:09:15 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.28 2021/12/15 10:53:13 sthen Exp $
.if defined(V)
COMMENT = controller for Ubiquiti uniFi (wifi/routing/switching/voip)
@ -7,7 +7,8 @@ _BV = ${BUILD_V:C/^http[^-]*-([0-9a-f]{10}).*/-\1/}
MASTER_SITES ?= https://dl.ui.com/unifi/${V}${_BV}/
MASTER_SITES0 = https://spacehopper.org/mirrors/
MASTER_SITES1 = https://dl.ubnt-ut.com/snmp/
MASTER_SITES2 = https://dlcdn.apache.org/logging/log4j/2.15.0/
LOG4J_V = 2.16.0
MASTER_SITES2 = https://dlcdn.apache.org/logging/log4j/${LOG4J_V}/
DISTFILES += unifi-$V{UniFi.unix}.zip \
unifi_sh_api-$V{unifi_sh_api} \
@ -26,8 +27,8 @@ DISTFILES += snappy-java-${SNAPPY_V}${SNAPPY_S}.jar:0
REPLACE_LOG4J ?= No
.if ${REPLACE_LOG4J} == Yes
DISTFILES += apache-log4j-2.15.0-bin.tar.gz:2
EXTRACT_ONLY += apache-log4j-2.15.0-bin.tar.gz
DISTFILES += apache-log4j-${LOG4J_V}-bin.tar.gz:2
EXTRACT_ONLY += apache-log4j-${LOG4J_V}-bin.tar.gz
.endif
CATEGORIES = net
@ -61,7 +62,7 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}/UniFi
INSTDIR = ${PREFIX}/share/unifi/
VERSION ?= $V.0
SUBST_VARS = VERSION
SUBST_VARS += VERSION LOG4J_V
pre-extract:
.if ${FETCH_PACKAGES:L} == no
@ -85,8 +86,8 @@ do-configure:
.if ${REPLACE_LOG4J} == Yes
@echo "** Overriding vulnerable log4j versions"; echo
. for l4j_comp in log4j-api log4j-core log4j-slf4j-impl
@ln -fs ${l4j_comp}-2.15.0.jar ${WRKSRC}/lib/${l4j_comp}-*jar
@${INSTALL_DATA} ${WRKDIR}/apache-log4j-*/${l4j_comp}-2.15.0.jar ${WRKSRC}/lib
@ln -fs ${l4j_comp}-${LOG4J_V}.jar ${WRKSRC}/lib/${l4j_comp}-*jar
@${INSTALL_DATA} ${WRKDIR}/apache-log4j-*/${l4j_comp}-${LOG4J_V}.jar ${WRKSRC}/lib
@cd ${WRKSRC}; ls -l lib/${l4j_comp}*; echo
. endfor
.endif