From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 01:03:29 +0000 (-0500)
Subject: Bash-4.2 patch 20
X-Git-Tag: bash-4.3~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42a5896e24b901eeb849e4b01c0a721c981b65fd;p=thirdparty%2Fbash.git

Bash-4.2 patch 20
---

diff --git a/patchlevel.h b/patchlevel.h
index 8ce272811..cb416d345 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 19
+#define PATCHLEVEL 20
 
 #endif /* _PATCHLEVEL_H_ */
diff --git a/support/shobj-conf b/support/shobj-conf
index 5a63e80aa..c61dc78ba 100755
--- a/support/shobj-conf
+++ b/support/shobj-conf
@@ -157,7 +157,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*)
 	;;
 
 # Darwin/MacOS X
-darwin[89]*|darwin10*)
+darwin[89]*|darwin1[012]*)
 	SHOBJ_STATUS=supported
 	SHLIB_STATUS=supported
 	
@@ -186,7 +186,7 @@ darwin*|macosx*)
 	SHLIB_LIBSUFF='dylib'
 
 	case "${host_os}" in
-	darwin[789]*|darwin10*)	SHOBJ_LDFLAGS=''
+	darwin[789]*|darwin1[012]*)	SHOBJ_LDFLAGS=''
 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
 			;;
 	*)		SHOBJ_LDFLAGS='-dynamic'