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

unifi: switch log4j replacement to the proper upstream tar from ASF

Browse Source 
rather than the local mirrored version extracted from unifi 6.5.54.
files differ so REVISION bumped.
This commit is contained in:
sthen 2021-12-14 10:09:15 +00:00
parent 3b2abed7e5
commit 16a1609b98
6 changed files with 22 additions and 34 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.6 2021/12/13 22:14:59 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2021/12/14 10:09:15 sthen Exp $
V= 5.14.23
SNAPPY_V= 1.1.8.4
SNAPPY_S= -libc++.8.0
REVISION= 6
REVISION= 7
REPLACE_LOG4J= Yes

8
net/unifi/5.14/distinfo
View File

@ -1,16 +1,12 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (log4j-api-2.15.0.jar) = yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
SHA256 (log4j-core-2.15.0.jar) = QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
SHA256 (log4j-slf4j-impl-2.15.0.jar) = /WVKGqCzQZa+QaqeHlM2JJPxqJEJ/5Mcea0tWMyQ6qY=
SHA256 (apache-log4j-2.15.0-bin.tar.gz) = /ZEH1uEo1Jd5e+nMxfgMTTNs6Gy9aO5UEqm8gpjDGjM=
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 (log4j-api-2.15.0.jar) = 301804
SIZE (log4j-core-2.15.0.jar) = 1789769
SIZE (log4j-slf4j-impl-2.15.0.jar) = 24231
SIZE (apache-log4j-2.15.0-bin.tar.gz) = 15107661
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

4
net/unifi/5.6/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2021/12/13 22:14:59 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2021/12/14 10:09:15 sthen Exp $
V= 5.6.42
SNAPPY_V= 1.1.2.6
SNAPPY_S=
REVISION= 10
REVISION= 11
.include <bsd.port.mk>

4
net/unifi/6.0/Makefile
View File

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

8
net/unifi/6.0/distinfo
View File

@ -1,16 +1,12 @@
SHA256 (UBNT-MIB) = 4Ar6EHXTLLq/9a93slrup9AL7Arp5CF3yCXsTbHCEco=
SHA256 (UBNT-UniFi-MIB) = zwR4LSXFy2Wjb9Sorkdmbi7MM74U2e14TlOyKsWqfDg=
SHA256 (log4j-api-2.15.0.jar) = yMM+fo4FSW2uac8MqsjDCSz/2TehZFJukpItLVZtClU=
SHA256 (log4j-core-2.15.0.jar) = QZqFEolZcbe09PM+Yg02ElTlyVUrkEsEdLCd3UpqIgs=
SHA256 (log4j-slf4j-impl-2.15.0.jar) = /WVKGqCzQZa+QaqeHlM2JJPxqJEJ/5Mcea0tWMyQ6qY=
SHA256 (apache-log4j-2.15.0-bin.tar.gz) = /ZEH1uEo1Jd5e+nMxfgMTTNs6Gy9aO5UEqm8gpjDGjM=
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 (log4j-api-2.15.0.jar) = 301804
SIZE (log4j-core-2.15.0.jar) = 1789769
SIZE (log4j-slf4j-impl-2.15.0.jar) = 24231
SIZE (apache-log4j-2.15.0-bin.tar.gz) = 15107661
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

28
net/unifi/Makefile.inc
View File

@ -1,16 +1,22 @@
# $OpenBSD: Makefile.inc,v 1.26 2021/12/13 22:14:59 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.27 2021/12/14 10:09:15 sthen Exp $
.if defined(V)
COMMENT = controller for Ubiquiti uniFi (wifi/routing/switching/voip)
_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/
DISTFILES += unifi-$V{UniFi.unix}.zip \
unifi_sh_api-$V{unifi_sh_api} \
UBNT-MIB:1 \
UBNT-UniFi-MIB:1
EXTRACT_ONLY = unifi-$V.zip
PKGNAME = unifi-$V
# unifi requires the native library component of snappy-java,
# upstream doesn't include an openbsd version; use a locally built
# one to replace.
@ -20,17 +26,10 @@ DISTFILES += snappy-java-${SNAPPY_V}${SNAPPY_S}.jar:0
REPLACE_LOG4J ?= No
.if ${REPLACE_LOG4J} == Yes
DISTFILES += log4j-api-2.15.0.jar:0 \
log4j-core-2.15.0.jar:0 \
log4j-slf4j-impl-2.15.0.jar:0
DISTFILES += apache-log4j-2.15.0-bin.tar.gz:2
EXTRACT_ONLY += apache-log4j-2.15.0-bin.tar.gz
.endif
EXTRACT_ONLY = unifi-$V.zip
PKGNAME = unifi-$V
MASTER_SITES0 = https://spacehopper.org/mirrors/
MASTER_SITES1 = https://dl.ubnt-ut.com/snmp/
CATEGORIES = net
HOMEPAGE = https://wiki.ubnt.com/UniFi_FAQ
@ -85,12 +84,9 @@ do-configure:
@cd ${WRKSRC}; ls -l lib/snappy-java*; echo
.if ${REPLACE_LOG4J} == Yes
@echo "** Overriding vulnerable log4j versions"; echo
. for l4j_comp l4j_ver in \
log4j-api 2.15.0 \
log4j-core 2.15.0 \
log4j-slf4j-impl 2.15.0
@ln -fs ${l4j_comp}-${l4j_ver}.jar ${WRKSRC}/lib/${l4j_comp}*jar
@${INSTALL_DATA} ${FULLDISTDIR}/${l4j_comp}-${l4j_ver}.jar ${WRKSRC}/lib
. 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
@cd ${WRKSRC}; ls -l lib/${l4j_comp}*; echo
. endfor
.endif