Changeset 30213


Ignore:
Timestamp:
2012-02-05T16:21:29+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] lighttpd: merge r27726, r28146, r29253

Location:
branches/packages_10.03.2/net/lighttpd
Files:
1 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/lighttpd/Makefile

    r28147 r30213  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=lighttpd 
    11 PKG_VERSION:=1.4.28 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=1.4.29 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    15 PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x/ 
    16 PKG_MD5SUM:=586eb535d31ac299652495b058dd87c4 
     15PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x 
     16PKG_MD5SUM:=e6e67b09986cb504db630b5a86b2dd76 
    1717 
    1818PKG_FIXUP:=libtool 
     
    253253define Package/lighttpd/conffiles 
    254254/etc/lighttpd/lighttpd.conf 
    255 /etc/default/lighttpd 
    256255endef 
    257256 
     
    259258        $(INSTALL_DIR) $(1)/etc/lighttpd 
    260259        $(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/lighttpd/ 
    261         $(INSTALL_DIR) $(1)/etc/default 
    262         $(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd 
    263260        $(INSTALL_DIR) $(1)/etc/init.d 
    264261        $(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd 
  • branches/packages_10.03.2/net/lighttpd/files/lighttpd.init

    r15247 r30213  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3 
     4SERVICE_USE_PID=1 
     5 
    36START=50 
    47 
    5 BIN=lighttpd 
    6 DEFAULT=/etc/default/$BIN 
    7 LOG_D=/var/log/$BIN 
    8 RUN_D=/var/run 
    9 PID_F=$RUN_D/$BIN.pid 
    10  
    118start() { 
    12         [ -f $DEFAULT ] && . $DEFAULT 
    13         mkdir -p $LOG_D 
    14         mkdir -p $RUN_D 
    15         $BIN $OPTIONS 
     9        mkdir -m 0755 -p /var/log/lighttpd 
     10        service_start /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf 
    1611} 
    1712 
    1813stop() { 
    19         [ -f $PID_F ] && kill $(cat $PID_F) 
     14        service_stop /usr/sbin/lighttpd 
    2015} 
    2116 
Note: See TracChangeset for help on using the changeset viewer.