Changeset 30108


Ignore:
Timestamp:
2012-02-04T21:11:28+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] nginx: merge r28511, r29361

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

Legend:

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

    r26061 r30108  
    11# 
    2 # Copyright (C) 2009-2010 OpenWrt.org 
     2# Copyright (C) 2009-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=nginx 
    11 PKG_VERSION:=0.7.67 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.0.10 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=http://sysoev.ru/nginx/ 
    16 PKG_MD5SUM:=b6e175f969d03a4d3c5643aaabc6a5ff 
     15PKG_SOURCE_URL:=http://nginx.org/download/ 
     16PKG_MD5SUM:=930b297b00fa1018fb0a1dd3e6b7e17e 
    1717 
    1818PKG_BUILD_PARALLEL:=1 
     
    3232  SUBMENU:=Web Servers/Proxies 
    3333  TITLE:=Nginx web server 
    34   URL:=http://nginx.net/ 
     34  URL:=http://nginx.org/ 
    3535  DEPENDS:=+libpcre +NGINX_SSL:libopenssl +zlib 
    3636  MENU:=1 
     
    3838 
    3939define Package/nginx/description 
    40         Nginx is a free, open-source, high-performance HTTP server 
    41         and reverse proxy, as well as an IMAP/POP3 proxy server, 
    42         written by Igor Sysoev. 
     40  Nginx is a free, open-source, high-performance HTTP server 
     41  and reverse proxy, as well as an IMAP/POP3 proxy server, 
     42  written by Igor Sysoev. 
    4343endef 
    4444 
    4545define Package/nginx/config 
    46         source "$(SOURCE)/Config.in" 
     46  source "$(SOURCE)/Config.in" 
    4747endef 
    4848 
     
    9898endef 
    9999 
    100 define Build/Compile 
    101         $(call Build/Compile/Default,build) 
    102 endef 
    103  
    104100define Package/nginx/install 
    105101        $(INSTALL_DIR) $(1)/usr/sbin 
    106102        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/ 
    107103        $(INSTALL_DIR) $(1)/etc/nginx 
    108         $(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx 
     104        $(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/ 
    109105        # make nginx bind on both IPv4 and IPv6 by default, when available 
    110106  ifeq ($(CONFIG_IPV6),y) 
Note: See TracChangeset for help on using the changeset viewer.