Changeset 28511


Ignore:
Timestamp:
2011-10-22T00:55:07+02:00 (6 years ago)
Author:
nico
Message:

[packages] nginx: update to latest stable 1.0.8 (closes: #8510)

Location:
packages/net/nginx
Files:
1 added
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • packages/net/nginx/Makefile

    r26061 r28511  
    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.8 
     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:=1049e5fc6e80339f6ba8668fadfb75f9 
    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) 
  • packages/net/nginx/patches/101-feature_test_fix.patch

    r28448 r28511  
     1--- a/auto/cc/name 
     2+++ b/auto/cc/name 
     3@@ -6,7 +6,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
     4  
     5     ngx_feature="C compiler" 
     6     ngx_feature_name= 
     7-    ngx_feature_run=yes 
     8+    ngx_feature_run= 
     9     ngx_feature_incs= 
     10     ngx_feature_path= 
     11     ngx_feature_libs= 
    112--- a/auto/cc/conf 
    213+++ b/auto/cc/conf 
    3 @@ -135,7 +135,8 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
    4      ngx_feature_test="char  buf[30]; buf[0] = '0'; 
    5                        var(0, buf, \"%d\", 1); 
    6                        if (buf[0] != '1') return 1" 
    7 -    . auto/feature 
    8 +    #. auto/feature 
    9 +    have=$ngx_feature_name . auto/have 
     14@@ -148,7 +148,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
     15     else 
     16         ngx_feature="C99 variadic macros" 
     17         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" 
     18-        ngx_feature_run=yes 
     19+        ngx_feature_run=no 
     20         ngx_feature_incs="#include <stdio.h> 
     21 #define var(dummy, ...)  sprintf(__VA_ARGS__)" 
     22         ngx_feature_path= 
     23@@ -162,7 +162,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
    1024  
    11   
    12      if [ "$NGX_CC_NAME" = "ccc" ]; then 
    13 @@ -151,7 +152,8 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
    14          ngx_feature_test="char  buf[30]; buf[0] = '0'; 
    15                            var(0, buf, \"%d\", 1); 
    16                            if (buf[0] != '1') return 1" 
    17 -        . auto/feature 
    18 +        #. auto/feature 
    19 +        have=$ngx_feature_name . auto/have 
    20       fi 
    21   
    22   
    23 --- a/auto/cc/name 
    24 +++ b/auto/cc/name 
    25 @@ -13,12 +13,12 @@ if [ "$NGX_PLATFORM" != win32 ]; then 
    26      ngx_feature_test= 
    27      . auto/feature 
    28   
    29 -    if [ $ngx_found = no ]; then 
    30 -        echo 
    31 -        echo $0: error: C compiler $CC is not found 
    32 -        echo 
    33 -        exit 1 
    34 -    fi 
    35 +    #if [ $ngx_found = no ]; then 
    36 +    #    echo 
    37 +    #    echo $0: error: C compiler $CC is not found 
    38 +    #    echo 
    39 +    #    exit 1 
    40 +    #fi 
    41   
    42  fi 
    43   
     25     ngx_feature="gcc variadic macros" 
     26     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" 
     27-    ngx_feature_run=yes 
     28+    ngx_feature_run=no 
     29     ngx_feature_incs="#include <stdio.h> 
     30 #define var(dummy, args...)  sprintf(args)" 
     31     ngx_feature_path= 
    4432--- a/auto/os/linux 
    4533+++ b/auto/os/linux 
    46 @@ -49,7 +49,8 @@ ngx_feature_test="int efd = 0, fd = 1, n 
    47                    ee.data.ptr = NULL; 
    48                    efd = epoll_create(100); 
    49                    if (efd == -1) return 1;" 
    50 -. auto/feature 
    51 +#. auto/feature 
    52 +have=$ngx_feature_name . auto/have 
     34@@ -47,7 +47,7 @@ fi 
    5335  
    54  if [ $ngx_found = yes ]; then 
    55      have=NGX_HAVE_CLEAR_EVENT . auto/have 
    56 @@ -73,7 +74,8 @@ ngx_feature_test="int s = 0, fd = 1; 
    57                    ssize_t n; off_t off = 0; 
    58                    n = sendfile(s, fd, &off, 1); 
    59                    if (n == -1 && errno == ENOSYS) return 1" 
    60 -. auto/feature 
    61 +#. auto/feature 
    62 +have=$ngx_feature_name . auto/have 
    63   
    64  if [ $ngx_found = yes ]; then 
    65      CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS" 
    66 @@ -94,7 +96,8 @@ ngx_feature_test="int s = 0, fd = 1; 
    67                    ssize_t n; off_t off = 0; 
    68                    n = sendfile(s, fd, &off, 1); 
    69                    if (n == -1 && errno == ENOSYS) return 1" 
    70 -. auto/feature 
    71 +#. auto/feature 
    72 +have=$ngx_feature_name . auto/have 
    73   
    74   
    75  ngx_include="sys/prctl.h"; . auto/include 
    76 @@ -108,7 +111,8 @@ ngx_feature_incs="#include <sys/prctl.h> 
     36 ngx_feature="epoll" 
     37 ngx_feature_name="NGX_HAVE_EPOLL" 
     38-ngx_feature_run=yes 
     39+ngx_feature_run=no 
     40 ngx_feature_incs="#include <sys/epoll.h>" 
    7741 ngx_feature_path= 
    7842 ngx_feature_libs= 
    79  ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1" 
    80 -. auto/feature 
    81 +#. auto/feature 
    82 +have=$ngx_feature_name . auto/have 
     43@@ -72,7 +72,7 @@ fi 
     44 CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" 
     45 ngx_feature="sendfile()" 
     46 ngx_feature_name="NGX_HAVE_SENDFILE" 
     47-ngx_feature_run=yes 
     48+ngx_feature_run=no 
     49 ngx_feature_incs="#include <sys/sendfile.h> 
     50                   #include <errno.h>" 
     51 ngx_feature_path= 
     52@@ -93,7 +93,7 @@ fi 
     53 CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" 
     54 ngx_feature="sendfile64()" 
     55 ngx_feature_name="NGX_HAVE_SENDFILE64" 
     56-ngx_feature_run=yes 
     57+ngx_feature_run=no 
     58 ngx_feature_incs="#include <sys/sendfile.h> 
     59                   #include <errno.h>" 
     60 ngx_feature_path= 
     61@@ -111,7 +111,7 @@ ngx_include="sys/prctl.h"; . auto/includ 
    8362  
    84   
    85  # sched_setaffinity() 
     63 ngx_feature="prctl(PR_SET_DUMPABLE)" 
     64 ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" 
     65-ngx_feature_run=yes 
     66+ngx_feature_run=no 
     67 ngx_feature_incs="#include <sys/prctl.h>" 
     68 ngx_feature_path= 
     69 ngx_feature_libs= 
    8670--- a/auto/unix 
    8771+++ b/auto/unix 
    88 @@ -117,7 +117,7 @@ ngx_feature_path= 
     72@@ -555,7 +555,7 @@ ngx_feature_test="void *p; p = memalign( 
     73  
     74 ngx_feature="mmap(MAP_ANON|MAP_SHARED)" 
     75 ngx_feature_name="NGX_HAVE_MAP_ANON" 
     76-ngx_feature_run=yes 
     77+ngx_feature_run=no 
     78 ngx_feature_incs="#include <sys/mman.h>" 
     79 ngx_feature_path= 
    8980 ngx_feature_libs= 
    90  ngx_feature_test="char buf[1024]; long n; n = strerror_r(1, buf, 1024); 
    91                    if (n < 0 || n > 1024) return 1;" 
    92 -. auto/feature 
    93 +#. auto/feature 
    94   
    95   
    96  # GNU style strerror_r() returns not length, but pointer 
    97 @@ -130,7 +130,8 @@ ngx_feature_path= 
    98  ngx_feature_libs= 
    99  ngx_feature_test="char buf[1024]; long n; n = strerror_r(1, buf, 1024); 
    100                    if (n >= 0 && n < 1024) return 1;" 
    101 -. auto/feature 
    102 +#. auto/feature 
    103 +have=$ngx_feature_name . auto/have 
    104   
    105   
    106  ngx_feature="localtime_r()" 
    107 @@ -173,7 +174,8 @@ ngx_feature_test="void *p; 
    108                    p = mmap(NULL, 4096, PROT_READ|PROT_WRITE, 
    109                             MAP_ANON|MAP_SHARED, -1, 0); 
    110                    if (p == MAP_FAILED) return 1;" 
    111 -. auto/feature 
    112 +#. auto/feature 
    113 +have=$ngx_feature_name . auto/have 
    114   
     81@@ -568,7 +568,7 @@ ngx_feature_test="void *p; 
    11582  
    11683 ngx_feature='mmap("/dev/zero", MAP_SHARED)' 
    117 @@ -188,7 +190,8 @@ ngx_feature_test='void *p; int  fd; 
    118                    fd = open("/dev/zero", O_RDWR); 
    119                    p = mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); 
    120                    if (p == MAP_FAILED) return 1;' 
    121 -. auto/feature 
    122 +#. auto/feature 
    123 +have=$ngx_feature_name . auto/have 
    124   
     84 ngx_feature_name="NGX_HAVE_MAP_DEVZERO" 
     85-ngx_feature_run=yes 
     86+ngx_feature_run=no 
     87 ngx_feature_incs="#include <sys/mman.h> 
     88                   #include <sys/stat.h> 
     89                   #include <fcntl.h>" 
     90@@ -583,7 +583,7 @@ ngx_feature_test='void *p; int  fd; 
    12591  
    12692 ngx_feature="System V shared memory" 
    127 @@ -202,7 +205,8 @@ ngx_feature_test="int  id; 
    128                    id = shmget(IPC_PRIVATE, 4096, (SHM_R|SHM_W|IPC_CREAT)); 
    129                    if (id == -1) return 1; 
    130                    shmctl(id, IPC_RMID, NULL);" 
    131 -. auto/feature 
    132 +#. auto/feature 
    133 +have=$ngx_feature_name . auto/have 
     93 ngx_feature_name="NGX_HAVE_SYSVSHM" 
     94-ngx_feature_run=yes 
     95+ngx_feature_run=no 
     96 ngx_feature_incs="#include <sys/ipc.h> 
     97                   #include <sys/shm.h>" 
     98 ngx_feature_path= 
     99@@ -597,7 +597,7 @@ ngx_feature_test="int  id; 
    134100  
    135   
    136  ngx_feature="struct msghdr.msg_control" 
     101 ngx_feature="POSIX semaphores" 
     102 ngx_feature_name="NGX_HAVE_POSIX_SEM" 
     103-ngx_feature_run=yes 
     104+ngx_feature_run=no 
     105 ngx_feature_incs="#include <semaphore.h>" 
     106 ngx_feature_path= 
     107 ngx_feature_libs= 
Note: See TracChangeset for help on using the changeset viewer.