From 4acd393eba179f7dfe70f647e3798bc8d10c783a Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 22 Dec 2016 15:13:37 +0100
Subject: [PATCH] Update information on building httpd and wget helpers

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 networking/httpd_helpers.sh                 | 24 +++++++++++++++++++++
 networking/ssl_helper-wolfssl/README        | 17 ++++++---------
 networking/ssl_helper-wolfssl/ssl_helper.sh |  4 ++--
 3 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100755 networking/httpd_helpers.sh

diff --git a/networking/httpd_helpers.sh b/networking/httpd_helpers.sh
new file mode 100755
index 000000000..8eaa2d456
--- /dev/null
+++ b/networking/httpd_helpers.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+PREFIX="i486-linux-uclibc-"
+OPTS="-static -static-libgcc \
+-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+-Wall -Wshadow -Wwrite-strings -Wundef -Wstrict-prototypes -Werror \
+-Wold-style-definition -Wdeclaration-after-statement -Wno-pointer-sign \
+-Wmissing-prototypes -Wmissing-declarations \
+-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer \
+-ffunction-sections -fdata-sections -fno-guess-branch-probability \
+-funsigned-char \
+-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1 \
+-march=i386 -mpreferred-stack-boundary=2 \
+-Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections"
+
+${PREFIX}gcc \
+${OPTS} \
+-Wl,-Map -Wl,index.cgi.map \
+httpd_indexcgi.c -o index.cgi && strip index.cgi
+
+${PREFIX}gcc \
+${OPTS} \
+-Wl,-Map -Wl,httpd_ssi.map \
+httpd_ssi.c -o httpd_ssi && strip httpd_ssi
diff --git a/networking/ssl_helper-wolfssl/README b/networking/ssl_helper-wolfssl/README
index ff46f4bdf..34d676da0 100644
--- a/networking/ssl_helper-wolfssl/README
+++ b/networking/ssl_helper-wolfssl/README
@@ -5,18 +5,15 @@ http://busybox.net/downloads/binaries/
 
 Build instructions:
 
-* Unpack wolfssl-3.6.8.zip
-* Build it:
-  ./configure --enable-static --disable-shared && make
-* Drop this directory into wolfssl-3.6.8/ssl_helper
-* Run ssl_helper.sh to compile and link the helper
-
 * Unpack wolfssl-3.9.8.tar.gz from https://github.com/wolfSSL/wolfssl/releases
+  to a wolfssl-3.9.8 subdirectory here.
 * Create configure:
-  ./autogen.sh
-* Build it: see 00cfg-wolfssl-3.9.8 shell script
-* Drop this directory into wolfssl-x.y.z/ssl_helper
-* Run ssl_helper.sh to compile and link the helper
+	(cd wolfssl-* && ./autogen.sh)
+* Build it: see
+	(cd wolfssl-* && ../00cfg-wolfssl-3.9.8)
+* Run
+	./ssl_helper.sh
+  to compile and link the helper
 
 Usage: "ssl_helper -d FILE_DESCRIPTOR" where FILE_DESCRIPTOR is open to the peer.
 
diff --git a/networking/ssl_helper-wolfssl/ssl_helper.sh b/networking/ssl_helper-wolfssl/ssl_helper.sh
index c6cbf353f..8f20963c5 100755
--- a/networking/ssl_helper-wolfssl/ssl_helper.sh
+++ b/networking/ssl_helper-wolfssl/ssl_helper.sh
@@ -7,6 +7,6 @@ STATIC="-static"
 #PREFIX=""
 #STATIC=""
 
-${PREFIX}gcc -Os -Wall -I.. -c ssl_helper.c -o ssl_helper.o
-${PREFIX}gcc $STATIC --start-group ssl_helper.o -lm ../src/.libs/libwolfssl.a --end-group -o ssl_helper
+${PREFIX}gcc -Os -Wall -I wolfssl-* -c ssl_helper.c -o ssl_helper.o
+${PREFIX}gcc $STATIC --start-group ssl_helper.o -lm wolfssl-*/src/.libs/libwolfssl.a --end-group -o ssl_helper
 ${PREFIX}strip ssl_helper