omnibus-software 23.7.295 → 3002.0.0

data/config/patches/ruby/ruby-3.0.5-configure.patch

@@ -1,260 +0,0 @@
-diff -ur ruby-3.0.1/configure.ac ruby-3.0.1-patched/configure.ac
---- ruby-3.0.1/configure.ac	2021-04-05 05:33:42.000000000 -0700
-+++ ruby-3.0.1-patched/configure.ac	2021-04-09 12:42:35.578174106 -0700
-@@ -544,11 +544,16 @@
-     rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
- ])
- 
--RUBY_TRY_CFLAGS(-fdeclspec, [
--  RUBY_APPEND_OPTIONS(CC, -fdeclspec)
--  RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
-+RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
-+AS_IF([test "$fdeclspec" = yes], [
-+    RUBY_APPEND_OPTIONS(CFLAGS, -fdeclspec)
-+    RUBY_APPEND_OPTIONS(cflags, -fdeclspec)
-+    RUBY_APPEND_OPTIONS(orig_cflags, -fdeclspec)
-+])
-+RUBY_TRY_CXXFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
-+AS_IF([test "$fdeclspec" = yes], [
-+    RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
- ])
--RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
- 
- AS_CASE([$RUBY_PATCHLEVEL], [-*],
- 	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
-@@ -1494,7 +1499,9 @@
- 	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
- 			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
-     ])
-+])
- 
-+{
-     AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
- 	AC_TRY_LINK([unsigned int atomic_var;],
- 		    [
-@@ -1525,7 +1532,6 @@
-     AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
- 	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
-     ])
--])
- 
-     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
-     [RUBY_WERROR_FLAG(
-@@ -1538,6 +1544,7 @@
-     AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
- 	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
-     ])
-+}
- 
- AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
- rb_cv_func_exported=no
-diff -ur ruby-3.0.1/template/Makefile.in ruby-3.0.1-patched/template/Makefile.in
---- ruby-3.0.1/template/Makefile.in	2021-04-05 05:33:42.000000000 -0700
-+++ ruby-3.0.1-patched/template/Makefile.in	2021-04-09 12:42:35.579834751 -0700
-@@ -75,7 +75,7 @@
- CC_VERSION = @CC_VERSION@
- OUTFLAG = @OUTFLAG@$(empty)
- COUTFLAG = @COUTFLAG@$(empty)
--CPPOUTFLAG = $(COUTFLAG)
-+CPPOUTFLAG = >
- ARCH_FLAG = @ARCH_FLAG@
- CFLAGS_NO_ARCH = @CFLAGS@
- CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
-diff -ur ruby-3.0.5/configure configure
---- ruby-3.0.5/configure	2022-11-24 12:04:58
-+++ configure	2022-12-05 14:06:03
-@@ -10384,6 +10384,8 @@
- fi
- 
- 
-+    save_LDFLAGS="$LDFLAGS"
-+    LDFLAGS="$LDFLAGS -fdeclspec"
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CFLAGS" >&5
- printf %s "checking whether -fdeclspec is accepted as CFLAGS... " >&6; }
-     save_CFLAGS="$CFLAGS"
-@@ -10400,7 +10402,6 @@
- fi
- ac_c_werror_flag=yes
- 
--    CFLAGS="$CFLAGS -fdeclspec"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10412,56 +10413,72 @@
-   return 0;
- }
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  fdeclspec=yes
-+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+  printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
-+else $as_nop
-+  fdeclspec=no
-+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+  printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext conftest.beam
-+
-+CFLAGS="$save_CFLAGS"
-+save_CFLAGS=
-+if test "${rb_c_werror_flag+set}"
- then :
- 
--  # RUBY_APPEND_OPTIONS(CC)
-+  ac_c_werror_flag="$rb_c_werror_flag"
-+
-+else $as_nop
-+
-+  unset ac_c_werror_flag
-+
-+fi
-+    LDFLAGS="$save_LDFLAGS"
-+    save_LDFLAGS=
-+
-+if test "$fdeclspec" = yes; then :
-+
-+    # RUBY_APPEND_OPTIONS(CFLAGS)
- 	for rb_opt in -fdeclspec; do
--	case " ${CC-} " in #(
-+	case " ${CFLAGS-} " in #(
-   *" ${rb_opt} "*) :
-      ;; #(
-   '  ') :
--     CC="${rb_opt}" ;; #(
-+     CFLAGS="${rb_opt}" ;; #(
-   *) :
--     CC="$CC ${rb_opt}" ;;
-+     CFLAGS="$CFLAGS ${rb_opt}" ;;
- esac
- 	done
--  # RUBY_APPEND_OPTIONS(MJIT_CC)
-+    # RUBY_APPEND_OPTIONS(cflags)
- 	for rb_opt in -fdeclspec; do
--	case " ${MJIT_CC-} " in #(
-+	case " ${cflags-} " in #(
-   *" ${rb_opt} "*) :
-      ;; #(
-   '  ') :
--     MJIT_CC="${rb_opt}" ;; #(
-+     cflags="${rb_opt}" ;; #(
-   *) :
--     MJIT_CC="$MJIT_CC ${rb_opt}" ;;
-+     cflags="$cflags ${rb_opt}" ;;
- esac
- 	done
-+    # RUBY_APPEND_OPTIONS(orig_cflags)
-+	for rb_opt in -fdeclspec; do
-+	case " ${orig_cflags-} " in #(
-+  *" ${rb_opt} "*) :
-+     ;; #(
-+  '  ') :
-+     orig_cflags="${rb_opt}" ;; #(
-+  *) :
-+     orig_cflags="$orig_cflags ${rb_opt}" ;;
-+esac
-+	done
- 
--	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--    printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
--else $as_nop
--
--	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--    printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
- fi
--rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- 
--CFLAGS="$save_CFLAGS"
--save_CFLAGS=
--if test "${rb_c_werror_flag+set}"
--then :
- 
--  ac_c_werror_flag="$rb_c_werror_flag"
--
--else $as_nop
--
--  unset ac_c_werror_flag
--
--fi
--
--
--
-     save_CXXFLAGS="$CXXFLAGS"
-     CXXFLAGS="$CXXFLAGS -fdeclspec"
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CXXFLAGS" >&5
-@@ -10499,21 +10516,11 @@
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"
- then :
--  # RUBY_APPEND_OPTIONS(CXX)
--	for rb_opt in -fdeclspec; do
--	case " ${CXX-} " in #(
--  *" ${rb_opt} "*) :
--     ;; #(
--  '  ') :
--     CXX="${rb_opt}" ;; #(
--  *) :
--     CXX="$CXX ${rb_opt}" ;;
--esac
--	done
-+  fdeclspec=yes
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-     printf "%s\n" "${msg_result_yes}yes${msg_reset}" >&6 ; }
- else $as_nop
--
-+  fdeclspec=no
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-     printf "%s\n" "${msg_result_no}no${msg_reset}" >&6 ; }
- fi
-@@ -10541,7 +10548,22 @@
-     CXXFLAGS="$save_CXXFLAGS"
-     save_CXXFLAGS=
- 
-+if test "$fdeclspec" = yes; then :
- 
-+    # RUBY_APPEND_OPTIONS(CXXFLAGS)
-+	for rb_opt in -fdeclspec; do
-+	case " ${CXXFLAGS-} " in #(
-+  *" ${rb_opt} "*) :
-+     ;; #(
-+  '  ') :
-+     CXXFLAGS="${rb_opt}" ;; #(
-+  *) :
-+     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
-+esac
-+	done
-+
-+fi
-+
- case $RUBY_PATCHLEVEL in #(
-   -*) :
-     RUBY_DEVEL=yes ;; #(
-@@ -20529,6 +20551,9 @@
- 
- fi
- 
-+fi
-+
-+{
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic builtins" >&5
- printf %s "checking for __atomic builtins... " >&6; }
- if test ${rb_cv_gcc_atomic_builtins+y}
-@@ -20616,8 +20641,6 @@
- 
- fi
- 
--fi
--
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
- printf %s "checking for __builtin_unreachable... " >&6; }
- if test ${rb_cv_func___builtin_unreachable+y}
-@@ -20680,6 +20703,7 @@
- 
- 
- fi
-+}
- 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for exported function attribute" >&5
- printf %s "checking for exported function attribute... " >&6; }
-

data/config/patches/ruby/ruby-aix-atomic.patch

@@ -1,11 +0,0 @@
---- ruby-2.1.2/ruby_atomic.h.orig	2014-09-29 14:08:29.000000000 -0500
-+++ ruby-2.1.2/ruby_atomic.h	2014-09-29 14:08:41.000000000 -0500
-@@ -117,7 +117,7 @@
- # endif
- 
- #else
--typedef int rb_atomic_t;
-+typedef long rb_atomic_t;
- #define NEED_RUBY_ATOMIC_OPS
- extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
- extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr,

data/config/patches/ruby/ruby-aix-configure_26_and_later.patch

@@ -1,19 +0,0 @@
---- ruby-2.6.0/configure.orig	2019-01-28 19:31:52.000000000 -0800
-+++ ruby-2.6.0/configure	2019-01-28 19:30:18.000000000 -0800
-@@ -26791,6 +26791,7 @@
- 			    LDSHARED="$LDSHARED ${linker_flag}-G"
-
- fi
-+			DLDFLAGS='-eInit_$(TARGET)'
- 			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
- 			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
- 			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
-@@ -28066,7 +28067,8 @@
- esac
- 	done
- 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
--	LIBS="$LIBS -lm -lc"
-+	LIBS="$LIBS -lm -lc -lz"
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).a'
- 	 ;; #(
-   darwin*) :

data/config/patches/ruby/ruby-aix-vm-core.patch

@@ -1,14 +0,0 @@
---- ruby-2.1.2/vm_core.h.orig	2014-09-29 14:05:24.000000000 -0500
-+++ ruby-2.1.2/vm_core.h	2014-09-29 14:05:39.000000000 -0500
-@@ -392,9 +392,9 @@
- 
-     /* postponed_job */
-     struct rb_postponed_job_struct *postponed_job_buffer;
--    int postponed_job_index;
-+    long postponed_job_index;
- 
--    int src_encoding_index;
-+    long src_encoding_index;
- 
-     VALUE verbose, debug, orig_progname, progname;
-     VALUE coverages;

data/config/patches/ruby/ruby-fast-load_26.patch

@@ -1,16 +0,0 @@
-diff --git a/load.c b/load.c
-index 576464fb68..ae89f63820 100644
---- a/load.c
-+++ b/load.c
-@@ -908,6 +908,11 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level, feature_func
-        if (loading) *path = rb_filesystem_str_new_cstr(loading);
-        return 'r';
-     }
-+    else if ((ft = rb_feature_p(ftptr, 0, FALSE, FALSE, &loading)) == 's') {
-+       if (loading) *path = rb_filesystem_str_new_cstr(loading);
-+       return 's';
-+    }
-+
-     tmp = fname;
-     type = rb_find_file_ext_safe(&tmp, loadable_ext, safe_level);
-     switch (type) {

data/config/patches/ruby/ruby-fast-load_31.patch

@@ -1,16 +0,0 @@
-diff --git a/load.c b/load.c
-index a2b9da4..05ea96e 100644
---- a/load.c
-+++ b/load.c
-@@ -981,6 +981,11 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_
-        if (loading) *path = rb_filesystem_str_new_cstr(loading);
-        return 'r';
-     }
-+    else if ((ft = rb_feature_p(vm, ftptr, 0, FALSE, FALSE, &loading)) == 's') {
-+       if (loading) *path = rb_filesystem_str_new_cstr(loading);
-+       return 's';
-+    }
-+
-     tmp = fname;
-     type = rb_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext);
-     switch (type) {

data/config/patches/ruby/ruby-faster-load_26.patch

@@ -1,11 +0,0 @@
---- a/load.c
-+++ b/load.c
-@@ -605,7 +605,7 @@ rb_load_internal0(rb_execution_context_t *ec, VALUE fname, int wrap)
- 	    rb_parser_set_context(parser, NULL, FALSE);
- 	    ast = (rb_ast_t *)rb_parser_load_file(parser, fname);
- 	    iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"),
--			    fname, rb_realpath_internal(Qnil, fname, 1), NULL);
-+			    fname, fname, NULL);
- 	    rb_ast_dispose(ast);
- 	}
-         rb_exec_event_hook_script_compiled(ec, iseq, Qnil);

data/config/patches/ruby/ruby-faster-load_27.patch

@@ -1,11 +0,0 @@
---- ruby-2.7.0/load.c.orig	2020-02-26 12:19:04.963826602 -0800
-+++ ruby-2.7.0/load.c	2020-02-26 12:28:55.865876051 -0800
-@@ -578,7 +578,7 @@
-         rb_parser_set_context(parser, NULL, FALSE);
-         ast = (rb_ast_t *)rb_parser_load_file(parser, fname);
-         iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"),
--                               fname, rb_realpath_internal(Qnil, fname, 1), NULL);
-+                               fname, fname, NULL);
-         rb_ast_dispose(ast);
-     }
-     rb_exec_event_hook_script_compiled(ec, iseq, Qnil);

data/config/patches/ruby/ruby-mkmf.patch

@@ -1,29 +0,0 @@
---- a/lib/mkmf.rb	2016-06-16 16:19:13.000000000 -0400
-+++ b/lib/mkmf.rb	2016-06-16 16:23:08.000000000 -0400
-@@ -365,6 +365,17 @@
-   end
- 
-   def libpath_env
-+    # Patch for aix
-+    # Ideally applications should not need LIBPATH/LD_LIBRARY_PATH set
-+    # and should rely on the embedded paths in binaries/shared objects
-+    # For chef say on AIX we already build using -blibpath and
-+    # LD_RUN_PATH, so the extensions built using chef embedded ruby
-+    # (using rbconfig) should have correct paths set.
-+    # Setting LIBPATH overrides the behaviour of programs invoked from
-+    # chef built ruby, for example xlc ends up picking up libiconv built
-+    # within chef embedded ruby libs instead of the one from /usr/lib
-+    return {}
-+
-     # used only if native compiling
-     if libpathenv = config_string("LIBPATHENV")
-       pathenv = ENV[libpathenv]
-@@ -1799,7 +1810,7 @@
-   #
-   if !CROSS_COMPILING
-     case CONFIG['build_os']
--    when 'mingw32'
-+    when 'mingw32', 'mingw64'
-       def mkintpath(path)
-         # mingw uses make from msys and it needs special care
-         # converts from C:\some\path to /C/some/path

data/config/patches/ruby/ruby-no-stack-protector-strong.patch

@@ -1,11 +0,0 @@
---- ruby-2.6.5/configure.old	2019-12-06 13:03:20.962288441 -0800
-+++ ruby-2.6.5/configure	2019-12-06 13:03:32.242919275 -0800
-@@ -8409,7 +8409,7 @@
- esac
-     if test -z "${stack_protector+set}"; then :
- 
--	for opt in -fstack-protector-strong -fstack-protector
-+	for opt in -fstack-protector
- do :
- 
- 

data/config/patches/ruby/ruby-no-stack-protector.patch

@@ -1,13 +0,0 @@
-diff --git a/configure.dist b/configure
-index d83c15a..bd4813c 100755
---- a/configure.dist
-+++ b/configure
-@@ -7491,7 +7491,7 @@ main ()
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  stack_protector=yes
-+  stack_protector=no
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else

data/config/patches/ruby/ruby-win32_warning_removal.patch

@@ -1,12 +0,0 @@
---- a/ext/win32/lib/Win32API.rb
-+++ b/ext/win32/lib/Win32API.rb
-@@ -1,9 +1,6 @@
- # -*- ruby -*-
- # frozen_string_literal: true
- 
--# for backward compatibility
--warn "Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead", uplevel: 2
--
- require 'fiddle/import'
- 
- class Win32API

data/config/patches/ruby/ruby_aix_openssl.patch

@@ -1,10 +0,0 @@
---- ruby-1.9.3-p547/ext/openssl/extconf.rb.orig	2014-07-15 17:50:30 -0500
-+++ ruby-1.9.3-p547/ext/openssl/extconf.rb	2014-07-15 17:50:39 -0500
-@@ -34,6 +34,7 @@
- end
- 
- Logging::message "=== Checking for system dependent stuff... ===\n"
-+have_library("z", "inflate")
- have_library("nsl", "t_open")
- have_library("socket", "socket")
- have_header("assert.h")

data/config/patches/ruby/ruby_aix_ssl_EAGAIN.patch

@@ -1,19 +0,0 @@
---- ruby-2.1.3/ext/openssl/lib/openssl/ssl.rb_orig	2014-10-24 13:09:44.000000000 -0500
-+++ ruby-2.1.3/ext/openssl/lib/openssl/ssl.rb	2014-10-24 13:11:01.000000000 -0500
-@@ -194,7 +194,15 @@
-         begin
-           ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
-           ssl.sync_close = true
--          ssl.accept if @start_immediately
-+          if @start_immediately
-+            # Retry on EAGAIN (may be due to underlying inprogress for TLS handshake or renegotiation requested.)
-+            # Any other error is rescued further.
-+             begin
-+              ssl.accept
-+            rescue Errno::EAGAIN
-+              retry
-+            end
-+          end
-           ssl
-         rescue SSLError => ex
-           sock.close

data/config/patches/ruby/rvm-cflags.patch

@@ -1,27 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -267,11 +267,9 @@
-     cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
- test -z "warnflags" ||
-     cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
--if test -z "${CFLAGS+set}"; then
--    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
--    orig_cflags="$cflags"
--    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
--fi
-+cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-+orig_cflags="$cflags"
-+cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
- if test -z "${CXXFLAGS+set}"; then
-     cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-     orig_cxxflags="$cxxflags"
-@@ -511,7 +509,8 @@
-     ])
- fi
-
--test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
-+test -z "${ac_env_CFLAGS_set}" && CFLAGS="$ARCH_FLAG"
-+test -n "${cflags:+set}" && eval CFLAGS="\"$cflags\${CFLAGS:+ $CFLAGS}\""
- test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
-
- dnl check for large file stuff

data/config/patches/stunnel/stunnel-on-windows.patch

@@ -1,42 +0,0 @@
-diff --git a/src/mingw.mk b/src/mingw.mk
-index 244602f..055c425 100644
---- a/src/mingw.mk
-+++ b/src/mingw.mk
-@@ -12,7 +12,7 @@
- bindir = ../bin/$(win32_mingw)
- objdir = ../obj/$(win32_mingw)
-
--win32_ssl_dir = /opt/openssl-$(win32_mingw)
-+win32_ssl_dir = $(WIN32_SSL_DIR_PATCHED)
- win32_cppflags = -I$(win32_ssl_dir)/include
- win32_cflags = -mthreads -fstack-protector -O2
- win32_cflags += -Wall -Wextra -Wpedantic -Wformat=2 -Wconversion -Wno-long-long
-@@ -34,7 +34,8 @@ win32_cli_objs = $(addsuffix .o, $(addprefix $(objdir)/, $(win32_cli)))
-
- win32_prefix = $(win32_targetcpu)-w64-mingw32-
- win32_cc = $(win32_prefix)gcc
--win32_windres = $(win32_prefix)windres
-+# Our build system only has windres.exe, no prefix
-+win32_windres = windres
-
- all: mkdirs $(bindir)/stunnel.exe $(bindir)/tstunnel.exe
-
-diff --git a/src/stunnel.c b/src/stunnel.c
-index 00637b0..5a6a0a1 100644
---- a/src/stunnel.c
-+++ b/src/stunnel.c
-@@ -46,7 +46,13 @@
- #pragma GCC diagnostic ignored "-pedantic"
- #endif /* __GNUC__ */
-
--#include <openssl/applink.c>
-+/*
-+ * Maybe we could remove
-+ * omnibus-software/config/patches/openssl-fips/openssl-fips-fix-compiler-flags-table-for-msys.patch
-+ * and leave this include here? Building applink into openssl broke some version
-+ * of Ruby
-+ */
-+/* #include <openssl/applink.c> */
-
- #ifdef __GNUC__
- #pragma GCC diagnostic pop

data/config/patches/zlib/zlib-windows-relocate.patch

@@ -1,20 +0,0 @@
---- zlib-1.2.8/win32/Makefile.gcc.orig	2016-02-11 13:46:54.000000000 -0500
-+++ zlib-1.2.8/win32/Makefile.gcc	2016-02-11 13:53:08.000000000 -0500
-@@ -57,6 +57,8 @@
- RC = $(PREFIX)windres
- RCFLAGS = --define GCC_WINDRES
- 
-+IMAGE_BASE = 0x63300000
-+
- STRIP = $(PREFIX)strip
- 
- CP = cp -fp
-@@ -93,7 +95,7 @@
- $(IMPLIB): $(SHAREDLIB)
- 
- $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
--	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
-+	$(CC) -shared -Wl,--out-implib,$(IMPLIB),--image-base,$(IMAGE_BASE) $(LDFLAGS) \
- 	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
- 	$(STRIP) $@
- 

data/config/software/autoconf.rb

@@ -1,46 +0,0 @@
-#
-# Copyright:: Chef Software, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# expeditor/ignore: deprecated 2021-04
-
-name "autoconf"
-default_version "2.69"
-
-license "GPL-3.0"
-license_file "COPYING"
-license_file "COPYING.EXCEPTION"
-skip_transitive_dependency_licensing true
-
-dependency "m4"
-
-version("2.69") { source sha256: "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" }
-
-source url: "https://ftp.gnu.org/gnu/autoconf/autoconf-#{version}.tar.gz"
-
-relative_path "autoconf-#{version}"
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  if solaris2?
-    env["M4"] = "#{install_dir}/embedded/bin/m4"
-  end
-
-  command "./configure" \
-          " --prefix=#{install_dir}/embedded", env: env
-
-  make "-j #{workers}", env: env
-  make "install", env: env
-end

data/config/software/automake.rb

@@ -1,49 +0,0 @@
-#
-# Copyright 2012-2014 Chef Software, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# expeditor/ignore: deprecated 2021-04
-
-name "automake"
-default_version "1.16"
-
-dependency "autoconf"
-dependency "perl-thread-queue"
-
-license "GPL-2.0"
-license_file "COPYING"
-skip_transitive_dependency_licensing true
-
-version("1.16") { source sha256: "80da43bb5665596ee389e6d8b64b4f122ea4b92a685b1dbd813cd1f0e0c2d83f" }
-version("1.15") { source sha256: "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" }
-version("1.11.2") { source sha256: "c339e3871d6595620760725da61de02cf1c293af8a05b14592d6587ac39ce546" }
-
-source url: "https://ftp.gnu.org/gnu/automake/automake-#{version}.tar.gz"
-
-relative_path "automake-#{version}"
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  if version == "1.15"
-    command "./bootstrap.sh", env: env
-  else
-    command "./bootstrap", env: env
-  end
-  command "./configure" \
-          " --prefix=#{install_dir}/embedded", env: env
-
-  make "-j #{workers}", env: env
-  make "install", env: env
-end