contrib/uhttpd: add patch to fix linking on recent distros, refresh environment patch

diff --git a/contrib/uhttpd/patches/001-pass-env.patch b/contrib/uhttpd/patches/001-pass-env.patch
index b69ff176532aeb737ccd5eae657ce0e3314c8fe1..ab607dbf2d726f90b08359e6b369a5270990432f 100644 (file)
--- 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 (file)
index 0000000..8bdd335
--- /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 dc852df8b08a0f946261da22d28fd26f1a37fbe7..8a1834ecf818412912fbed1ea958ca8393f29442 100644 (file)
--- a/contrib/uhttpd/patches/series
+++ b/contrib/uhttpd/patches/series
@@ -1 +1,2 @@
 001-pass-env.patch
+002-link-order.patch