diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-28 16:38:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-28 16:38:41 +0000 |
| commit | 3880b028fcf6160f7e305aa769ca4ae3ab3e43c8 (patch) | |
| tree | 082e2add6b8b120fc930699c0faac23b9e73ae5b | |
| parent | f2a428cdb31d4a77ee41e8bea5bd2dc307ae6356 (diff) | |
contrib/uhttpd: add patch to fix linking on recent distros, refresh environment patch
| -rw-r--r-- | contrib/uhttpd/patches/001-pass-env.patch | 4 | ||||
| -rw-r--r-- | contrib/uhttpd/patches/002-link-order.patch | 11 | ||||
| -rw-r--r-- | contrib/uhttpd/patches/series | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/contrib/uhttpd/patches/001-pass-env.patch b/contrib/uhttpd/patches/001-pass-env.patch index b69ff1765..ab607dbf2 100644 --- a/contrib/uhttpd/patches/001-pass-env.patch +++ b/contrib/uhttpd/patches/001-pass-env.patch @@ -1,7 +1,7 @@ --- a/uhttpd-cgi.c +++ b/uhttpd-cgi.c -@@ -204,7 +204,7 @@ void uh_cgi_request(struct client *cl, s - (pi->stat.st_mode & S_IXOTH) +@@ -216,7 +216,7 @@ void uh_cgi_request( + (pi->stat.st_mode & S_IXOTH)) || (ip != NULL) ) { /* build environment */ - clearenv(); diff --git a/contrib/uhttpd/patches/002-link-order.patch b/contrib/uhttpd/patches/002-link-order.patch new file mode 100644 index 000000000..8bdd3353e --- /dev/null +++ b/contrib/uhttpd/patches/002-link-order.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -70,7 +70,7 @@ endif + $(CC) $(CFLAGS) -c -o $@ $< + + compile: $(OBJ) $(TLSLIB) $(LUALIB) +- $(CC) -o uhttpd $(LDFLAGS) $(LIB) $(OBJ) ++ $(CC) -o uhttpd $(LDFLAGS) $(OBJ) $(LIB) + + clean: + rm -f *.o *.so uhttpd diff --git a/contrib/uhttpd/patches/series b/contrib/uhttpd/patches/series index dc852df8b..8a1834ecf 100644 --- a/contrib/uhttpd/patches/series +++ b/contrib/uhttpd/patches/series @@ -1 +1,2 @@ 001-pass-env.patch +002-link-order.patch |