[packages] nginx: update to version 1.2.1

[packages.git] / net / nginx / Makefile

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 40347f9..3545bf9 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/
-PKG_MD5SUM:=17da4802209b83d9bebb0f0edd975dfc
+PKG_MD5SUM:=ceacae12d66d1f021bf3737a0269b6f4
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_CONFIG_DEPENDS:=\
+PKG_CONFIG_DEPENDS := \
        CONFIG_NGINX_STUB_STATUS \
        CONFIG_NGINX_FLV \
        CONFIG_NGINX_SSL \
@@ -37,9 +37,8 @@ define Package/nginx
 endef
 
 define Package/nginx/description
-  Nginx is a free, open-source, high-performance HTTP server
-  and reverse proxy, as well as an IMAP/POP3 proxy server,
-  written by Igor Sysoev.
+ nginx is an HTTP and reverse proxy server, as well as a mail proxy server,
+ written by Igor Sysoev.
 endef
 
 define Package/nginx/config
@@ -102,10 +101,6 @@ define Package/nginx/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/nginx
        $(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
-       # make nginx bind on both IPv4 and IPv6 by default, when available
-  ifeq ($(CONFIG_IPV6),y)
-       $(SED) 's/listen\( \+\)80;/listen\1[::]:80;/' $(1)/etc/nginx/nginx.conf
-  endif
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
 endef