Skip to content

Commit 0c48127

Browse files
committed
Update
- 适配 NGiNX 1.28 stable
1 parent fafa759 commit 0c48127

1 file changed

Lines changed: 190 additions & 0 deletions

File tree

nginx/1.28/reduce.patch

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
--- alpine/alpine/APKBUILD-base.in
2+
+++ deluxe/alpine/APKBUILD-base.in
3+
@@ -20,23 +20,19 @@
4+
5+
pkgusers=""
6+
pkggroups=""
7+
-install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
8+
+install="$pkgname.pre-install $pkgname.post-install"
9+
10+
-subpackages="$pkgname-dbg"
11+
+subpackages=""
12+
13+
replaces="nginx-common nginx-initscripts nginx-lua nginx-rtmp"
14+
source="$pkgname-$_base_version.tar.gz
15+
$pkgname.conf
16+
$pkgname.default.conf
17+
- $pkgname.logrotate
18+
- $pkgname.initd
19+
- $pkgname-debug.initd
20+
- COPYRIGHT
21+
%%BASE_PATCHES%%
22+
"
23+
builddir="$srcdir/$pkgname-$_base_version"
24+
25+
-_modules_dir="usr/lib/nginx/modules"
26+
+_modules_dir="usr/lib/wavex/modules"
27+
28+
prepare() {
29+
local file; for file in $source; do
30+
@@ -76,29 +72,19 @@
31+
make DESTDIR="$pkgdir" install
32+
install -m755 objs/nginx-debug "$pkgdir"/usr/sbin/nginx-debug
33+
34+
- install -Dm644 objs/nginx.8 "$pkgdir"/usr/share/man/man8/nginx.8
35+
- if [ -z "`echo $subpackages | grep -- -doc`" ]; then
36+
- gzip "$pkgdir"/usr/share/man/man8/nginx.8
37+
- fi
38+
-
39+
cd "$pkgdir"
40+
41+
install -Dm644 "$srcdir"/$pkgname.conf ./etc/nginx/nginx.conf
42+
install -Dm644 "$srcdir"/$pkgname.default.conf ./etc/nginx/conf.d/default.conf
43+
- install -Dm755 "$srcdir"/$pkgname.initd ./etc/init.d/nginx
44+
- install -Dm755 "$srcdir"/$pkgname-debug.initd ./etc/init.d/nginx-debug
45+
- install -Dm644 "$srcdir"/$pkgname.logrotate ./etc/logrotate.d/nginx
46+
47+
- install -Dm644 "$srcdir"/COPYRIGHT ./usr/share/licenses/$pkgname/COPYRIGHT
48+
-
49+
mkdir -p ./usr/share/nginx
50+
mv ./etc/nginx/html ./usr/share/nginx/
51+
52+
mkdir -p ./$_modules_dir
53+
- ln -sf /$_modules_dir ./etc/nginx/modules
54+
+ ln -sf /usr/lib/nginx/modules ./etc/nginx/modules
55+
56+
rm -rf ./etc/nginx/*.default
57+
- rm -f ./etc/nginx/koi-utf
58+
- rm -f ./etc/nginx/koi-win
59+
- rm -f ./etc/nginx/win-utf
60+
+ rm -rf ./etc/nginx/koi-utf
61+
+ rm -rf ./etc/nginx/koi-win
62+
+ rm -rf ./etc/nginx/win-utf
63+
}
64+
--- alpine/alpine/APKBUILD-module.in
65+
+++ deluxe/alpine/APKBUILD-module.in
66+
@@ -23,12 +23,11 @@
67+
install="$pkgname.post-install"
68+
69+
if ! [ "x%%MODULE_CONFIGURE_ARGS%%" = "x" ]; then
70+
-subpackages="$pkgname-dbg"
71+
+subpackages=""
72+
fi;
73+
74+
source="nginx-module-%%MODULE%%-$_base_version.tar.gz
75+
%%MODULE_SOURCES%%
76+
- COPYRIGHT
77+
"
78+
builddir="$srcdir/%%MODULE_SRCDIR%%"
79+
80+
@@ -137,12 +136,6 @@
81+
ln -s auto/configure configure
82+
fi
83+
84+
- CFLAGS= %%MODULE_ENV%% ./configure %%BASE_CONFIGURE_ARGS%% %%MODULE_CONFIGURE_ARGS%% --with-cc-opt="$CFLAGS %%MODULE_CC_OPT_DEBUG%%" --with-ld-opt="$LDFLAGS %%MODULE_LD_OPT_DEBUG%%" --with-debug
85+
- make $_make_opts modules
86+
- for so in `find objs/ -maxdepth 1 -type f -name "*.so"`; do \
87+
- debugso=`echo ${so} | sed -e 's|\.so$|-debug.so|'` ; \
88+
- mv ${so} ${debugso} ; \
89+
- done
90+
CFLAGS= %%MODULE_ENV%% ./configure %%BASE_CONFIGURE_ARGS%% %%MODULE_CONFIGURE_ARGS%% --with-cc-opt="$CFLAGS %%MODULE_CC_OPT%%" --with-ld-opt="$LDFLAGS %%MODULE_LD_OPT%%"
91+
make $_make_opts modules
92+
fi
93+
@@ -153,12 +146,8 @@
94+
95+
%%MODULE_PREINSTALL%%
96+
97+
- mkdir -p "$pkgdir"/usr/lib/nginx/modules
98+
+ mkdir -p "$pkgdir"/usr/lib/wavex/modules
99+
for so in `find objs/ -maxdepth 1 -type f -name "*.so"`; do \
100+
- install -m755 ${so} "$pkgdir"/usr/lib/nginx/modules/ ; \
101+
+ install -m755 ${so} "$pkgdir"/usr/lib/wavex/modules/ ; \
102+
done
103+
-
104+
- cd "$pkgdir"
105+
-
106+
- install -Dm644 "$srcdir"/COPYRIGHT ./usr/share/licenses/$pkgname/COPYRIGHT
107+
}
108+
--- alpine/alpine/nginx.post-install
109+
+++ deluxe/alpine/nginx.post-install
110+
@@ -18,8 +18,43 @@
111+
----------------------------------------------------------------------
112+
BANNER
113+
114+
+if [ ! -d /var/cache/wavex ]; then
115+
+ mkdir -p /var/cache/wavex
116+
+fi
117+
+
118+
if [ ! -d /var/cache/nginx ]; then
119+
- mkdir -p /var/cache/nginx
120+
+ ln -s /var/cache/wavex/ /var/cache/nginx
121+
+fi
122+
+
123+
+if [ -d /etc/nginx ]; then
124+
+ if [ ! -d /etc/wavex ]; then
125+
+ mkdir -p /etc/wavex
126+
+ fi
127+
+ find /etc/nginx/ -maxdepth 1 -type f -name "*_params" | xargs cp -t /etc/wavex/
128+
+ cp /etc/nginx/fastcgi.conf /etc/wavex/
129+
+ cp /etc/nginx/nginx.conf /etc/wavex/wavex.conf
130+
+ if [ -f /etc/nginx/nginx.conf ]; then
131+
+ sed -i '2s/#user/user/' /etc/nginx/nginx.conf
132+
+ fi
133+
+fi
134+
+
135+
+if [ -d /usr/lib/wavex/modules ]; then
136+
+ mkdir -p /usr/lib/nginx/
137+
+ ln -sf /usr/lib/wavex/modules/ /usr/lib/nginx/modules
138+
+fi
139+
+
140+
+if [ ! -d /etc/wavex/modules ]; then
141+
+ ln -sf /usr/lib/wavex/modules/ /etc/wavex/modules
142+
+fi
143+
+
144+
+if [ ! -d /etc/nginx/conf.d ]; then
145+
+ ln -sf /etc/wavex/conf.d/ /etc/nginx/conf.d
146+
+else
147+
+ mkdir /etc/wavex/conf.d/
148+
+fi
149+
+
150+
+if [ ! -d /etc/nginx/modules ]; then
151+
+ ln -sf /etc/wavex/modules/ /etc/nginx/modules
152+
fi
153+
154+
exit 0
155+
--- alpine/alpine/nginx.pre-install
156+
+++ deluxe/alpine/nginx.pre-install
157+
@@ -2,23 +2,23 @@
158+
159+
set -e
160+
161+
-if ! getent group nginx >/dev/null; then
162+
- addgroup -S nginx 2>/dev/null
163+
+if ! getent group wavex >/dev/null; then
164+
+ addgroup -g 101 -S wavex 2>/dev/null
165+
fi
166+
167+
if ! getent group www-data >/dev/null; then
168+
addgroup -Sg 82 www-data 2>/dev/null
169+
fi
170+
171+
-if ! getent passwd nginx >/dev/null; then
172+
+if ! getent passwd wavex >/dev/null; then
173+
adduser -SDH \
174+
- -h /var/cache/nginx \
175+
- -s /sbin/nologin \
176+
- -G nginx \
177+
- -g nginx \
178+
- nginx 2>/dev/null
179+
-
180+
- addgroup nginx www-data 2>/dev/null
181+
+ -u 101 \
182+
+ -h /var/cache/wavex \
183+
+ -s /sbin/nologin \
184+
+ -G wavex \
185+
+ -g wavex \
186+
+ wavex 2>/dev/null
187+
+ addgroup wavex www-data 2>/dev/null
188+
fi
189+
190+
exit 0

0 commit comments

Comments
 (0)