config/software/stunnel.rb in omnibus-software-22.11.239 vs config/software/stunnel.rb in omnibus-software-23.2.281

- old
+ new

@@ -24,16 +24,16 @@ dependency "openssl" # version_list: url=https://www.stunnel.org/downloads/ filter=*.tar.gz -if version < "5.65" - source url: "https://www.stunnel.org/archive/5.x/stunnel-#{version}.tar.gz" -else - source url: "https://www.stunnel.org/downloads/stunnel-#{version}.tar.gz" -end +source url: "https://www.stunnel.org/archive/5.x/stunnel-#{version}.tar.gz" + relative_path "stunnel-#{version}" + +version("5.67") { source sha256: "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456" } +version("5.66") { source sha256: "558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c" } version("5.65") { source sha256: "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc" } version("5.64") { source sha256: "eebe53ed116ba43b2e786762b0c2b91511e7b74857ad4765824e7199e6faf883" } version("5.63") { source sha256: "c74c4e15144a3ae34b8b890bb31c909207301490bd1e51bfaaa5ffeb0a994617" } version("5.59") { source sha256: "137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f" } version("5.49") { source sha256: "3d6641213a82175c19f23fde1c3d1c841738385289eb7ca1554f4a58b96d955e" } @@ -56,10 +56,10 @@ # src/mingw.mk hardcodes and assumes SSL is at /opt so we patch and use # an env variable to redirect it to the correct location env["WIN32_SSL_DIR_PATCHED"] = "#{install_dir}/embedded" mingw = ENV["MSYSTEM"].downcase - target = (mingw == "mingw32" ? "mingw" : mingw) + target = (mingw == "mingw32" ? "mingw" : "mingw64") # Starting omnibus-toolchain version 1.1.115 we do not build msys2 as a part of omnibus-toolchain anymore, but pre install it in image # so here we set the path to default install of msys2 first and default to OMNIBUS_TOOLCHAIN_INSTALL_DIR for backward compatibility msys_path = ENV["MSYS2_INSTALL_DIR"] ? "#{ENV["MSYS2_INSTALL_DIR"]}" : "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin" make target, env: env, cwd: "#{project_dir}/src"