Changeset 15830


Ignore:
Timestamp:
2009-05-13T22:25:20+02:00 (8 years ago)
Author:
nico
Message:

[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
Location:
packages/net/lighttpd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/lighttpd/Makefile

    r15660 r15830  
    1010PKG_NAME:=lighttpd 
    1111PKG_VERSION:=1.4.22 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.lighttpd.net/download/ 
    1616PKG_MD5SUM:=ed4ca3897eadf419c893b03fee53c982 
     17 
     18PKG_FIXUP:=libtool 
    1719 
    1820include $(INCLUDE_DIR)/package.mk 
     
    196198define Package/lighttpd-mod-webdav 
    197199  $(call Package/lighttpd/Default) 
    198   DEPENDS:=lighttpd +libsqlite3 +libxml2 
     200  DEPENDS:=lighttpd +libsqlite3 +libuuid +libxml2 
    199201  TITLE:=WebDAV module 
    200202endef 
    201  
    202  
    203 ifneq ($(CONFIG_LARGEFILE),y) 
    204   DISABLE_LARGEFILE:=--disable-lfs 
    205 endif 
    206  
    207 DISABLE_IPV6:= 
    208203 
    209204CONFIGURE_ARGS+= \ 
     
    213208        --enable-static \ 
    214209        --disable-rpath \ 
    215         $(DISABLE_LARGEFILE) \ 
    216         $(DISABLE_IPV6) \ 
    217210        --without-attr \ 
    218211        --without-bzip2 \ 
     
    226219        --with-pcre \ 
    227220        --without-valgrind \ 
    228         --with-webdav-props \ 
    229221 
    230222CONFIGURE_VARS+= \ 
    231         CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2 $$$$CPPFLAGS" \ 
    232223        PCRE_LIB="-lpcre" \ 
     224 
     225ifneq ($(CONFIG_LARGEFILE),y) 
     226  CONFIGURE_ARGS+= \ 
     227        --disable-lfs 
     228endif 
     229 
     230ifneq ($(SDK)$(CONFIG_PACKAGE_lighttpd-mod-webdav),) 
     231  CONFIGURE_ARGS+= \ 
     232        --with-webdav-locks \ 
     233        --with-webdav-props 
     234  # XXX: needed by sqlite3 to prevent segfaults in mod_webdav.so 
     235  CONFIGURE_VARS+= \ 
     236        LIBS="-lpthread" 
     237else 
     238  CONFIGURE_ARGS+= \ 
     239        --without-webdav-locks \ 
     240        --without-webdav-props 
     241endif 
     242 
     243define Build/Configure 
     244$(call Build/Configure/Default) 
     245        # XXX: override pcre (mis)detection by ./configure when cross-compiling 
     246        echo "#define HAVE_LIBPCRE 1" >>$(PKG_BUILD_DIR)/config.h 
     247        echo "#define HAVE_PCRE_H 1" >>$(PKG_BUILD_DIR)/config.h 
     248endef 
    233249 
    234250define Build/Compile 
     
    237253 
    238254define Package/lighttpd/conffiles 
    239 /etc/lighttpd.conf 
     255/etc/lighttpd/lighttpd.conf 
    240256/etc/default/lighttpd 
    241257endef 
    242258 
    243259define Package/lighttpd/install 
    244         $(INSTALL_DIR) $(1)/etc 
    245         $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/ 
     260        $(INSTALL_DIR) $(1)/etc/lighttpd 
     261        $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/ 
    246262        $(INSTALL_DIR) $(1)/etc/default 
    247263        $(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd 
  • packages/net/lighttpd/files/lighttpd.conf

    r15247 r15830  
    1818#       "mod_ssi", 
    1919#       "mod_usertrack", 
    20 #       "mod_expire" 
     20#       "mod_expire", 
     21#       "mod_webdav" 
    2122#) 
    2223 
     
    221222## the above is same as: 
    222223#var.a=1 
     224 
     225#### webdav 
     226#$HTTP["url"] =~ "^/webdav($|/)" { 
     227# webdav.activate = "enable" 
     228# webdav.is-readonly = "enable" 
     229# webdav.sqlite-db-name = "/var/run/lighttpd-webdav-lock.db" 
     230#} 
  • packages/net/lighttpd/files/lighttpd.default

    r15247 r15830  
    1 OPTIONS="-f /etc/lighttpd.conf" 
     1OPTIONS="-f /etc/lighttpd/lighttpd.conf" 
Note: See TracChangeset for help on using the changeset viewer.