diff options
author | Alexander M Pickering <alex@cogarr.net> | 2024-11-07 14:56:42 -0600 |
---|---|---|
committer | Alexander M Pickering <alex@cogarr.net> | 2024-11-07 14:56:42 -0600 |
commit | 2ec47dc1b2019c5b375f85115c2d6477bc3fdfee (patch) | |
tree | 3748585ea35f31a79d8964d221dc0095de9e68d1 | |
parent | fda0531cd8a75f9983b709ac828a491c61747f7e (diff) | |
download | busybox-w32-packaging-2ec47dc1b2019c5b375f85115c2d6477bc3fdfee.tar.gz busybox-w32-packaging-2ec47dc1b2019c5b375f85115c2d6477bc3fdfee.tar.bz2 busybox-w32-packaging-2ec47dc1b2019c5b375f85115c2d6477bc3fdfee.zip |
Set flags in config
no need to do it in init with sed.
-rw-r--r-- | config | 2 | ||||
-rwxr-xr-x | init | 7 | ||||
-rw-r--r-- | test.patch | 22 |
3 files changed, 24 insertions, 7 deletions
@@ -79,7 +79,7 @@ CONFIG_CROSS_COMPILER="gcc" | |||
79 | CONFIG_SYSROOT="" | 79 | CONFIG_SYSROOT="" |
80 | CONFIG_EXTRA_CFLAGS="" | 80 | CONFIG_EXTRA_CFLAGS="" |
81 | CONFIG_EXTRA_LDFLAGS="" | 81 | CONFIG_EXTRA_LDFLAGS="" |
82 | CONFIG_EXTRA_LDLIBS="" | 82 | CONFIG_EXTRA_LDLIBS="-ltls -lssl -lcrypto" |
83 | CONFIG_USE_PORTABLE_CODE=y | 83 | CONFIG_USE_PORTABLE_CODE=y |
84 | CONFIG_STACK_OPTIMIZATION_386=y | 84 | CONFIG_STACK_OPTIMIZATION_386=y |
85 | CONFIG_STATIC_LIBGCC=y | 85 | CONFIG_STATIC_LIBGCC=y |
@@ -2,11 +2,11 @@ | |||
2 | 2 | ||
3 | rc-service networking start | 3 | rc-service networking start |
4 | apk update | 4 | apk update |
5 | apk add build-base xz mingw-w64-gcc | 5 | apk add build-base xz mingw-w64-gcc git |
6 | 6 | ||
7 | tar -xvzf include.tar.gz | 7 | tar -xvzf include.tar.gz |
8 | mv include/openssl /usr/x86_64-w64-mignw32/include | 8 | mv include/openssl/ /usr/x86_64-w64-mingw32/include |
9 | mv include/tls.h /usr/x86_64-w64-mignw32/include | 9 | mv include/tls.h /usr/x86_64-w64-mingw32/include |
10 | mv libtls.a /usr/x86_64-w64-mingw32/lib | 10 | mv libtls.a /usr/x86_64-w64-mingw32/lib |
11 | mv libssl.a /usr/x86_64-w64-mingw32/lib | 11 | mv libssl.a /usr/x86_64-w64-mingw32/lib |
12 | mv libcrypto.a /usr/x86_64-w64-mingw32/lib | 12 | mv libcrypto.a /usr/x86_64-w64-mingw32/lib |
@@ -15,6 +15,5 @@ cd busybox-w32 | |||
15 | cp /root/busybox-w32-packaging/config .config | 15 | cp /root/busybox-w32-packaging/config .config |
16 | git apply /root/busybox-w32-packaging/test.patch | 16 | git apply /root/busybox-w32-packaging/test.patch |
17 | sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config | 17 | sed -i "s/CONFIG_EXTRA_CFLAGS=\"\"/CONFIG_EXTRA_CFLAGS=\"$CFLAGS\"/g" .config |
18 | sed -i "s/CONFIG_EXTRA_LDLIBS=\"\"/CONFIG_EXTRA_LDLIBS=\"-ltls -lssl -lcrypto\"/g" .config | ||
19 | make | 18 | make |
20 | cp busybox.exe .. | 19 | cp busybox.exe .. |
@@ -88,7 +88,7 @@ index 9f1dd67ec..7e8da6df2 100644 | |||
88 | static void tls_xwrite(tls_state_t *tls, int len) | 88 | static void tls_xwrite(tls_state_t *tls, int len) |
89 | { | 89 | { |
90 | diff --git a/networking/wget.c b/networking/wget.c | 90 | diff --git a/networking/wget.c b/networking/wget.c |
91 | index 6a64836fb..b92f22d3e 100644 | 91 | index 6a64836fb..6a82f1fa4 100644 |
92 | --- a/networking/wget.c | 92 | --- a/networking/wget.c |
93 | +++ b/networking/wget.c | 93 | +++ b/networking/wget.c |
94 | @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) | 94 | @@ -689,6 +689,7 @@ static void reset_beg_range_to_zero(void) |
@@ -117,7 +117,7 @@ index 6a64836fb..b92f22d3e 100644 | |||
117 | + fflush_all(); | 117 | + fflush_all(); |
118 | + | 118 | + |
119 | + struct tls *ctx = tls_client(); | 119 | + struct tls *ctx = tls_client(); |
120 | + if(tls == NULL) | 120 | + if(ctx == NULL) |
121 | + bb_error_msg_and_die("Out of memory"); | 121 | + bb_error_msg_and_die("Out of memory"); |
122 | + struct tls_config *config = tls_config_new(); | 122 | + struct tls_config *config = tls_config_new(); |
123 | + if(config == NULL) | 123 | + if(config == NULL) |
@@ -134,3 +134,21 @@ index 6a64836fb..b92f22d3e 100644 | |||
134 | #endif | 134 | #endif |
135 | 135 | ||
136 | #if ENABLE_FEATURE_WGET_HTTPS | 136 | #if ENABLE_FEATURE_WGET_HTTPS |
137 | diff --git a/win32/mingw.c b/win32/mingw.c | ||
138 | index 87e7ca602..7bad3e4fa 100644 | ||
139 | --- a/win32/mingw.c | ||
140 | +++ b/win32/mingw.c | ||
141 | @@ -1214,11 +1214,13 @@ elevation_state(void) | ||
142 | return elevated | (enabled << 1); | ||
143 | } | ||
144 | |||
145 | +/* | ||
146 | int getuid(void) | ||
147 | { | ||
148 | return elevation_state() == (ELEVATED_PRIVILEGE | ADMIN_ENABLED) ? | ||
149 | 0 : DEFAULT_UID; | ||
150 | } | ||
151 | +*/ | ||
152 | |||
153 | struct passwd *getpwnam(const char *name) | ||
154 | { | ||