sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 09:36:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

*/*unit*: update NGINX Unit: 1.34.0 -> 1.34.1

Browse source 
<ChangeLog>

*) Bugfix: fix instability issues due to OpenTelemetry (OTEL) support.

*) Bugfix: fix issues with building OpenTelemetry (OTEL) support on
   various platforms, including macOS.

</ChangeLog>
This commit is contained in:
Sergey A. Osokin 2025-01-13 10:27:11 -05:00
parent aead8dedad
commit 59fe21aef9
8 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
devel/unit-otel/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1734820740
SHA256 (unit-1.34.0.tar.gz) = d3fa2615ce43ae70858d44233e98268f82e27ee9f2f6488a9ea77f73250822bf
SIZE (unit-1.34.0.tar.gz) = 1054742
TIMESTAMP = 1736716947
SHA256 (unit-1.34.1.tar.gz) = 6c4d7c4b2356b0183fd53d8fdd757a0a757e4202074f445966ac7b08b6c72e44
SIZE (unit-1.34.1.tar.gz) = 1054774
SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627

8
www/unit-java/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1734740170
SHA256 (unit-1.34.0.tar.gz) = d3fa2615ce43ae70858d44233e98268f82e27ee9f2f6488a9ea77f73250822bf
SIZE (unit-1.34.0.tar.gz) = 1054742
TIMESTAMP = 1736717296
SHA256 (unit-1.34.1.tar.gz) = 6c4d7c4b2356b0183fd53d8fdd757a0a757e4202074f445966ac7b08b6c72e44
SIZE (unit-1.34.1.tar.gz) = 1054774
SHA256 (classgraph-4.8.179.jar) = 16558357f234052370109127a45d69a9bd6d8646925594792634486dc48b159d
SIZE (classgraph-4.8.179.jar) = 576120
SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5
@ -29,5 +29,3 @@ SHA256 (tomcat-util-9.0.98.jar) = 53b1cc1957bf977a6c148d1616e2db98cf61fb457104e8
SIZE (tomcat-util-9.0.98.jar) = 234073
SHA256 (tomcat-util-scan-9.0.98.jar) = e913f286446c267c92923b1432f248a052cf3fef4138db05e0108795b8f2cf69
SIZE (tomcat-util-scan-9.0.98.jar) = 228085
SHA256 (18381b103f3e6e5ffceb122d6f0fe74d749ef5e5.patch) = 03c98536e1e6320fb8cc071bbd3eb964bb1a3e1d53c0cb4e1b2e95b933f256fa
SIZE (18381b103f3e6e5ffceb122d6f0fe74d749ef5e5.patch) = 2923

1
www/unit-wasm/Makefile
View file

@ -1,5 +1,4 @@
PKGNAMESUFFIX= -${UNIT_MODNAME}
PORTREVISION= 4
UNIT_MODNAME= wasm

5
www/unit/Makefile
View file

@ -1,13 +1,10 @@
PORTNAME= unit
PORTVERSION= ${UNIT_VERSION}
PORTREVISION?= 1
PORTREVISION?= 0
CATEGORIES= www
MASTER_SITES?= https://unit.nginx.org/download/
DISTFILES?= ${PORTNAME}-${PORTVERSION}.tar.gz
PATCH_SITES= https://github.com/nginx/unit/commit/
PATCHFILES= 18381b103f3e6e5ffceb122d6f0fe74d749ef5e5.patch:-p1
MAINTAINER= osa@FreeBSD.org
COMMENT?= Dynamic web application server
WWW= https://unit.nginx.org

6
www/unit/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1734834304
SHA256 (unit-1.34.0.tar.gz) = d3fa2615ce43ae70858d44233e98268f82e27ee9f2f6488a9ea77f73250822bf
SIZE (unit-1.34.0.tar.gz) = 1054742
TIMESTAMP = 1736715807
SHA256 (unit-1.34.1.tar.gz) = 6c4d7c4b2356b0183fd53d8fdd757a0a757e4202074f445966ac7b08b6c72e44
SIZE (unit-1.34.1.tar.gz) = 1054774
SHA256 (18381b103f3e6e5ffceb122d6f0fe74d749ef5e5.patch) = 03c98536e1e6320fb8cc071bbd3eb964bb1a3e1d53c0cb4e1b2e95b933f256fa
SIZE (18381b103f3e6e5ffceb122d6f0fe74d749ef5e5.patch) = 2923

35
www/unit/files/extra-patch-auto-make
View file

@ -1,31 +1,22 @@
--- auto/make.orig 2024-12-19 01:30:03 UTC
--- auto/make.orig 2025-01-10 16:45:42 UTC
+++ auto/make
@@ -22,7 +22,7 @@ RUST_FLAGS =
EXTRA_CFLAGS =
CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS \$(EXTRA_CFLAGS)
RUST_FLAGS =
-NXT_OTEL_LIB_LOC =
+NXT_OTEL_LIB_LOC = %%LOCALBASE%%/lib/libotel.a
@@ -43,7 +43,7 @@ RUST_FLAGS = --release
cat << END >> $NXT_MAKEFILE
NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
@@ -84,11 +84,6 @@ cat << END >> $NXT_MAKEFILE
if [ $NXT_OTEL = YES ]; then
cat << END >> $NXT_MAKEFILE
-ifeq (\$D,1)
- NXT_OTEL_LIB_LOC = $NXT_OTEL_LIB_DIR/target/debug/libotel.a
-else
- NXT_OTEL_LIB_LOC = $NXT_OTEL_LIB_DIR/target/release/libotel.a
-endif
RUST_FLAGS = --release
-NXT_OTEL_LIB_STATIC = $NXT_BUILD_DIR/lib/libotel.a
+NXT_OTEL_LIB_STATIC = %%LOCALBASE%%/lib/libotel.a
END
fi
@@ -580,7 +575,5 @@ NXT_OTEL_DEPS=" \
@@ -585,10 +585,5 @@ NXT_OTEL_DEPS=" \
cat << END >> $NXT_MAKEFILE
-\$(NXT_OTEL_LIB_LOC): $NXT_OTEL_DEPS
- cargo build \$(RUST_FLAGS) --manifest-path $NXT_OTEL_LIB_DIR/Cargo.toml
-\$(NXT_OTEL_LIB_STATIC): $NXT_OTEL_DEPS
- \$(PP_CR) \$@
- \$(v)cargo rustc \$(RUST_FLAGS) \\
- --manifest-path $NXT_OTEL_LIB_DIR/Cargo.toml \\
- -- --emit link=../../$NXT_BUILD_DIR/lib/libotel.a
END
fi

17
www/unit/files/patch-auto_otel Normal file
View file

@ -0,0 +1,17 @@
--- auto/otel.orig 2025-01-13 14:51:13 UTC
+++ auto/otel
@@ -8,14 +8,12 @@ if [ $NXT_OTEL = YES ]; then
$echo -n " - checking for rust compiler ... "
if [ -z $(which rustc 2>/dev/null) ]; then
$echo "not found"
- exit 1;
fi
$echo "found"
$echo -n " - checking for cargo ... "
if [ -z $(which cargo 2>/dev/null) ]; then
$echo "not found."
- exit 1;
fi
$echo "found"

2
www/unit/version.mk
View file

@ -2,6 +2,6 @@
UNITVERSION_MK= defined
# Define NGINX Unit's version.
UNIT_VERSION= 1.34.0
UNIT_VERSION= 1.34.1
.endif # UNITVERSION_MK