From 8672f52910c95f8b23573d24e3b2549eb827fa06 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Thu, 22 Nov 2012 03:47:20 +0000 Subject: Use more canonical names for patches. No functionaly changes. Don't bump PORTREVISION. Feature safe: yes --- ...xtra-patch-agentzh-set-misc-nginx-module-config | 13 +++++++++ ...tra-patch-agentzh-set-misc-nginx-module::config | 13 --------- .../extra-patch-calio-iconv-nginx-module-config | 19 ++++++++++++ .../extra-patch-calio-iconv-nginx-module::config | 19 ------------ ...a-patch-chaoslawful-drizzle-nginx-module-config | 19 ++++++++++++ ...-patch-chaoslawful-drizzle-nginx-module::config | 19 ------------ .../files/extra-patch-naxsi_src-naxsi_runtime.c | 16 ++++++++++ .../files/extra-patch-naxsi_src::naxsi_runtime.c | 16 ---------- .../files/extra-patch-ngx_postgres-config | 19 ++++++++++++ .../files/extra-patch-ngx_postgres::config | 19 ------------ .../files/extra-patch-passenger-build-nginx.rb | 34 ++++++++++++++++++++++ .../files/extra-patch-passenger::build::nginx.rb | 34 ---------------------- 12 files changed, 120 insertions(+), 120 deletions(-) create mode 100644 www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config delete mode 100644 www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config create mode 100644 www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config delete mode 100644 www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config create mode 100644 www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config delete mode 100644 www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config create mode 100644 www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c delete mode 100644 www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c create mode 100644 www/nginx-devel/files/extra-patch-ngx_postgres-config delete mode 100644 www/nginx-devel/files/extra-patch-ngx_postgres::config create mode 100644 www/nginx-devel/files/extra-patch-passenger-build-nginx.rb delete mode 100644 www/nginx-devel/files/extra-patch-passenger::build::nginx.rb (limited to 'www/nginx-devel/files') diff --git a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config b/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config new file mode 100644 index 000000000000..7a69743ee592 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config @@ -0,0 +1,13 @@ +--- ../agentzh-set-misc-nginx-module-658c235/config.orig 2011-12-09 10:27:53.861265188 +0300 ++++ ../agentzh-set-misc-nginx-module-658c235/config 2011-12-09 10:28:07.107259301 +0300 +@@ -1,10 +1,3 @@ +-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then +- echo "found ngx_devel_kit for ngx_set_misc; looks good." +-else +- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2 +- exit 1 +-fi +- + ngx_addon_name=ngx_http_set_misc_module + HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c" diff --git a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config b/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config deleted file mode 100644 index 7a69743ee592..000000000000 --- a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config +++ /dev/null @@ -1,13 +0,0 @@ ---- ../agentzh-set-misc-nginx-module-658c235/config.orig 2011-12-09 10:27:53.861265188 +0300 -+++ ../agentzh-set-misc-nginx-module-658c235/config 2011-12-09 10:28:07.107259301 +0300 -@@ -1,10 +1,3 @@ --if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then -- echo "found ngx_devel_kit for ngx_set_misc; looks good." --else -- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2 -- exit 1 --fi -- - ngx_addon_name=ngx_http_set_misc_module - HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c" diff --git a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config new file mode 100644 index 000000000000..0b138a51fba2 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config @@ -0,0 +1,19 @@ +--- ../calio-iconv-nginx-module-abdac17/config.orig 2012-01-12 12:01:07.000000000 +0400 ++++ ../calio-iconv-nginx-module-abdac17/config 2011-10-11 03:30:35.000000000 +0400 +@@ -39,12 +39,12 @@ + fi + + if [ $ngx_found = no ]; then +- ngx_feature="libiconv in /usr/local/" +- ngx_feature_path="/usr/local/include" ++ ngx_feature="libiconv in %%PREFIX%%/" ++ ngx_feature_path="%%PREFIX%%/include" + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv" ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv" + else +- ngx_feature_libs="-L/usr/local/lib -liconv" ++ ngx_feature_libs="-L%%PREFIX%%/lib -liconv" + fi + . auto/feature + fi diff --git a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config deleted file mode 100644 index 0b138a51fba2..000000000000 --- a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config +++ /dev/null @@ -1,19 +0,0 @@ ---- ../calio-iconv-nginx-module-abdac17/config.orig 2012-01-12 12:01:07.000000000 +0400 -+++ ../calio-iconv-nginx-module-abdac17/config 2011-10-11 03:30:35.000000000 +0400 -@@ -39,12 +39,12 @@ - fi - - if [ $ngx_found = no ]; then -- ngx_feature="libiconv in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="libiconv in %%PREFIX%%/" -+ ngx_feature_path="%%PREFIX%%/include" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv" - else -- ngx_feature_libs="-L/usr/local/lib -liconv" -+ ngx_feature_libs="-L%%PREFIX%%/lib -liconv" - fi - . auto/feature - fi diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config new file mode 100644 index 000000000000..0710bebf5d0e --- /dev/null +++ b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config @@ -0,0 +1,19 @@ +--- ../chaoslawful-drizzle-nginx-module-59e12ad/config.orig 2011-12-30 10:26:53.000000000 +0400 ++++ ../chaoslawful-drizzle-nginx-module-59e12ad/config 2011-12-30 10:28:20.000000000 +0400 +@@ -22,12 +22,12 @@ + + if [ $ngx_found = no ]; then + # FreeBSD, OpenBSD +- ngx_feature="libdrizzle library in /usr/local/" +- ngx_feature_path="/usr/local/include/libdrizzle-1.0" ++ ngx_feature="libdrizzle library in %%PREFIX%%" ++ ngx_feature_path="%%PREFIX%%/include/libdrizzle" + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle" ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle" + else +- ngx_feature_libs="-L/usr/local/lib -ldrizzle" ++ ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle" + fi + . auto/feature + fi diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config deleted file mode 100644 index 0710bebf5d0e..000000000000 --- a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config +++ /dev/null @@ -1,19 +0,0 @@ ---- ../chaoslawful-drizzle-nginx-module-59e12ad/config.orig 2011-12-30 10:26:53.000000000 +0400 -+++ ../chaoslawful-drizzle-nginx-module-59e12ad/config 2011-12-30 10:28:20.000000000 +0400 -@@ -22,12 +22,12 @@ - - if [ $ngx_found = no ]; then - # FreeBSD, OpenBSD -- ngx_feature="libdrizzle library in /usr/local/" -- ngx_feature_path="/usr/local/include/libdrizzle-1.0" -+ ngx_feature="libdrizzle library in %%PREFIX%%" -+ ngx_feature_path="%%PREFIX%%/include/libdrizzle" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle" - else -- ngx_feature_libs="-L/usr/local/lib -ldrizzle" -+ ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle" - fi - . auto/feature - fi diff --git a/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c new file mode 100644 index 000000000000..e06d1b4cdfd4 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c @@ -0,0 +1,16 @@ +--- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig 2012-06-06 16:26:30.000000000 +0400 ++++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c 2012-06-06 16:29:58.000000000 +0400 +@@ -116,7 +116,12 @@ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version > 1001011) ++#if defined nginx_version && (nginx_version >= 1003001) ++ (tmp_idx < len && ++ (match = pcre_exec(rl->br->rx->regex->code, 0, ++ (const char *) str->data, str->len, tmp_idx, 0, ++ captures, 6)) >= 0) ++#elif (nginx_version > 1001011) && (nginx_version < 1003001) + (tmp_idx < len && + (match = pcre_exec(rl->br->rx->regex->pcre, 0, + (const char *) str->data, str->len, tmp_idx, 0, diff --git a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c deleted file mode 100644 index e06d1b4cdfd4..000000000000 --- a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c +++ /dev/null @@ -1,16 +0,0 @@ ---- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig 2012-06-06 16:26:30.000000000 +0400 -+++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c 2012-06-06 16:29:58.000000000 +0400 -@@ -116,7 +116,12 @@ - tmp_idx = 0; - len = str->len; - while --#if defined nginx_version && (nginx_version > 1001011) -+#if defined nginx_version && (nginx_version >= 1003001) -+ (tmp_idx < len && -+ (match = pcre_exec(rl->br->rx->regex->code, 0, -+ (const char *) str->data, str->len, tmp_idx, 0, -+ captures, 6)) >= 0) -+#elif (nginx_version > 1001011) && (nginx_version < 1003001) - (tmp_idx < len && - (match = pcre_exec(rl->br->rx->regex->pcre, 0, - (const char *) str->data, str->len, tmp_idx, 0, diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres-config b/www/nginx-devel/files/extra-patch-ngx_postgres-config new file mode 100644 index 000000000000..cfba3278ca87 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_postgres-config @@ -0,0 +1,19 @@ +--- ../ngx_postgres-0.9/config.orig 2011-12-29 11:17:24.000000000 +0400 ++++ ../ngx_postgres-0.9/config 2011-12-29 11:18:47.000000000 +0400 +@@ -48,12 +48,12 @@ + + if [ $ngx_found = no ]; then + # FreeBSD +- ngx_feature="libpq library in /usr/local/" +- ngx_feature_path="/usr/local/include" ++ ngx_feature="libpq library in %%PREFIX%%/" ++ ngx_feature_path="%%PREFIX%%/include" + if [ $NGX_RPATH = YES ]; then +- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpq" ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lpq" + else +- ngx_feature_libs="-L/usr/local/lib -lpq" ++ ngx_feature_libs="-L%%PREFIX%%/lib -lpq" + fi + . auto/feature + fi diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres::config b/www/nginx-devel/files/extra-patch-ngx_postgres::config deleted file mode 100644 index cfba3278ca87..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_postgres::config +++ /dev/null @@ -1,19 +0,0 @@ ---- ../ngx_postgres-0.9/config.orig 2011-12-29 11:17:24.000000000 +0400 -+++ ../ngx_postgres-0.9/config 2011-12-29 11:18:47.000000000 +0400 -@@ -48,12 +48,12 @@ - - if [ $ngx_found = no ]; then - # FreeBSD -- ngx_feature="libpq library in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="libpq library in %%PREFIX%%/" -+ ngx_feature_path="%%PREFIX%%/include" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpq" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lpq" - else -- ngx_feature_libs="-L/usr/local/lib -lpq" -+ ngx_feature_libs="-L%%PREFIX%%/lib -lpq" - fi - . auto/feature - fi diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb new file mode 100644 index 000000000000..b1372e156e24 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb @@ -0,0 +1,34 @@ +--- ../passenger-3.0.17/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300 ++++ ../passenger-3.0.17/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300 +@@ -23,10 +23,7 @@ + + desc "Build Nginx helper agent" + task :nginx => [ +- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent', +- AGENT_OUTPUT_DIR + 'PassengerWatchdog', +- AGENT_OUTPUT_DIR + 'PassengerLoggingAgent', +- :native_support ++ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' + ] + + dependencies = [ +@@ -51,18 +48,7 @@ + LIBCOMMON, + ] + file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do +- output_dir = "#{AGENT_OUTPUT_DIR}nginx" +- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir) +- create_executable "#{output_dir}/PassengerHelperAgent", +- 'ext/nginx/HelperAgent.cpp', +- "-Iext -Iext/common " << +- "#{PlatformInfo.portability_cflags} " << +- "#{EXTRA_CXXFLAGS} " << +- "#{LIBCOMMON} " << +- "#{LIBBOOST_OXT} " << +- "#{PlatformInfo.portability_ldflags} " << +- "#{AGENT_LDFLAGS} " << +- "#{EXTRA_LDFLAGS}" ++ true + end + + task :clean => 'nginx:clean' diff --git a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb deleted file mode 100644 index b1372e156e24..000000000000 --- a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb +++ /dev/null @@ -1,34 +0,0 @@ ---- ../passenger-3.0.17/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300 -+++ ../passenger-3.0.17/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300 -@@ -23,10 +23,7 @@ - - desc "Build Nginx helper agent" - task :nginx => [ -- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent', -- AGENT_OUTPUT_DIR + 'PassengerWatchdog', -- AGENT_OUTPUT_DIR + 'PassengerLoggingAgent', -- :native_support -+ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' - ] - - dependencies = [ -@@ -51,18 +48,7 @@ - LIBCOMMON, - ] - file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do -- output_dir = "#{AGENT_OUTPUT_DIR}nginx" -- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir) -- create_executable "#{output_dir}/PassengerHelperAgent", -- 'ext/nginx/HelperAgent.cpp', -- "-Iext -Iext/common " << -- "#{PlatformInfo.portability_cflags} " << -- "#{EXTRA_CXXFLAGS} " << -- "#{LIBCOMMON} " << -- "#{LIBBOOST_OXT} " << -- "#{PlatformInfo.portability_ldflags} " << -- "#{AGENT_LDFLAGS} " << -- "#{EXTRA_LDFLAGS}" -+ true - end - - task :clean => 'nginx:clean' -- cgit v1.2.3