Updated lighttpd.

8 files changed, 80 insertions, 49 deletions

diff --git a/data/lighttpd/.beer b/data/lighttpd/.beer
new file mode 100644
index 000000000..a5ded175a
--- /dev/null
+++ b/data/lighttpd/.beer
@@ -0,0 +1,74 @@
+{
+    "name": "Lighttpd",
+    "description": "Small memory footprint, flexible web-server",
+    "url": "https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.tar.xz",
+    "mirror": null,
+    "homepage": "https://www.lighttpd.net/",
+    "depends": [
+        {
+            "depend": "autoconf",
+            "build-depend": true
+        },
+        {
+            "depend": "automake",
+            "build-depend": true
+        },
+        {
+            "depend": "libtool",
+            "build-depend": true
+        },
+        {
+            "depend": "pkg-config",
+            "build-depend": true
+        },
+        {
+            "depend": "openldap",
+            "build-depend": false
+        },
+        {
+            "depend": "openssl",
+            "build-depend": false
+        },
+        {
+            "depend": "pcre",
+            "build-depend": false
+        }
+    ],
+    "resource": [],
+    "conflicts": [],
+    "patches": [],
+    "install": [
+        "args = %W[",
+        "--disable-dependency-tracking",
+        "--disable-silent-rules",
+        "--prefix=#{prefix}",
+        "--sbindir=#{bin}",
+        "--with-openssl",
+        "--with-ldap",
+        "--with-zlib",
+        "--with-bzip2",
+        "]",
+        "system \"./autogen.sh\"",
+        "system \"./configure\", *args",
+        "system \"make\", \"install\"",
+        "unless File.exist? config_path",
+        "config_path.install \"doc/config/lighttpd.conf\", \"doc/config/modules.conf\"",
+        "(config_path/\"conf.d/\").install Dir[\"doc/config/conf.d/*.conf\"]",
+        "inreplace config_path+\"lighttpd.conf\" do |s|",
+        "s.sub!(/^var\\.log_root\\s*=\\s*\".+\"$/, \"var.log_root    = \\\"#{log_path}\\\"\")",
+        "s.sub!(/^var\\.server_root\\s*=\\s*\".+\"$/, \"var.server_root = \\\"#{www_path}\\\"\")",
+        "s.sub!(/^var\\.state_dir\\s*=\\s*\".+\"$/, \"var.state_dir   = \\\"#{run_path}\\\"\")",
+        "s.sub!(/^var\\.home_dir\\s*=\\s*\".+\"$/, \"var.home_dir    = \\\"#{run_path}\\\"\")",
+        "s.sub!(/^var\\.conf_dir\\s*=\\s*\".+\"$/, \"var.conf_dir    = \\\"#{config_path}\\\"\")",
+        "s.sub!(/^server\\.port\\s*=\\s*80$/, \"server.port = 8080\")",
+        "s.sub!(%r{^server\\.document-root\\s*=\\s*server_root \\+ \"\\/htdocs\"$}, \"server.document-root = server_root\")",
+        "s.sub!(/^server.use-ipv6\\s*=\\s*\"enable\"$/, 'server.use-ipv6 = \"disable\"')",
+        "s.sub!(/^server\\.username\\s*=\\s*\".+\"$/, 'server.username  = \"_www\"')",
+        "s.sub!(/^server\\.groupname\\s*=\\s*\".+\"$/, 'server.groupname = \"_www\"')",
+        "s.sub!(/^server\\.event-handler\\s*=\\s*\"linux-sysepoll\"$/, 'server.event-handler = \"select\"')",
+        "s.sub!(/^server\\.network-backend\\s*=\\s*\"sendfile\"$/, 'server.network-backend = \"writev\"')",
+        "s.sub!(/^server\\.max-connections = .+$/, \"server.max-connections = \" + (MAX_FDS / 2).to_s)"
+    ],
+    "version": "1.4.53",
+    "file": "lighttpd.rb"
+}
\ No newline at end of file
diff --git a/data/lighttpd/_metadata/version b/data/lighttpd/_metadata/version
index f689e8c1a..6406c9683 100644
--- a/data/lighttpd/_metadata/version
+++ b/data/lighttpd/_metadata/version
@@ -1 +1 @@
-1.4.18
+1.4.53
diff --git a/data/lighttpd/download.sh b/data/lighttpd/download.sh
new file mode 100755
index 000000000..cc686caa0
--- /dev/null
+++ b/data/lighttpd/download.sh
@@ -0,0 +1 @@
+wget https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.tar.xz
\ No newline at end of file
diff --git a/data/lighttpd/lighttpd-1.4.18.tar.gz b/data/lighttpd/lighttpd-1.4.18.tar.gz
deleted file mode 100644
index bdc298322..000000000
--- a/data/lighttpd/lighttpd-1.4.18.tar.gz
+++ /dev/null
diff --git a/data/lighttpd/lighttpd-1.4.53.tar.xz b/data/lighttpd/lighttpd-1.4.53.tar.xz
new file mode 100644
index 000000000..7db724b7e
--- /dev/null
+++ b/data/lighttpd/lighttpd-1.4.53.tar.xz
diff --git a/data/lighttpd/make.sh b/data/lighttpd/make.sh
index ec4b81037..79b771967 100644
--- a/data/lighttpd/make.sh
+++ b/data/lighttpd/make.sh
@@ -1,5 +1,6 @@
 pkg:setup
-autoconf
-PCRE_LIB=-lpcre pkg:configure --libdir=/usr/lib/lighttpd --with-bz2 --with-webdav-locks --with-webdav-props
-make
+./autogen.sh
+ac_cv_func_sendfile=no ac_cv_search_sendfilev=no pkg:configure --libdir=${PKG_TAPF}/lib/lighttpd --with-openssl --with-zlib --with-webdav-props
+# Mac: sendfile causes crashes.
+pkg:make
 pkg:install
diff --git a/data/lighttpd/pcre.diff b/data/lighttpd/pcre.diff
deleted file mode 100644
index 11cf2da07..000000000
--- a/data/lighttpd/pcre.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru lighttpd-1.4.18/configure.in lighttpd-1.4.18+iPhone/configure.in
---- lighttpd-1.4.18/configure.in	2007-08-29 00:49:56.000000000 +0000
-+++ lighttpd-1.4.18+iPhone/configure.in	2008-10-09 02:21:21.000000000 +0000
-@@ -259,15 +259,16 @@
-     CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
-     OLDLIBS="$LIBS"
-     LIBS="$LIBS $PCRE_LIB"
-+    LIBS="$OLDLIBS"
-+  fi
-+fi
-+
-     AC_CHECK_LIB(pcre, pcre_compile, [
-       AC_CHECK_HEADERS([pcre.h], [
-         AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
-         AC_DEFINE([HAVE_PCRE_H], [1])
-       ])
-     ])
--    LIBS="$OLDLIBS"
--  fi
--fi
- 
- AC_SUBST(PCRE_LIB)
- 
diff --git a/data/lighttpd/timestamp.diff b/data/lighttpd/timestamp.diff
deleted file mode 100644
index 420dfb6d9..000000000
--- a/data/lighttpd/timestamp.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru lighttpd-1.4.18/src/server.c lighttpd-1.4.18+iPhone/src/server.c
---- lighttpd-1.4.18/src/server.c	2007-09-05 10:39:56.000000000 +0000
-+++ lighttpd-1.4.18+iPhone/src/server.c	2008-06-18 03:52:58.000000000 +0000
-@@ -322,8 +322,7 @@
- # define TEXT_SSL
- #endif
- 	char *b = PACKAGE_NAME "-" PACKAGE_VERSION TEXT_SSL \
--" - a light and fast webserver\n" \
--"Build-Date: " __DATE__ " " __TIME__ "\n";
-+" - a light and fast webserver\n";
- ;
- #undef TEXT_SSL
- 	write(STDOUT_FILENO, b, strlen(b));
-@@ -458,7 +457,7 @@
- #else
- # define TEXT_SSL
- #endif
--	char *b = PACKAGE_NAME "-" PACKAGE_VERSION TEXT_SSL " ("__DATE__ " " __TIME__ ")" \
-+	char *b = PACKAGE_NAME "-" PACKAGE_VERSION TEXT_SSL \
- " - a light and fast webserver\n" \
- "usage:\n" \
- " -f <name>  filename of the config-file\n" \