From 3dd1167ead9189b74e0c9a1fffeda09be418d687 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 19 Oct 2005 00:16:27 +0000 Subject: add a patch to provide a descent PATH to cgi, split in 3 packages (w/o ssl, w/ matrixssl & w/ openssl), add a restart command to init-script. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2174 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mini_httpd/patches/001-cgi_path.patch | 16 ++++++++++++++++ package/mini_httpd/patches/500-matrixssl.patch | 10 +++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 package/mini_httpd/patches/001-cgi_path.patch (limited to 'package/mini_httpd/patches') diff --git a/package/mini_httpd/patches/001-cgi_path.patch b/package/mini_httpd/patches/001-cgi_path.patch new file mode 100644 index 0000000000..c847d948b4 --- /dev/null +++ b/package/mini_httpd/patches/001-cgi_path.patch @@ -0,0 +1,16 @@ +diff -ruN mini_httpd-1.19-old/mini_httpd.c mini_httpd-1.19-new/mini_httpd.c +--- mini_httpd-1.19-old/mini_httpd.c 2005-10-19 01:11:24.000000000 +0200 ++++ mini_httpd-1.19-new/mini_httpd.c 2005-10-19 01:13:05.000000000 +0200 +@@ -138,10 +138,10 @@ + #define CGI_NICE 10 + #endif /* CGI_NICE */ + #ifndef CGI_PATH +-#define CGI_PATH "/usr/local/bin:/usr/ucb:/bin:/usr/bin" ++#define CGI_PATH "/usr/bin:/bin:/usr/sbin:/sbin" + #endif /* CGI_PATH */ + #ifndef CGI_LD_LIBRARY_PATH +-#define CGI_LD_LIBRARY_PATH "/usr/local/lib:/usr/lib" ++#define CGI_LD_LIBRARY_PATH "/usr/lib:/lib" + #endif /* CGI_LD_LIBRARY_PATH */ + #ifndef AUTH_FILE + #define AUTH_FILE ".htpasswd" diff --git a/package/mini_httpd/patches/500-matrixssl.patch b/package/mini_httpd/patches/500-matrixssl.patch index e2d83af88e..0ab8d68331 100644 --- a/package/mini_httpd/patches/500-matrixssl.patch +++ b/package/mini_httpd/patches/500-matrixssl.patch @@ -14,11 +14,11 @@ diff -ruN mini_httpd-1.19-orig/Makefile mini_httpd-1.19-3/Makefile +#SSL_OBJS = + +# MatrixSSL -+SSL_TREE = -+SSL_DEFS = -DUSE_SSL -DHAVE_MATRIXSSL -+SSL_INC = -+SSL_LIBS = -lmatrixssl -+SSL_OBJS = matrixssl_helper.o ++#SSL_TREE = ++#SSL_DEFS = -DUSE_SSL -DHAVE_MATRIXSSL ++#SSL_INC = ++#SSL_LIBS = -lmatrixssl ++#SSL_OBJS = matrixssl_helper.o -BINDIR = /usr/local/sbin -- cgit v1.2.3