Changeset 30219


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

[packages_10.03.2] memcached: merge r29061, r29269, r29784

Location:
branches/packages_10.03.2/net/memcached
Files:
3 edited

Legend:

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

    r20398 r30219  
    11# 
    2 # Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de> 
     2# Copyright (C) 2009-2012 OpenWrt.org 
     3# Copyright (C) 2009-2012 Thomas Heil <heil@terminal-consulting.de> 
    34# 
    45# This is free software, licensed under the GNU General Public License v2. 
    56# See /LICENSE for more information. 
     7# 
    68 
    79include $(TOPDIR)/rules.mk 
    810 
    911PKG_NAME:=memcached 
    10 PKG_VERSION:=1.2.6 
     12PKG_VERSION:=1.4.11 
    1113PKG_RELEASE:=1 
    1214 
    1315PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1416PKG_SOURCE_URL:=http://memcached.googlecode.com/files 
    15 PKG_MD5SUM:=200d22f7ac2d114f74a6904552e9eb70 
     17PKG_MD5SUM:=50ee313639531d4d2f8eb9c688f58948 
     18 
     19PKG_INSTALL:=1 
    1620 
    1721include $(INCLUDE_DIR)/package.mk 
     
    2024  SECTION:=net 
    2125  CATEGORY:=Network 
    22   DEPENDS:=+libevent 
     26  DEPENDS:=+libevent +libpthread 
    2327  TITLE:=The high-performance, distributed memory object caching system 
    2428  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> 
     
    4347        --disable-docs \ 
    4448        --disable-dtrace \ 
     49        --disable-coverage \ 
    4550        --disable-sasl 
     51 
     52TARGET_CFLAGS += \ 
     53        -std=gnu99 
    4654 
    4755define Package/memcached/install 
    4856        $(INSTALL_DIR) $(1)/usr/bin 
    49         $(INSTALL_BIN) $(PKG_BUILD_DIR)/memcached $(1)/usr/bin/ 
     57        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/ 
    5058        $(INSTALL_DIR) $(1)/etc/config 
    5159        $(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached 
  • branches/packages_10.03.2/net/memcached/files/memcached.init

    r19913 r30219  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2011 OpenWrt.org 
     3 
    34START=80 
    45 
    5 start_service () { 
    6     local section="$1" 
    7         config_get user "$section" user 
    8         config_get maxconn "$section" maxconn 
    9         config_get listen "$section" listen 
    10         config_get port "$section" port 
    11         config_get memory "$section" memory 
     6start_instance () { 
     7        local section="$1" 
    128 
    13         memcached_args="-d -u ${user:-nobody} -c ${maxconn:-1024} -l ${listen:-0.0.0.0} -p ${port:-11211} -U ${port:-11211} -m ${memory:-64}" 
    14         memcached $memcached_args >/dev/null 2>&1 
     9        config_get user "$section" user 
     10        config_get maxconn "$section" maxconn 
     11        config_get listen "$section" listen 
     12        config_get port "$section" port 
     13        config_get memory "$section" memory 
     14 
     15        service_start /usr/bin/memcached -d -u ${user:-nobody} \ 
     16                -c ${maxconn:-1024} -l ${listen:-0.0.0.0} \ 
     17                -p ${port:-11211} -U ${port:-11211} -m ${memory:-64} 
    1518} 
    1619 
    1720start() { 
    18     config_load "memcached" 
    19         config_foreach start_service memcached 
     21        config_load 'memcached' 
     22        config_foreach start_instance 'memcached' 
    2023} 
    2124 
    2225stop() { 
    23     killall memcached 
     26        service_stop /usr/bin/memcached 
    2427} 
  • branches/packages_10.03.2/net/memcached/patches/100-fix_iov_max.patch

    r25295 r30219  
    11--- a/memcached.c 
    22+++ b/memcached.c 
    3 @@ -15,6 +15,10 @@ 
    4  std * 
    5   *  $Id$ 
     3@@ -13,6 +13,10 @@ 
     4  *      Anatoly Vorobey <mellon@pobox.com> 
     5  *      Brad Fitzpatrick <brad@danga.com> 
    66  */ 
    77+#ifndef __need_IOV_MAX 
Note: See TracChangeset for help on using the changeset viewer.