Changeset 30108

Timestamp:

2012-02-04T21:11:28+01:00 (6 years ago)

Author:

jow

Message:

[packages_10.03.2] nginx: merge r28511, r29361

Location:

branches/packages_10.03.2/net/nginx

Files:

• Makefile (modified) (5 diffs)
• patches/001-feature_test_fix (deleted)
• patches/002-sizeof_test_fix (deleted)
• patches/101-feature_test_fix.patch (copied) (copied from packages/net/nginx/patches/101-feature_test_fix.patch)
• patches/102-sizeof_test_fix.patch (copied) (copied from packages/net/nginx/patches/102-sizeof_test_fix.patch)
• patches/103-sys_nerr.patch (copied) (copied from packages/net/nginx/patches/103-sys_nerr.patch)

branches/packages_10.03.2/net/nginx/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9 +9 @@
 
 PKG_NAME:=nginx
-PKG_VERSION:=0.7.67
-PKG_RELEASE:=3
+PKG_VERSION:=1.0.10
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://sysoev.ru/nginx/
-PKG_MD5SUM:=b6e175f969d03a4d3c5643aaabc6a5ff
+PKG_SOURCE_URL:=http://nginx.org/download/
+PKG_MD5SUM:=930b297b00fa1018fb0a1dd3e6b7e17e
 
 PKG_BUILD_PARALLEL:=1
@@ -32 +32 @@
   SUBMENU:=Web Servers/Proxies
   TITLE:=Nginx web server
-  URL:=http://nginx.net/
+  URL:=http://nginx.org/
   DEPENDS:=+libpcre +NGINX_SSL:libopenssl +zlib
   MENU:=1
@@ -38 +38 @@
 
 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 a free, open-source, high-performance HTTP server
+  and reverse proxy, as well as an IMAP/POP3 proxy server,
+  written by Igor Sysoev.
 endef
 
 define Package/nginx/config
-        source "$(SOURCE)/Config.in"
+  source "$(SOURCE)/Config.in"
 endef
 
@@ -98 +98 @@
 endef
 
-define Build/Compile
-        $(call Build/Compile/Default,build)
-endef
-
 define Package/nginx/install
         $(INSTALL_DIR) $(1)/usr/sbin
         $(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
+        $(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)