netutils/dropbear: simplify port configuration and generated headers

Generate default_options_guard.h at build time instead of committing a
copy, inline the NuttX options into localoptions.h (dropping the
nuttx_localoptions.h wrapper), and use upstream compat.c usershell
functions instead of custom stubs. Bump the pinned Dropbear commit to
54ef47a now that the environ guard is upstream (mkj/dropbear#453) and
drop that hunk from patch 0001.

Signed-off-by: Felipe Moura <moura.fmo@gmail.com>

Author: FelipeMdeO

netutils/dropbear/CMakeLists.txt

@@ -78,6 +78,16 @@ if(CONFIG_NETUTILS_DROPBEAR)
           patch -s -N -l -p1 -d "${DROPBEAR_UNPACKNAME}" -i
           "${CMAKE_CURRENT_SOURCE_DIR}/patch/0007-use-nuttx-unused-macro.patch"
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+      message(STATUS "Generating default_options_guard.h")
+      execute_process(
+        COMMAND
+          sh
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/ifndef_wrapper.sh"
+        INPUT_FILE
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/default_options.h"
+        OUTPUT_FILE
+          "${CMAKE_CURRENT_SOURCE_DIR}/${DROPBEAR_UNPACKNAME}/src/default_options_guard.h"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
     endif()
   endif()
 

netutils/dropbear/Kconfig

@@ -114,8 +114,8 @@ config NETUTILS_DROPBEAR_SYSLOG
 
 config NETUTILS_DROPBEAR_COMMIT
 	string "Dropbear upstream commit"
-	default "038f4e3e2f3b947b132a4c5ca03ba3f83b00b7d2"
+	default "54ef47adf8c99b422be6a8f694f2866e62f88b9e"
 	---help---
-		Upstream Dropbear revision used by the ESP-IDF validation repo.
+		Upstream Dropbear (mkj/dropbear) commit to download and build.
 
 endif

netutils/dropbear/Makefile

@@ -165,6 +165,10 @@ $(DROPBEAR_UNPACKNAME): $(DROPBEAR_ZIP)
 	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0005-use-nuttx-passwd-auth.patch; true
 	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0006-allow-localoptions-to-override-tracking-malloc.patch; true
 	$(Q) $(PATCH) -s -N -l -p1 -d $(DROPBEAR_UNPACKNAME) -i $(APPDIR)$(DELIM)netutils$(DELIM)dropbear$(DELIM)patch$(DELIM)0007-use-nuttx-unused-macro.patch; true
+	@echo "Generating default_options_guard.h"
+	$(Q) sh $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)ifndef_wrapper.sh \
+		< $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)default_options.h \
+		> $(DROPBEAR_UNPACKNAME)$(DELIM)src$(DELIM)default_options_guard.h
 	$(Q) touch $(DROPBEAR_UNPACKNAME)
 
 ifeq ($(wildcard $(DROPBEAR_UNPACKNAME)/.git),)

netutils/dropbear/patch/0001-guard-platform-declarations.patch

@@ -1,17 +1,3 @@
---- a/src/includes.h
-+++ b/src/includes.h
-@@ -184,7 +184,11 @@ typedef u_int32_t uint32_t;
- #include <dlfcn.h>
- #endif
-
-+#ifdef DROPBEAR_NUTTX
-+/* NuttX provides environ as a macro in stdlib.h. */
-+#else
- extern char** environ;
-+#endif
-
- #include "fake-rfc2553.h"
-
 --- a/src/compat.c
 +++ b/src/compat.c
 @@ -81,6 +81,10 @@

netutils/dropbear/patch/0007-use-nuttx-unused-macro.patch

@@ -1,3 +1,22 @@
+--- a/src/compat.c
++++ b/src/compat.c
+@@ -89,6 +89,6 @@
+ #ifndef HAVE_GETUSERSHELL
+ static char **curshell, **shells, *strings;
+-static char **initshells();
++static char **initshells(void);
+ #endif
+
+ #ifndef HAVE_STRLCPY
+@@ -234,7 +234,7 @@
+ 	curshell = initshells();
+ }
+
+-static char **initshells() {
++static char **initshells(void) {
+ 	static const char *okshells[] = { COMPAT_USER_SHELLS, NULL };
+ 	register char **sp, *cp;
+ 	register FILE *fp;
 --- a/src/common-algo.c
 +++ b/src/common-algo.c
 @@ -39,16 +39,25 @@