From: Chet Ramey <chet.ramey@case.edu>
Date: Sat, 20 Apr 2019 18:27:00 +0000 (-0400)
Subject: Bash-5.0 patch 6: allow building with SYSLOG_HISTORY defined without defining SYSLOG_... 
X-Git-Tag: bash-5.1-alpha~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfd2cc6ac5558e252af0a7cb829a9629bf782e17;p=thirdparty%2Fbash.git

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

diff --git a/builtins/shopt.def b/builtins/shopt.def
index f6dc6f97c..1c4853611 100644
--- 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 1bc098b84..14bff9fc9 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 5
+#define PATCHLEVEL 6
 
 #endif /* _PATCHLEVEL_H_ */