diff --git a/Aliases/php-embed@8.2 b/Aliases/php-embed@8.3 similarity index 100% rename from Aliases/php-embed@8.2 rename to Aliases/php-embed@8.3 diff --git a/Aliases/unit@1.31.1 b/Aliases/unit@1.32.0 similarity index 100% rename from Aliases/unit@1.31.1 rename to Aliases/unit@1.32.0 diff --git a/Formula/php-embed.rb b/Formula/php-embed.rb index c337588..743074d 100644 --- a/Formula/php-embed.rb +++ b/Formula/php-embed.rb @@ -2,9 +2,9 @@ class PhpEmbed < Formula desc "PHP library for embedding in applications" homepage "https://www.php.net/" # Should only be updated if the new version is announced on the homepage, https://www.php.net/ - url "https://www.php.net/distributions/php-8.2.5.tar.xz" - mirror "https://fossies.org/linux/www/php-8.2.5.tar.xz" - sha256 "800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76" + url "https://www.php.net/distributions/php-8.3.3.tar.xz" + mirror "https://fossies.org/linux/www/php-8.3.3.tar.xz" + sha256 "b0a996276fe21fe9ca8f993314c8bc02750f464c7b0343f056fb0894a8dfa9d1" license "PHP-3.01" livecheck do @@ -23,6 +23,8 @@ class PhpEmbed < Formula depends_on "php" on_macos do + depends_on "imap-uw" + # PHP build system incorrectly links system libraries # see https://github.com/php/php-src/issues/10680 patch :DATA @@ -150,6 +152,8 @@ def install if OS.mac? args << "--enable-dtrace" + args << "--with-imap=#{Formula["imap-uw"].opt_prefix}" + args << "--with-imap-ssl=#{Formula["openssl@3"].opt_prefix}" args << "--with-ldap-sasl" args << "--with-os-sdkpath=#{MacOS.sdk_path_if_needed}" else diff --git a/Formula/unit-java.rb b/Formula/unit-java.rb index 0862f42..ca799de 100644 --- a/Formula/unit-java.rb +++ b/Formula/unit-java.rb @@ -1,13 +1,13 @@ class UnitJava < Formula desc "Java module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openjdk@11" depends_on "openssl" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" def install system "./configure", diff --git a/Formula/unit-perl.rb b/Formula/unit-perl.rb index d7fe4ab..cf1b6cf 100644 --- a/Formula/unit-perl.rb +++ b/Formula/unit-perl.rb @@ -1,13 +1,13 @@ class UnitPerl < Formula desc "Perl module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openssl" depends_on "perl" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" def install system "./configure", diff --git a/Formula/unit-php.rb b/Formula/unit-php.rb index 5ec1152..1d47b6c 100644 --- a/Formula/unit-php.rb +++ b/Formula/unit-php.rb @@ -1,13 +1,13 @@ class UnitPhp < Formula desc "PHP module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openssl" depends_on "php-embed" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" def install system "./configure", diff --git a/Formula/unit-python.rb b/Formula/unit-python.rb index d98e494..6145c8e 100644 --- a/Formula/unit-python.rb +++ b/Formula/unit-python.rb @@ -1,13 +1,13 @@ class UnitPython < Formula desc "Python module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on maximum_macos: :big_sur depends_on "openssl" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" uses_from_macos "python" def install diff --git a/Formula/unit-python3.rb b/Formula/unit-python3.rb index 61d0dc5..3b05769 100644 --- a/Formula/unit-python3.rb +++ b/Formula/unit-python3.rb @@ -1,12 +1,12 @@ class UnitPython3 < Formula desc "Python3 module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openssl" depends_on "python3" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" def install system "./configure", diff --git a/Formula/unit-ruby.rb b/Formula/unit-ruby.rb index 30563c9..7d2b2be 100644 --- a/Formula/unit-ruby.rb +++ b/Formula/unit-ruby.rb @@ -1,13 +1,13 @@ class UnitRuby < Formula desc "Ruby module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openssl" depends_on "ruby" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" def install system "./configure", diff --git a/Formula/unit-wasm.rb b/Formula/unit-wasm.rb index e76d1ea..b630c77 100644 --- a/Formula/unit-wasm.rb +++ b/Formula/unit-wasm.rb @@ -1,14 +1,19 @@ class UnitWasm < Formula desc "Ruby module for Unit application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" + depends_on "rust" => :build depends_on "openssl" - depends_on "unit@1.31.1" + depends_on "unit@1.32.0" depends_on "wasmtime" + # uname -o does not seem to exist on macOS 12.7 currently used in github actions + # which leads to FTBFS on that target + patch :DATA + def install system "./configure", "--prefix=#{prefix}", @@ -33,5 +38,23 @@ def install "--include-path=#{HOMEBREW_PREFIX}/usr/include/", "--lib-path=#{HOMEBREW_PREFIX}/lib/" system "make", "wasm-install" + + system "./configure", "wasm-wasi-component" + system "make", "wasm-wasi-component-install" end end + +__END__ +diff --git a/auto/modules/wasm-wasi-component b/auto/modules/wasm-wasi-component +index bfb6ffcb..6c8258d7 100644 +--- a/auto/modules/wasm-wasi-component ++++ b/auto/modules/wasm-wasi-component +@@ -82,7 +82,7 @@ fi + $echo " + $NXT_WCM_MODULE module: $NXT_WCM_MOD_NAME" + + +-NXT_OS=$(uname -o) ++NXT_OS=$(uname -s) + + if [ $NXT_OS = "Darwin" ]; then + NXT_CARGO_CMD="cargo rustc --release --manifest-path src/wasm-wasi-component/Cargo.toml -- --emit link=target/release/libwasm_wasi_component.so -C link-args='-undefined dynamic_lookup'" diff --git a/Formula/unit.rb b/Formula/unit.rb index e1c3af3..868b0ee 100644 --- a/Formula/unit.rb +++ b/Formula/unit.rb @@ -1,8 +1,8 @@ class Unit < Formula desc "Dynamic web and application server" homepage "https://unit.nginx.org" - url "https://unit.nginx.org/download/unit-1.31.1.tar.gz" - sha256 "9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71" + url "https://unit.nginx.org/download/unit-1.32.0.tar.gz" + sha256 "4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20" head "https://github.com/nginx/unit.git", branch: "master" depends_on "openssl" @@ -10,8 +10,8 @@ class Unit < Formula depends_on "pkg-config" resource "njs" do - url "https://hg.nginx.org/njs/archive/0.8.0.tar.gz" - sha256 "c6645f07f89b52d8169492f1101a767ce93d46554f48d3330cae343bee4c1695" + url "https://hg.nginx.org/njs/archive/0.8.2.tar.gz" + sha256 "86915b5046661466b324e08300696a74b8ffbe9b69fa9acbc10e9c487ac98cf8" end def install