From 7a5fdbcdfa003cee008a40f27d3833005402f1b3 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 13 May 2009 20:25:20 +0000 Subject: [PATCH] [packages] lighttpd: - fix webdav support (closes: #4859) - move config file from /etc/lighttpd.conf to /etc/lighttpd/lighttpd.conf - fix pcre (mis)detection by configure - add commented webdav examples in config file - bump release number SVN-Revision: 15830 --- net/lighttpd/Makefile | 48 +++++++++++++++++++---------- net/lighttpd/files/lighttpd.conf | 10 +++++- net/lighttpd/files/lighttpd.default | 2 +- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index d8f9f36713..84d207f845 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd PKG_VERSION:=1.4.22 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.lighttpd.net/download/ PKG_MD5SUM:=ed4ca3897eadf419c893b03fee53c982 +PKG_FIXUP:=libtool + include $(INCLUDE_DIR)/package.mk define Package/lighttpd/Default @@ -195,25 +197,16 @@ endef define Package/lighttpd-mod-webdav $(call Package/lighttpd/Default) - DEPENDS:=lighttpd +libsqlite3 +libxml2 + DEPENDS:=lighttpd +libsqlite3 +libuuid +libxml2 TITLE:=WebDAV module endef - -ifneq ($(CONFIG_LARGEFILE),y) - DISABLE_LARGEFILE:=--disable-lfs -endif - -DISABLE_IPV6:= - CONFIGURE_ARGS+= \ --libdir=/usr/lib/lighttpd \ --sysconfdir=/etc/lighttpd \ --enable-shared \ --enable-static \ --disable-rpath \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_IPV6) \ --without-attr \ --without-bzip2 \ --without-fam \ @@ -225,24 +218,47 @@ CONFIGURE_ARGS+= \ --with-openssl="$(STAGING_DIR)/usr" \ --with-pcre \ --without-valgrind \ - --with-webdav-props \ CONFIGURE_VARS+= \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2 $$$$CPPFLAGS" \ PCRE_LIB="-lpcre" \ +ifneq ($(CONFIG_LARGEFILE),y) + CONFIGURE_ARGS+= \ + --disable-lfs +endif + +ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-webdav),) + CONFIGURE_ARGS+= \ + --with-webdav-locks \ + --with-webdav-props + # XXX: needed by sqlite3 to prevent segfaults in mod_webdav.so + CONFIGURE_VARS+= \ + LIBS="-lpthread" +else + CONFIGURE_ARGS+= \ + --without-webdav-locks \ + --without-webdav-props +endif + +define Build/Configure +$(call Build/Configure/Default) + # XXX: override pcre (mis)detection by ./configure when cross-compiling + echo "#define HAVE_LIBPCRE 1" >>$(PKG_BUILD_DIR)/config.h + echo "#define HAVE_PCRE_H 1" >>$(PKG_BUILD_DIR)/config.h +endef + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install endef define Package/lighttpd/conffiles -/etc/lighttpd.conf +/etc/lighttpd/lighttpd.conf /etc/default/lighttpd endef define Package/lighttpd/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/lighttpd + $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/ $(INSTALL_DIR) $(1)/etc/default $(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd $(INSTALL_DIR) $(1)/etc/init.d diff --git a/net/lighttpd/files/lighttpd.conf b/net/lighttpd/files/lighttpd.conf index 788ed64b6c..48d6d1806e 100644 --- a/net/lighttpd/files/lighttpd.conf +++ b/net/lighttpd/files/lighttpd.conf @@ -17,7 +17,8 @@ # "mod_cgi", # "mod_ssi", # "mod_usertrack", -# "mod_expire" +# "mod_expire", +# "mod_webdav" #) # force use of the "write" backend (closes: #2401) @@ -220,3 +221,10 @@ server.upload-dirs = ( "/tmp" ) #include_shell "echo var.a=1" ## the above is same as: #var.a=1 + +#### webdav +#$HTTP["url"] =~ "^/webdav($|/)" { +# webdav.activate = "enable" +# webdav.is-readonly = "enable" +# webdav.sqlite-db-name = "/var/run/lighttpd-webdav-lock.db" +#} diff --git a/net/lighttpd/files/lighttpd.default b/net/lighttpd/files/lighttpd.default index 649571e640..340a1d2788 100644 --- a/net/lighttpd/files/lighttpd.default +++ b/net/lighttpd/files/lighttpd.default @@ -1 +1 @@ -OPTIONS="-f /etc/lighttpd.conf" \ No newline at end of file +OPTIONS="-f /etc/lighttpd/lighttpd.conf" -- 2.30.2