Changeset 30245


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

[packages_10.03.2] pure-ftpd: merge r29054, r29290

Location:
branches/packages_10.03.2/net/pure-ftpd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/pure-ftpd/Makefile

    r26895 r30245  
    1010PKG_NAME:=pure-ftpd 
    1111PKG_VERSION:=1.0.32 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    6262CONFIGURE_ARGS += \ 
    6363        --with-everything \ 
    64         --with-virtualchroot 
     64        --with-virtualchroot \ 
     65        --without-capabilities \ 
    6566 
    6667ifeq ($(BUILD_VARIANT),tls) 
  • branches/packages_10.03.2/net/pure-ftpd/files/pure-ftpd.init

    r26895 r30245  
    11#!/bin/sh /etc/rc.common 
    22# Copyright (C) 2006-2011 OpenWrt.org 
     3 
    34START=50 
    45 
    5 SSD=start-stop-daemon 
    6 PIDF=/var/run/pure-ftpd.pid 
    7 PROG=/usr/sbin/pure-ftpd 
     6# TODO: allow multiple instance to run with different pid-files 
     7 
     8# XXX: pure-ftpd changes it's name to 'pure-ftpd (SERVER) ...' 
     9SERVICE_MATCH_EXEC= 
     10SERVICE_MATCH_NAME=1 
     11SERVICE_USE_PID=1 
    812 
    913append_bool() { 
     
    2529} 
    2630 
    27 start_service() { 
     31start_instance() { 
    2832        local section="$1" 
     33 
     34        config_get_bool enabled "$section" 'enabled' '1' 
     35        [ $enabled -gt 0 ] || return 1 
     36 
    2937        args="" 
    30  
    3138        append_string "$section" trustedgid "-a" 
    3239        append_string "$section" syslogfacility "-f" 
     
    8895        append_string "$section" authentication "-l" 
    8996 
    90         config_get_bool "enabled" "$section" "enabled" '1' 
    91         [ "$enabled" -gt 0 ] && $SSD -S -p $PIDF -q -x $PROG -- -g $PIDF -B $args 
    92 } 
    93  
    94 stop_service() { 
    95         killall pure-ftpd 2>&1 > /dev/null 
    96  
    97         # FIXME: Fix Busybox start-stop-daemon to work with multiple PIDs 
    98         # $SSD -K -p $PIDF -q 
     97        service_start /usr/sbin/pure-ftpd -B $args 
    9998} 
    10099 
    101100start() { 
    102101        config_load "pure-ftpd" 
    103         config_foreach start_service "pure-ftpd" 
     102        config_foreach start_instance "pure-ftpd" 
    104103} 
    105104 
    106105stop() { 
    107         config_load "pure-ftpd" 
    108         config_foreach stop_service "pure-ftpd" 
     106        service_stop /usr/sbin/pure-ftpd 
    109107} 
Note: See TracChangeset for help on using the changeset viewer.