summaryrefslogtreecommitdiff
path: root/package/nginx
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-08-20 16:59:59 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2013-08-20 16:59:59 (GMT)
commit88ef0568e68cbd247f4c2e0ff022de72ea7a1ffc (patch)
tree0915644bed68162ee3fb06863ee05485977d565a /package/nginx
parentfdf8732e14c03010e7d9422b3d1ae6d9936d3ec2 (diff)
update to latest upstream version
Diffstat (limited to 'package/nginx')
-rw-r--r--package/nginx/Makefile4
-rw-r--r--package/nginx/files/nginx.init1
-rw-r--r--package/nginx/patches/patch-auto_cc_conf8
-rw-r--r--package/nginx/patches/patch-auto_os_linux25
4 files changed, 30 insertions, 8 deletions
diff --git a/package/nginx/Makefile b/package/nginx/Makefile
index ed4b7e7..98ba1be 100644
--- a/package/nginx/Makefile
+++ b/package/nginx/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= nginx
-PKG_VERSION:= 1.2.2
+PKG_VERSION:= 1.5.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 53105bbe3ac9319db54d9eb46119695b
+PKG_MD5SUM:= 1e735dd6a6ade2b5c20e924b67c3d355
PKG_DESCR:= powerful http reverse proxy
PKG_SECTION:= proxy
PKG_BUILDDEP:= openssl pcre zlib
diff --git a/package/nginx/files/nginx.init b/package/nginx/files/nginx.init
index 456e90a..0b7ee5f 100644
--- a/package/nginx/files/nginx.init
+++ b/package/nginx/files/nginx.init
@@ -12,6 +12,7 @@ autostart)
start)
[ -d /var/lib/nginx ] || mkdir -p /var/lib/nginx
[ -d /var/log/nginx ] || mkdir -p /var/log/nginx
+ [ -d /var/lock/nginx ] || mkdir -p /var/lock/nginx
/usr/sbin/nginx
;;
stop)
diff --git a/package/nginx/patches/patch-auto_cc_conf b/package/nginx/patches/patch-auto_cc_conf
index bc516d8..0f30f66 100644
--- a/package/nginx/patches/patch-auto_cc_conf
+++ b/package/nginx/patches/patch-auto_cc_conf
@@ -1,6 +1,6 @@
---- nginx-1.2.2.orig/auto/cc/conf 2012-01-18 16:07:43.000000000 +0100
-+++ nginx-1.2.2/auto/cc/conf 2012-07-16 09:27:16.000000000 +0200
-@@ -149,7 +149,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+--- nginx-1.5.3.orig/auto/cc/conf 2013-07-30 15:27:55.000000000 +0200
++++ nginx-1.5.3/auto/cc/conf 2013-08-20 09:50:31.872042697 +0200
+@@ -155,7 +155,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
else
ngx_feature="C99 variadic macros"
ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
@@ -9,7 +9,7 @@
ngx_feature_incs="#include <stdio.h>
#define var(dummy, ...) sprintf(__VA_ARGS__)"
ngx_feature_path=
-@@ -163,7 +163,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -169,7 +169,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
ngx_feature="gcc variadic macros"
ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux
index bd0b5aa..17cd3c9 100644
--- a/package/nginx/patches/patch-auto_os_linux
+++ b/package/nginx/patches/patch-auto_os_linux
@@ -1,5 +1,5 @@
---- nginx-1.2.2.orig/auto/os/linux 2012-03-21 14:58:51.000000000 +0100
-+++ nginx-1.2.2/auto/os/linux 2012-07-16 09:27:16.000000000 +0200
+--- nginx-1.5.3.orig/auto/os/linux 2013-07-30 15:27:55.000000000 +0200
++++ nginx-1.5.3/auto/os/linux 2013-08-20 10:00:37.444429620 +0200
@@ -48,7 +48,7 @@ fi
ngx_feature="epoll"
@@ -36,3 +36,24 @@
ngx_feature_incs="#include <sys/prctl.h>"
ngx_feature_path=
ngx_feature_libs=
+@@ -133,20 +133,6 @@ ngx_feature_test="cpu_set_t mask;
+ sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
+ . auto/feature
+
+-
+-# crypt_r()
+-
+-ngx_feature="crypt_r()"
+-ngx_feature_name="NGX_HAVE_GNU_CRYPT_R"
+-ngx_feature_run=no
+-ngx_feature_incs="#include <crypt.h>"
+-ngx_feature_path=
+-ngx_feature_libs=-lcrypt
+-ngx_feature_test="struct crypt_data cd;
+- crypt_r(\"key\", \"salt\", &cd);"
+-. auto/feature
+-
+-
+ ngx_include="sys/vfs.h"; . auto/include
+
+