Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined without defining SYSLOG_...

diff --git a/builtins/shopt.def b/builtins/shopt.def
index f6dc6f97cf3c2c4921b8a837076bcdc0b63a210b..1c4853611f5fbc278d87a67b1cc999a61e4ee24d 100644 (file)
--- a/builtins/shopt.def
+++ b/builtins/shopt.def
@@ -122,7 +122,7 @@ extern int assoc_expand_once;
 extern int array_expand_once;
 #endif
 
-#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT)
+#if defined (SYSLOG_HISTORY)
 extern int syslog_history;
 #endif
 

diff --git a/patchlevel.h b/patchlevel.h
index 1bc098b84f43c98059b287b9d16049ec84a76278..14bff9fc9b90c57e2f58dd403bfcb992576943f2 100644 (file)
--- 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 5
+#define PATCHLEVEL 6
 
 #endif /* _PATCHLEVEL_H_ */