Skip to content

Commit b5d3a0a

Browse files
github-actions[bot]github-actions[bot]
committed
update 2024-04-23 13:37:52
1 parent 02436d6 commit b5d3a0a

File tree

8 files changed

+73
-41
lines changed

8 files changed

+73
-41
lines changed

‎general/naiveproxy/Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=naiveproxy
8-
PKG_VERSION:=123.0.6312.40-1
8+
PKG_VERSION:=124.0.6367.54-1
99
PKG_RELEASE:=1
1010

1111
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1212
PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
13-
PKG_HASH:=75b67e44c45e9ac5a73688e17252ed6ae8dcb937f9cb9a184c8cd1585a0ceee3
13+
PKG_HASH:=1b85ff1924c2e6cc645c1f44cd4139ef86075c6b82ce8ddb4ef339767089aefa
1414

1515
PKG_LICENSE:=BSD 3-Clause
1616
PKG_LICENSE_FILES:=LICENSE
@@ -66,31 +66,31 @@ ifneq ($(CONFIG_CCACHE),)
6666
export naive_ccache_flags=cc_wrapper="$(CCACHE)"
6767
endif
6868

69-
CLANG_VER:=19-init-2319-g7c4c2746-1
69+
CLANG_VER:=19-init-2941-ga0b3dbaf-22
7070
CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
7171
define Download/CLANG
7272
URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
7373
URL_FILE:=$(CLANG_FILE)
7474
FILE:=$(CLANG_FILE)
75-
HASH:=e065dbcaf9ce5d3fdc6fb3dea1c195b1fc8a0da08cfd40b27ed88857a106e992
75+
HASH:=6741cc1083f935795330b6e04617ac891a7b5d2b5647b664c5b0fccc354adb43
7676
endef
7777

78-
GN_VER:=cfddfffb7913868936e76a269ae824aadd737b1b
78+
GN_VER:=155c53952ec2dc324b0438ce5b9bd4a286577d25
7979
GN_FILE:=gn-git_revision-$(GN_VER).zip
8080
define Download/GN_TOOL
8181
URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+
8282
URL_FILE:=git_revision:$(GN_VER)
8383
FILE:=$(GN_FILE)
84-
HASH:=cf815f75859c1d34c39f73333ed8f90dbfc7db7fa3eac9513ae725e3db2c83c1
84+
HASH:=5a2afa175d93df2e8616ed4fa8026f42d991360d66d5cf122baf0d2de81649be
8585
endef
8686

87-
PGO_VER:=6312-1710232336-55ec5e20adb987a833d822fa3c03ffde72e6a2bb-33fd71f0cc028eebdc456b115c2cc23a6c31514b
87+
PGO_VER:=6367-1712914789-36623db069723c624e3493cb591ef002f569ac07-6fd0ad4338d3d9993dc892b5bc43c5f64866b48d
8888
PGO_FILE:=chrome-linux-$(PGO_VER).profdata
8989
define Download/PGO_PROF
9090
URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles
9191
URL_FILE:=$(PGO_FILE)
9292
FILE:=$(PGO_FILE)
93-
HASH:=c4a3404493b1a6c7a0a4db558e74c19e7f20fea861a65cbae95198c1f620e5ca
93+
HASH:=2d4f2ef0d6235c4ca617d22b2b1ba28d042518a1811c0378896b6ed79913a7b9
9494
endef
9595

9696
define Build/Prepare

‎general/nginx/Makefile

+39-18
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=nginx
11-
PKG_VERSION:=1.25.4
11+
PKG_VERSION:=1.25.5
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://nginx.org/download/
16-
PKG_HASH:=760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
16+
PKG_HASH:=2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0
1717

1818
PKG_MAINTAINER:=Thomas Heil <[email protected]> \
1919
Christian Marangi <[email protected]>
@@ -195,6 +195,15 @@ define Package/nginx-mod-luci/description
195195
Support file for LuCI in nginx. Include custom nginx configuration, autostart script for uwsgi.
196196
endef
197197

198+
define Package/nginx-mod-luci/preinst
199+
#!/bin/sh
200+
grep -r -l ngx_http_ubus_module.so /etc/nginx/module.d | grep -v ngx_http_ubus.module | while read file; do
201+
echo "Removing old LuCI module load file for 'ngx_http_ubus.so' in $$file."
202+
rm -f $$file
203+
done
204+
exit 0
205+
endef
206+
198207
define Package/nginx-mod-luci/install
199208
$(INSTALL_DIR) $(1)/etc/nginx/conf.d
200209
$(INSTALL_CONF) ./files-luci-support/luci.locations $(1)/etc/nginx/conf.d/
@@ -203,9 +212,10 @@ define Package/nginx-mod-luci/install
203212
endef
204213

205214
define Download/nginx-mod-geoip2
215+
SOURCE_DATE:=2020-01-22
206216
VERSION:=1cabd8a1f68ea3998f94e9f3504431970f848fbf
207217
URL:=https://github.com/leev/ngx_http_geoip2_module.git
208-
MIRROR_HASH:=b4bd8517f6595f28e9cea5370045df476e0f7fa9ca3611d71ba85c518f1a7eda
218+
MIRROR_HASH:=f3d2a1af5c34812b5a34453457ba6a4d8093c92085aa7f76c46a1c4185c9735c
209219
PROTO:=git
210220
endef
211221

@@ -237,81 +247,91 @@ define Package/nginx-mod-lua-resty-core/install
237247
endef
238248

239249
define Download/nginx-mod-headers-more
250+
SOURCE_DATE:=2022-07-17
240251
VERSION:=bea1be3bbf6af28f6aa8cf0c01c07ee1637e2bd0
241252
URL:=https://github.com/openresty/headers-more-nginx-module.git
242-
MIRROR_HASH:=3617bbf7a935208a1d8d5f86a8f9b770f6987e4d2b5663a9ab1b777217e3066b
253+
MIRROR_HASH:=569abadc137b5b52bdcc33b00aa21f6d266cb84fb891795da2c4e101c4898abe
243254
PROTO:=git
244255
endef
245256

246257

247258
define Download/nginx-mod-brotli
259+
SOURCE_DATE:=2020-04-23
248260
VERSION:=25f86f0bac1101b6512135eac5f93c49c63609e3
249261
URL:=https://github.com/google/ngx_brotli.git
250-
MIRROR_HASH:=c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
262+
MIRROR_HASH:=680c56be79e7327cb8df271646119333d2f6965a3472bc7043721625fa4488f5
251263
PROTO:=git
252264
endef
253265

254266
define Download/nginx-mod-rtmp
267+
SOURCE_DATE:=2018-12-07
255268
VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
256269
URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
257-
MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
270+
MIRROR_HASH:=9c98d886ae4ea3708bb0bca55f8df803418a407e0ffc6df56341bd76ad39cba8
258271
PROTO:=git
259272
endef
260273

261274
define Download/nginx-mod-ts
275+
SOURCE_DATE:=2017-12-04
262276
VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
263277
URL:=https://github.com/arut/nginx-ts-module.git
264-
MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
278+
MIRROR_HASH:=3f144d4615a4aaa1215435cd06ae4054ea12206d5b38306321420f7acc62aca8
265279
PROTO:=git
266280
endef
267281

268282
define Download/nginx-mod-naxsi
283+
SOURCE_DATE:=2022-09-14
269284
VERSION:=d714f1636ea49a9a9f4f06dba14aee003e970834
270285
URL:=https://github.com/nbs-system/naxsi.git
271-
MIRROR_HASH:=bd006686721a68d43f052f0a4f00e9ff99fb2abfbc4dcf8194a3562fe4e5c08b
286+
MIRROR_HASH:=b0cef5fbf842f283eb5f0686ddd1afcd07d83abd7027c8cfb3e84a2223a34797
272287
PROTO:=git
273288
endef
274289

275290
define Download/nginx-mod-lua
291+
SOURCE_DATE:=2023-08-19
276292
VERSION:=c89469e920713d17d703a5f3736c9335edac22bf
277293
URL:=https://github.com/openresty/lua-nginx-module.git
278-
MIRROR_HASH:=dd66465f65c094a1ddfff2035bff4da870b7c6b7e033d307a9806a6df290a1a5
294+
MIRROR_HASH:=c3bdf1b23f0a63991b5dcbd1f8ee150e6f893b43278e8600e4e0bb42a6572db4
279295
PROTO:=git
280296
endef
281297

282298
define Download/nginx-mod-lua-resty-core
299+
SOURCE_DATE:=2023-09-09
283300
VERSION:=2e2b2adaa61719972fe4275fa4c3585daa0dcd84
284301
URL:=https://github.com/openresty/lua-resty-core.git
285-
MIRROR_HASH:=4bfc267fd027161f88fcbeacce38e6bd13ba894a581c2d6dfe78ee270b1a473c
302+
MIRROR_HASH:=c5f3df92fd72eac5b54497c039aca0f0d9ea1d87223f1e3a54365ba565991874
286303
PROTO:=git
287304
endef
288305

289306
define Download/nginx-mod-lua-resty-lrucache
307+
SOURCE_DATE:=2023-08-06
290308
VERSION:=52f5d00403c8b7aa8a4d4f3779681976b10a18c1
291309
URL:=https://github.com/openresty/lua-resty-lrucache.git
292-
MIRROR_HASH:=618a972574b6b1db1eebf4046d9a471ac03ec092bb825136ba975928d4af2351
310+
MIRROR_HASH:=0833e0114948af4edb216c5c34b3f1919f534b298f4fa29739544f7c9bb8a08d
293311
PROTO:=git
294312
endef
295313

296314
define Download/nginx-mod-dav-ext
315+
SOURCE_DATE:=2018-12-17
297316
VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
298317
URL:=https://github.com/arut/nginx-dav-ext-module.git
299-
MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
318+
MIRROR_HASH:=c574e60ffab5f6e5d8bea18aab0799c19cd9a84f3d819b787e9af4f0e7867b52
300319
PROTO:=git
301320
endef
302321

303322
define Download/nginx-mod-ubus
323+
SOURCE_DATE:=2020-09-06
304324
VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
305325
URL:=https://github.com/Ansuel/nginx-ubus-module.git
306-
MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
326+
MIRROR_HASH:=515bb9d355ad80916f594046a45c190a68fb6554d6795a54ca15cab8bdd12fda
307327
PROTO:=git
308328
endef
309329

310330
define Module/Download
311331
define Download/nginx-mod-$(1) +=
312332

313333
SUBDIR:=nginx-mod-$(1)
314-
FILE:=nginx-mod-$(1)-$$$$(VERSION).tar.xz
334+
FILE:=nginx-mod-$(1)-$$$$(subst -,.,$$$$(SOURCE_DATE))~$$$$(call version_abbrev,$$$$(VERSION)).tar.zst
315335
endef
316336
endef
317337
$(foreach m,$(PKG_MOD_EXTRA),$(eval $(call Module/Download,$(m))))
@@ -341,7 +361,7 @@ define Module/Build/Prepare
341361
$(eval $(call Download,nginx-mod-$(1)))
342362
$(eval $(Download/nginx-mod-$(1)))
343363
mkdir -p $(PKG_BUILD_DIR)/nginx-mod-$(1)
344-
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR)/nginx-mod-$(1) $(TAR_OPTIONS) --strip-components 1
364+
zstdcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR)/nginx-mod-$(1) $(TAR_OPTIONS) --strip-components 1
345365
endef
346366

347367
define Build/Prepare
@@ -375,8 +395,10 @@ define BuildModule
375395

376396
define Package/nginx-mod-$(1)/install
377397
$(INSTALL_DIR) $$(1)/usr/lib/nginx/modules
398+
$(INSTALL_DIR) $$(1)/etc/nginx/module.d
378399
$(foreach m,$(3),
379-
$(CP) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/$(m)_module.so $$(1)/usr/lib/nginx/modules
400+
$(CP) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/$(m)_module.so $$(1)/usr/lib/nginx/modules && \
401+
echo "load_module /usr/lib/nginx/modules/$(m)_module.so;" > $$(1)/etc/nginx/module.d/$(m).module
380402
)
381403
$(call Module/nginx-mod-$(1)/install,$$(1))
382404
endef
@@ -406,7 +428,6 @@ CONFIGURE_ARGS += \
406428
--http-proxy-temp-path=/var/lib/nginx/proxy \
407429
--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
408430
--with-cc="$(TARGET_CC)" \
409-
--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
410431
--with-ld-opt="$(TARGET_LDFLAGS)" \
411432
--without-http_upstream_zone_module \
412433
--with-compat \
@@ -478,7 +499,7 @@ $(eval $(call BuildModule,brotli,,ngx_http_brotli_filter ngx_http_brotli_static,
478499
Add support for brotli compression module.))
479500
$(eval $(call BuildModule,naxsi,,ngx_http_naxsi, \
480501
Enable NAXSI module.))
481-
$(eval $(call BuildModule,geoip2,+@NGINX_STREAM_CORE_MODULE +libmaxminddb,ngx_http_geoip2 ngx_stream_geoip2, \
502+
$(eval $(call BuildModule,geoip2,+@NGINX_STREAM_CORE_MODULE +nginx-mod-stream +libmaxminddb,ngx_http_geoip2 ngx_stream_geoip2, \
482503
Enable MaxMind GeoIP2 module.))
483504

484505
# TODO: remove after a transition period (together with pkg nginx-util):

‎general/nginx/files-luci-support/60_nginx-luci-support

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ location /ubus {
1212
EOT
1313
fi
1414

15-
if [ ! -f "/etc/nginx/module.d/luci.module" ]; then
16-
cat <<EOT >> /etc/nginx/module.d/luci.module
15+
if [ ! -f "/etc/nginx/module.d/ngx_http_ubus.module" ]; then
16+
cat <<EOT > /etc/nginx/module.d/ngx_http_ubus.module
1717
load_module /usr/lib/nginx/modules/ngx_http_ubus_module.so;
1818
EOT
1919
fi

‎general/nginx/patches/nginx/201-ignore-invalid-options.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/auto/options
22
+++ b/auto/options
3-
@@ -411,8 +411,7 @@ $0: warning: the \"--with-sha1-asm\" opt
3+
@@ -413,8 +413,7 @@ $0: warning: the \"--with-sha1-asm\" opt
44
--test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
55

66
*)

‎general/nginx/patches/nginx/202-fix-fPIC-on-link.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/auto/make
2+
+++ b/auto/make
3+
@@ -623,7 +623,7 @@ END
4+
modules: $ngx_obj
5+
6+
$ngx_obj: $ngx_deps$ngx_spacer
7+
- \$(LINK) $ngx_long_start$ngx_binout$ngx_obj$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_module_link
8+
+ \$(LINK) $ngx_pic_opt $ngx_long_start$ngx_binout$ngx_obj$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_module_link
9+
$ngx_long_end
10+
11+
$ngx_modules_obj: \$(CORE_DEPS)$ngx_cont$ngx_modules_c

‎general/shadowsocks-rust/Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=shadowsocks-rust
9-
PKG_VERSION:=1.18.2
9+
PKG_VERSION:=1.18.3
1010
PKG_RELEASE:=1
1111

1212
PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)
@@ -21,29 +21,29 @@ endif
2121

2222
ifeq ($(ARCH),aarch64)
2323
PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
24-
PKG_HASH:=cdafb055f6dd64a21d1032b128227a03ce4f695e2b13ec25f935111b381f6d61
24+
PKG_HASH:=2ca23d4ea356634dc6f005da334125a564f5e2dad08c987582e3887fdc89ae91
2525
else ifeq ($(ARCH),arm)
2626
# Referred to golang/golang-values.mk
2727
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
2828
ifeq ($(ARM_CPU_FEATURES),)
2929
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER)
30-
PKG_HASH:=fb6244e4046785b48f31d5dfb430319cff3c5d6a715335a6a4b28471105415aa
30+
PKG_HASH:=1169dce76405ea5bf903d37a0c2657bfef6fa0a19671f3316a5d2d9b96d00680
3131
else
3232
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
33-
PKG_HASH:=b12327532fa37eeac4b806388106124d2f43aed79fba2c671e384cee9b7b8672
33+
PKG_HASH:=2d3ca7df8e99a3a1d398f3a28eef48f1c3b1ad74c630554af72f3063f3dc25fe
3434
endif
3535
else ifeq ($(ARCH),i386)
3636
PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
37-
PKG_HASH:=6be4b052ee82c6dd0d7549bf62f27965f38c1fa87964decc50dba42efc014b0c
37+
PKG_HASH:=af121839c1b7d5b85959890f0895550bd48c6015ec2329f5ff3cabae006d722d
3838
else ifeq ($(ARCH),x86_64)
3939
PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
40-
PKG_HASH:=206d1f0a95c6964c7d03bc9779e1d75ff332518a6bc5656a5893c3f025cbcb88
40+
PKG_HASH:=8763b933919d8e557d910c34deb77962b151e86fcb873b56da6f4a03666d0db6
4141
else ifeq ($(ARCH),mips)
4242
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
43-
PKG_HASH:=4bb3eca57ae06682b5bc107e9cbf0518ba2602c0330652290828019862aebbdd
43+
PKG_HASH:=89d6f5dbecf79022404137772c21cb8c77372166092b1d805d87620d1f50bbb1
4444
else ifeq ($(ARCH),mipsel)
4545
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mipsel-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
46-
PKG_HASH:=80759bd4262e6597dadd303d3b9026b65e26cd7b0f5e229b6044d6838ba51fcb
46+
PKG_HASH:=aa2ecb8312f22be2eed0ede56ab173194498f4df16afdc66409803e91b76f06b
4747
# Set the default value to make OpenWrt Package Checker happy
4848
else
4949
PKG_SOURCE:=dummy

‎general/tailscale/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=tailscale
11-
PKG_VERSION:=1.64.1
11+
PKG_VERSION:=1.64.2
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
16-
PKG_HASH:=df6009abb4800a7e7681063c9d3f62da6850060e4949ca0bd1edad60781e9f03
16+
PKG_HASH:=e5e46f6b6b716b2c4696dce0b92dc2e36f02b06b7ad9f055042a820ad61b2a47
1717

1818
PKG_MAINTAINER:=Jan Pavlinec <[email protected]>
1919
PKG_LICENSE:=BSD-3-Clause

‎sh/breakings_diy-part2.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=eb872b4f0e1f0ebe59c9f7bd8c506c4204893ba6a8492de
658658
#cp -rf $GITHUB_WORKSPACE/general/nano feeds/packages/utils
659659

660660
# dnsproxy
661-
sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.69.2/g' feeds/packages/net/dnsproxy/Makefile
662-
sed -i 's/PKG_HASH:=.*/PKG_HASH:=aa1cea0eea683bde017acbb30c09c96b24b30133e157e743666be900ad7560ea/g' feeds/packages/net/dnsproxy/Makefile
661+
sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.70.0/g' feeds/packages/net/dnsproxy/Makefile
662+
sed -i 's/PKG_HASH:=.*/PKG_HASH:=a78ce398f2019e7a3a57e7ffcb06ecfb6d08e36e0a07c58ada4ac4871cecd677/g' feeds/packages/net/dnsproxy/Makefile
663663

664664
# libnl-tiny
665665
#sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' package/libs/libnl-tiny/Makefile

0 commit comments

Comments
 (0)