Set flags in config

no need to do it in init with sed.

3 files changed, 24 insertions, 7 deletions

diff --git a/config b/config
index 3e93a2e..8c0cddd 100644
--- a/config
+++ b/config
@@ -79,7 +79,7 @@ CONFIG_CROSS_COMPILER="gcc"
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
+CONFIG_EXTRA_LDLIBS="-ltls -lssl -lcrypto"
 CONFIG_USE_PORTABLE_CODE=y
 CONFIG_STACK_OPTIMIZATION_386=y
 CONFIG_STATIC_LIBGCC=y
diff --git a/init b/init
index 9770a2b..5f856a5 100755
--- a/init
+++ b/init
@@ -2,11 +2,11 @@
 
 rc-service networking start
 apk update
-apk add build-base xz mingw-w64-gcc
+apk add build-base xz mingw-w64-gcc git
 
 tar -xvzf include.tar.gz
-mv include/openssl /usr/x86_64-w64-mignw32/include
-mv include/tls.h /usr/x86_64-w64-mignw32/include
+mv include/openssl/ /usr/x86_64-w64-mingw32/include
+mv include/tls.h /usr/x86_64-w64-mingw32/include
 mv libtls.a /usr/x86_64-w64-mingw32/lib
 mv libssl.a /usr/x86_64-w64-mingw32/lib
 mv libcrypto.a /usr/x86_64-w64-mingw32/lib
@@ -15,6 +15,5 @@ cd busybox-w32
 cp /root/busybox-w32-packaging/config .config
 git apply /root/busybox-w32-packaging/test.patch
 sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config
-sed -i "s/CONFIG_EXTRA_LDLIBS=\"\"/CONFIG_EXTRA_LDLIBS=\"-ltls -lssl -lcrypto\"/g" .config
 make
 cp busybox.exe ..
diff --git a/test.patch b/test.patch
index 0f89645..38728ef 100644
--- a/test.patch
+++ b/test.patch
@@ -88,7 +88,7 @@ index 9f1dd67ec..7e8da6df2 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..b92f22d3e 100644
+index 6a64836fb..6a82f1fa4 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void)
@@ -117,7 +117,7 @@ index 6a64836fb..b92f22d3e 100644
 +        fflush_all();
 +
 +        struct tls *ctx = tls_client();
-+        if(tls == NULL)
++        if(ctx == NULL)
 +                bb_error_msg_and_die("Out of memory");
 +        struct tls_config *config = tls_config_new();
 +        if(config == NULL)
@@ -134,3 +134,21 @@ index 6a64836fb..b92f22d3e 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
+diff --git a/win32/mingw.c b/win32/mingw.c
+index 87e7ca602..7bad3e4fa 100644
+--- a/win32/mingw.c
++++ b/win32/mingw.c
+@@ -1214,11 +1214,13 @@ elevation_state(void)
+        return elevated | (enabled << 1);
+ }
+ 
++/*
+ int getuid(void)
+ {
+        return elevation_state() == (ELEVATED_PRIVILEGE | ADMIN_ENABLED) ?
+                                0 : DEFAULT_UID;
+ }
++*/
+ 
+ struct passwd *getpwnam(const char *name)
+ {