Skip to content

Commit 340b30f

Browse files
ctrochalakisctrochalakis
committed
Rethink module patches logic
Collect all patches under debian/patches/modules so they can be easily tracked and apply them before configure.
1 parent 62276a7 commit 340b30f

File tree

16 files changed

+170
-54
lines changed

16 files changed

+170
-54
lines changed

‎debian/changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
nginx (1.10.2-2) UNRELEASED; urgency=medium
22

33
* debian/modules:
4+
+ Rethink module patching logic.
45
+ Convert dav-ext to a dynamic module package:
56
o libnginx-mod-http-dav-ext
67

‎debian/control‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Build-Depends: autotools-dev,
2323
libssl-dev,
2424
libxslt1-dev,
2525
po-debconf,
26+
quilt,
2627
zlib1g-dev
2728
Standards-Version: 3.9.8.0
2829
Homepage: http://nginx.net

‎debian/modules/README.Modules-versions‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ README for Modules versions
2626

2727
nginx-upstream-fair
2828
Homepage: https://github.com/gnosek/nginx-upstream-fair
29-
Version: a18b409+pull/21
29+
Version: a18b409
30+
Patch: dynamic-module.patch
3031

3132
nchan
3233
Homepage: https://github.com/slact/nchan
@@ -39,16 +40,19 @@ README for Modules versions
3940

4041
nginx-cache-purge
4142
Homepage: https://github.com/FRiCKLE/ngx_cache_purge/
42-
Version: 2.3+pull/45
43+
Version: 2.3
44+
Patch: dynamic-module.patch
4345

4446
nginx-dav-ext-module
4547
Homepage: https://github.com/arut/nginx-dav-ext-module
46-
Version: v0.0.3+pull/22
48+
Version: v0.0.3
49+
Patch: dynamic-module.patch
4750

4851
ngx-fancyindex
4952
Homepage: https://github.com/aperezdc/ngx-fancyindex
5053
Version: v0.4.1
5154

5255
ngx_http_substitutions_filter_module
5356
Homepage: https://github.com/yaoweibin/ngx_http_substitutions_filter_module
54-
Version: v0.6.4+pull/19
57+
Version: v0.6.4
58+
Patch: dynamic-module.patch

‎debian/modules/nginx-cache-purge/config‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
1515
fi
1616

1717
ngx_addon_name=ngx_http_cache_purge_module
18-
CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
19-
20-
if [ -n "$ngx_module_link" ]; then
21-
ngx_module_type=HTTP
22-
ngx_module_name="$ngx_addon_name"
23-
ngx_module_srcs="$CACHE_PURGE_SRCS"
24-
25-
. auto/module
26-
else
27-
HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
28-
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
29-
fi
18+
HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
19+
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
3020

3121
have=NGX_CACHE_PURGE_MODULE . auto/have

‎debian/modules/nginx-dav-ext-module/config‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
ngx_addon_name="ngx_http_dav_ext_module"
22

3-
CORE_LIBS="$CORE_LIBS -lexpat"
4-
5-
if test -n "$ngx_module_link"; then
6-
ngx_module_type=HTTP
7-
ngx_module_name=ngx_http_dav_ext_module
8-
ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
9-
10-
. auto/module
11-
else
12-
HTTP_MODULES="$HTTP_MODULES \
3+
HTTP_MODULES="$HTTP_MODULES \
134
ngx_http_dav_ext_module"
145

15-
NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
6+
NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
167
$ngx_addon_dir/ngx_http_dav_ext_module.c"
17-
fi
8+
9+
CORE_LIBS="$CORE_LIBS -lexpat"

‎debian/modules/nginx-upstream-fair/config‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
ngx_addon_name=ngx_http_upstream_fair_module
2-
3-
if test -n "$ngx_module_link"; then
4-
ngx_module_type=HTTP
5-
ngx_module_name=ngx_http_upstream_fair_module
6-
ngx_module_srcs="$ngx_addon_dir/ngx_http_upstream_fair_module.c"
7-
8-
. auto/module
9-
else
10-
HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
11-
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"
12-
fi
2+
HTTP_MODULES="$HTTP_MODULES ngx_http_upstream_fair_module"
3+
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_upstream_fair_module.c"

‎debian/modules/ngx_http_substitutions_filter_module/config‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
ngx_addon_name=ngx_http_subs_filter_module
2-
3-
if test -n "$ngx_module_link"; then
4-
ngx_module_type=HTTP_FILTER
5-
ngx_module_name=ngx_http_subs_filter_module
6-
ngx_module_incs=
7-
ngx_module_deps=
8-
ngx_module_srcs="$ngx_addon_dir/ngx_http_subs_filter_module.c"
9-
ngx_module_libs=""
10-
11-
. auto/module
12-
else
13-
HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
14-
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"
15-
fi
2+
HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_subs_filter_module"
3+
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_subs_filter_module.c"

‎debian/patches/modules/nginx-cache-purge/dynamic-module.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 26d7114ac82195cd4f7db606d7762a6cff9132ad Mon Sep 17 00:00:00 2001
2+
From: Hiroaki Nakamura <[email protected]>
3+
Date: Fri, 12 Feb 2016 09:03:35 +0900
4+
Subject: [PATCH] Convert a config file to build a dynamic module
5+
Origin: other, https://github.com/FRiCKLE/ngx_cache_purge/pull/45
6+
7+
---
8+
config | 14 ++++++++++++--
9+
1 file changed, 12 insertions(+), 2 deletions(-)
10+
11+
diff --git a/config b/config
12+
index 34f42ec..b900680 100644
13+
--- a/config
14+
+++ b/config
15+
@@ -15,7 +15,17 @@ if [ "$HTTP_UWSGI" = "YES" ]; then
16+
fi
17+
18+
ngx_addon_name=ngx_http_cache_purge_module
19+
-HTTP_MODULES="$HTTP_MODULES ngx_http_cache_purge_module"
20+
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_cache_purge_module.c"
21+
+CACHE_PURGE_SRCS="$ngx_addon_dir/ngx_cache_purge_module.c"
22+
+
23+
+if [ -n "$ngx_module_link" ]; then
24+
+ ngx_module_type=HTTP
25+
+ ngx_module_name="$ngx_addon_name"
26+
+ ngx_module_srcs="$CACHE_PURGE_SRCS"
27+
+
28+
+ . auto/module
29+
+else
30+
+ HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
31+
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CACHE_PURGE_SRCS"
32+
+fi
33+
34+
have=NGX_CACHE_PURGE_MODULE . auto/have

‎debian/patches/modules/nginx-cache-purge/series‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dynamic-module.patch

‎debian/patches/modules/nginx-dav-ext-module/dynamic-module.patch‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 0473d8d1bb63a14afe608ecf46bfc933234e3048 Mon Sep 17 00:00:00 2001
2+
From: Florian Kinder <[email protected]>
3+
Date: Fri, 28 Oct 2016 13:34:21 +0200
4+
Subject: [PATCH] Added dynamic module support
5+
Origin: other, https://github.com/Fank/nginx-dav-ext-module/pull/1
6+
7+
---
8+
config | 22 +++++++++++++++++-----
9+
1 file changed, 17 insertions(+), 5 deletions(-)
10+
11+
diff --git a/config b/config
12+
index 98b2b7a..b6b65de 100644
13+
--- a/config
14+
+++ b/config
15+
@@ -1,9 +1,21 @@
16+
ngx_addon_name="ngx_http_dav_ext_module"
17+
18+
-HTTP_MODULES="$HTTP_MODULES \
19+
- ngx_http_dav_ext_module"
20+
21+
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
22+
- $ngx_addon_dir/ngx_http_dav_ext_module.c"
23+
+if test -n "$ngx_module_link"; then
24+
+ ngx_module_type=HTTP
25+
+ ngx_module_name=ngx_http_dav_ext_module
26+
+ ngx_module_incs=
27+
+ ngx_module_deps=
28+
+ ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
29+
+ ngx_module_libs="-lexpat"
30+
+
31+
+ . auto/module
32+
+else
33+
+ CORE_LIBS="$CORE_LIBS -lexpat"
34+
35+
-CORE_LIBS="$CORE_LIBS -lexpat"
36+
+ HTTP_MODULES="$HTTP_MODULES \
37+
+ ngx_http_dav_ext_module"
38+
+
39+
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
40+
+ $ngx_addon_dir/ngx_http_dav_ext_module.c"
41+
+fi

0 commit comments

Comments
 (0)