From 3123e425080cce58cf72724b64e417cf25c2a0c7 Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Tue, 8 Jul 2014 14:51:21 +0200 Subject: [PATCH] nginx: Updated (1.4.7 -> 1.6.0) rediffed default_ssl_ciphers.patch. removed nginx-rtsig-sysctl.patch included upstream. --- network/nginx/default_ssl_ciphers.patch | 9 ++-- network/nginx/nginx-rtsig-sysctl.patch | 65 ------------------------- network/nginx/nginx.desc | 11 +++-- 3 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 network/nginx/nginx-rtsig-sysctl.patch diff --git a/network/nginx/default_ssl_ciphers.patch b/network/nginx/default_ssl_ciphers.patch index 9306821b3..4c87fb829 100644 --- a/network/nginx/default_ssl_ciphers.patch +++ b/network/nginx/default_ssl_ciphers.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../nginx/default_ssl_ciphers.patch -# Copyright (C) 2012 The OpenSDE Project +# Copyright (C) 2012 - 2014 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -18,12 +18,13 @@ http://matt.io/entry/ur --- ./conf/nginx.conf.orig 2012-04-25 11:40:14.000000000 +0200 +++ ./conf/nginx.conf 2012-04-25 11:47:11.000000000 +0200 -@@ -106,7 +106,7 @@ +@@ -105,7 +105,7 @@ + # ssl_session_cache shared:SSL:1m; # ssl_session_timeout 5m; - # ssl_protocols SSLv2 SSLv3 TLSv1; - # ssl_ciphers HIGH:!aNULL:!MD5; + # ssl_ciphers HIGH:!aNULL:!MD5:!kEDH; - # ssl_prefer_server_ciphers on; + # ssl_prefer_server_ciphers on; # location / { + diff --git a/network/nginx/nginx-rtsig-sysctl.patch b/network/nginx/nginx-rtsig-sysctl.patch deleted file mode 100644 index 5c5abd108..000000000 --- a/network/nginx/nginx-rtsig-sysctl.patch +++ /dev/null @@ -1,65 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../nginx/nginx-rtsig-sysctl.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -In OpenSDE we need this patch to be able to build with musl libc which -is not shipping with anymore because the usage of the -interface is discouraged by the linux kernel folks. - -# HG changeset patch -# User Maxim Dounin -# Date 1372247247 -14400 -# Node ID 7f4ec5bfb715e6271179321286828c86210eb5ba -# Parent 7ecaa9e4bf1bcf7ecd25f1d5f4c8a778de2db534 -Fixed build on Linux with x32 ABI. - -On Linux x32 inclusion of sys/sysctl.h produces an error. As sysctl() is -only used by rtsig event method code, which is legacy and not compiled -in by default on modern linuxes, the sys/sysctl.h file now only included -if rtsig support is enabled. - -Based on patch by Serguei I. Ivantsov. - -diff -r 7ecaa9e4bf1b -r 7f4ec5bfb715 src/os/unix/ngx_linux_config.h ---- a/src/os/unix/ngx_linux_config.h Thu Jun 20 20:47:39 2013 +0400 -+++ b/src/os/unix/ngx_linux_config.h Wed Jun 26 15:47:27 2013 +0400 -@@ -51,7 +51,6 @@ - #include /* memalign() */ - #include /* IOV_MAX */ - #include --#include - #include - #include /* uname() */ - -@@ -77,11 +76,17 @@ - #endif - - --#if (NGX_HAVE_POLL || NGX_HAVE_RTSIG) -+#if (NGX_HAVE_POLL) - #include - #endif - - -+#if (NGX_HAVE_RTSIG) -+#include -+#include -+#endif -+ -+ - #if (NGX_HAVE_EPOLL) - #include - #endif - diff --git a/network/nginx/nginx.desc b/network/nginx/nginx.desc index 0b809980e..ac7e8886d 100644 --- a/network/nginx/nginx.desc +++ b/network/nginx/nginx.desc @@ -43,16 +43,17 @@ [L] BSD [S] Stable -[V] 1.4.7 +[V] 1.6.0 [P] X -?---5---9 800.000 [CV-URL] http://nginx.org/en/download.html -[D] 309798323 nginx-1.4.7.tar.gz http://nginx.org/download/ +[D] 2863285876 nginx-1.6.0.tar.gz http://nginx.org/download/ [D] 2799334071 nginx-mod_rrd_graph-0.2.0.tar.gz !http://wiki.nginx.org/images/9/9d/Mod_rrd_graph-0.2.0.tar.gz [D] 417317636 nginx_upload_module-2.2.0.tar.gz http://www.grid.net.ru/nginx/download/ -[D] 2806695471 echo-nginx-module-0.51.tar.gz !https://github.com/agentzh/echo-nginx-module/archive/v0.51.tar.gz -[D] 1601222066 ngx_devel_kit-0.2.19.zip !https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.zip -[D] 3867900840 lua-nginx-module-0.9.4.zip !https://github.com/chaoslawful/lua-nginx-module/archive/v0.9.4.zip +[D] 3526984794 echo-nginx-module-0.54.tar.gz !https://github.com/agentzh/echo-nginx-module/archive/v0.54.tar.gz +[D] 0 ngx_devel_kit-0.2.19.tar.gz !https://github.com/simpl/ngx_devel_kit/archive/v0.2.19.tar.gz +[D] 487714407 lua-nginx-module-0.9.9.tar.gz !https://github.com/chaoslawful/lua-nginx-module/archive/v0.9.9.tar.gz [D] 1005175207 nginx_syslog_patch-0.25.tar.gz !https://github.com/yaoweibin/nginx_syslog_patch/archive/v0.25.tar.gz [D] 513242777 naxsi-0.53-2.tar.gz !https://github.com/nbs-system/naxsi/archive/0.53-2.tar.gz +