--- a/components/bash/patches/solaris-002.Makefile.in.3.patch Fri Jan 27 15:04:39 2017 -0800
+++ b/components/bash/patches/solaris-002.Makefile.in.3.patch Thu Jan 26 12:24:45 2017 +0100
@@ -1,24 +1,11 @@
---- Makefile.in 2009-12-30 10:05:40.000000000 -0800
-+++ Makefile.in 2011-02-04 16:31:01.659698136 -0800
-@@ -137,7 +137,7 @@
- STATIC_LD = @STATIC_LD@
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
-
--SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS)
-+SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS)
-
- BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \
- $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES)
-@@ -535,7 +535,7 @@
-
- $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
- $(RM) $@
-- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s
- ls -l $(Program)
- -$(SIZE) $(Program)
-
-@@ -549,10 +549,10 @@
+# Our compiler flags contain percent sign which get mixed up with percent sign
+# seprators used by sed.
+#
+# Submitted to [email protected]
+
+--- Makefile.in 2016-12-06 14:52:25.890038489 +0100
++++ Makefile.in 2016-12-06 14:52:15.493002959 +0100
+@@ -584,10 +584,11 @@ $(Program): .build $(OBJECTS) $(BUILTIN
@echo
bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
@@ -26,10 +13,11 @@
- -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
- -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
- -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
-+ @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \
-+ -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \
-+ -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \
-+ -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \
++ @s=$$(printf '\001'); \
++ sed -e "s$${s}!MACHINE!$${s}$(Machine)$${s}" -e "s$${s}!OS!$${s}$(OS)$${s}" \
++ -e "s$${s}!CFLAGS!$${s}$(CCFLAGS)$${s}" -e "s$${s}!CC!$${s}$(CC)$${s}" \
++ -e "s$${s}!RELEASE!$${s}$(Version)$${s}" -e "s$${s}!PATCHLEVEL!$${s}$(PatchLevel)$${s}" \
++ -e "s$${s}!MACHTYPE!$${s}$(MACHTYPE)$${s}" -e "s$${s}!RELSTATUS!$${s}$(RELSTATUS)$${s}" \
$(SUPPORT_SRC)bashbug.sh > $@
@chmod a+rx bashbug