diff --git a/release/src-rt-6.x.4708/btools/libfoo.pl b/release/src-rt-6.x.4708/btools/libfoo.pl index 17c32568c5..e7c8e2c9a5 100755 --- a/release/src-rt-6.x.4708/btools/libfoo.pl +++ b/release/src-rt-6.x.4708/btools/libfoo.pl @@ -201,7 +201,7 @@ sub fixDyn fixDynDep("minidlna", "libz.so.1"); fixDynDep("minidlna", "libstdc.so.6"); - fixDynDep("minidlna", "libiconv.so.2.6.1"); + fixDynDep("minidlna", "libiconv.so.2.7.0"); fixDynDep("minidlna", "libjpeg.so.8.3.2"); fixDynDep("minidlna", "libogg.so.0"); fixDynDep("minidlna", "libvorbis.so.0"); @@ -268,8 +268,8 @@ sub fixDyn fixDynDep("nginx", "libpcre2-posix.so.3.0.5"); fixDynDep("nginx", "libwolfssl.so.42.2.0"); fixDynDep("php-cgi", "libxml2.so.2.13.5"); - fixDynDep("php-cgi", "libpng16.so.16.45.0"); - fixDynDep("php-cgi", "libiconv.so.2.6.1"); + fixDynDep("php-cgi", "libpng16.so.16.46.0"); + fixDynDep("php-cgi", "libiconv.so.2.7.0"); fixDynDep("php-cgi", "libsqlite3.so.0.8.6"); fixDynDep("php-cgi", "libcurl.so.4.8.0"); fixDynDep("php-cgi", "libjpeg.so.8.3.2"); @@ -279,8 +279,8 @@ sub fixDyn fixDynDep("php-cgi", "libpcre2-posix.so.3.0.5"); fixDynDep("php-cgi", "libzip.so.5.5"); fixDynDep("php-cli", "libxml2.so.2.13.5"); - fixDynDep("php-cli", "libpng16.so.16.45.0"); - fixDynDep("php-cli", "libiconv.so.2.6.1"); + fixDynDep("php-cli", "libpng16.so.16.46.0"); + fixDynDep("php-cli", "libiconv.so.2.7.0"); fixDynDep("php-cli", "libsqlite3.so.0.8.6"); fixDynDep("php-cli", "libcurl.so.4.8.0"); fixDynDep("php-cli", "libjpeg.so.8.3.2"); @@ -290,8 +290,8 @@ sub fixDyn fixDynDep("php-cli", "libpcre2-posix.so.3.0.5"); fixDynDep("php-cli", "libzip.so.5.5"); fixDynDep("php-fpm", "libxml2.so.2.13.5"); - fixDynDep("php-fpm", "libpng16.so.16.45.0"); - fixDynDep("php-fpm", "libiconv.so.2.6.1"); + fixDynDep("php-fpm", "libpng16.so.16.46.0"); + fixDynDep("php-fpm", "libiconv.so.2.7.0"); fixDynDep("php-fpm", "libsqlite3.so.0.8.6"); fixDynDep("php-fpm", "libcurl.so.4.8.0"); fixDynDep("php-fpm", "libjpeg.so.8.3.2"); @@ -320,7 +320,7 @@ sub fixDyn fixDynDep("ebtables-legacy", "libebtc.so.0.0.0"); # samba3 - fixDynDep("samba_multicall", "libiconv.so.2.6.1"); + fixDynDep("samba_multicall", "libiconv.so.2.7.0"); # tor fixDynDep("tor", "libevent-2.1.so.7"); @@ -370,7 +370,7 @@ sub fixDyn fixDynDep("irqbalance", "libglib-2.0.so.0.7400.7"); fixDynDep("libipset.so.11.1.0", "libmnl.so.0.2.0"); - fixDynDep("libglib-2.0.so.0.7400.7", "libiconv.so.2.6.1"); + fixDynDep("libglib-2.0.so.0.7400.7", "libiconv.so.2.7.0"); fixDynDep("libglib-2.0.so.0.7400.7", "libpcre2-8.so.0.13.0"); fixDynDep("libglib-2.0.so.0.7400.7", "libpcre2-posix.so.3.0.5"); @@ -690,8 +690,8 @@ genSO("${root}/usr/lib/liblzo2.so.2.0.0", "${router}/lzo/src/.libs/liblzo2.a", " genSO("${root}/usr/lib/liblz4.so.1.10.0", "${router}/lz4/lib/liblz4.a", "${stripshared}"); genSO("${root}/usr/lib/libcurl.so.4.8.0", "${router}/libcurl/lib/.libs/libcurl.a", "${stripshared}", "-L${router}/zlib -L${router}/${openssldir} -L${router}/wolfssl/staged/usr/lib"); genSO("${root}/usr/lib/libevent-2.1.so.7", "${router}/libevent/.libs/libevent.a", "${stripshared}"); -genSO("${root}/usr/lib/libiconv.so.2.6.1", "${router}/libiconv/lib/.libs/libiconv.a", "${stripshared}"); -genSO("${root}/usr/lib/libpng16.so.16.45.0", "${router}/libpng/staged/usr/lib/libpng16.a", "${stripshared}", "-L${router}/zlib"); +genSO("${root}/usr/lib/libiconv.so.2.7.0", "${router}/libiconv/lib/.libs/libiconv.a", "${stripshared}"); +genSO("${root}/usr/lib/libpng16.so.16.46.0", "${router}/libpng/staged/usr/lib/libpng16.a", "${stripshared}", "-L${router}/zlib"); genSO("${root}/usr/lib/libxml2.so.2.13.5", "${router}/libxml2/staged/usr/lib/libxml2.a", "${stripshared}", "-L${router}/zlib"); genSO("${root}/usr/lib/libpcre.so.1.2.13", "${router}/pcre/.libs/libpcre.a", "${stripshared}"); genSO("${root}/usr/lib/libpcre2-8.so.0.13.0", "${router}/pcre2/staged/usr/lib/libpcre2-8.a", "${stripshared}"); diff --git a/release/src-rt-6.x.4708/router/Makefile b/release/src-rt-6.x.4708/router/Makefile index 02d720be44..87f6e67c5f 100644 --- a/release/src-rt-6.x.4708/router/Makefile +++ b/release/src-rt-6.x.4708/router/Makefile @@ -2500,9 +2500,9 @@ libpng: libpng/build/Makefile @$(MAKE) -C libpng/build DESTDIR=$(TOP)/libpng/staged install libpng-install: - install -D libpng/build/libpng16.so.16.45.0 $(INSTALLDIR)/libpng/usr/lib/libpng16.so.16.45.0 - $(STRIP) $(INSTALLDIR)/libpng/usr/lib/libpng16.so.16.45.0 - cd $(INSTALLDIR)/libpng/usr/lib && ln -sf libpng16.so.16.45.0 libpng16.so && ln -sf libpng16.so.16.45.0 libpng16.so.16 + install -D libpng/build/libpng16.so.16.46.0 $(INSTALLDIR)/libpng/usr/lib/libpng16.so.16.46.0 + $(STRIP) $(INSTALLDIR)/libpng/usr/lib/libpng16.so.16.46.0 + cd $(INSTALLDIR)/libpng/usr/lib && ln -sf libpng16.so.16.46.0 libpng16.so && ln -sf libpng16.so.16.46.0 libpng16.so.16 libpng-clean: @rm -rf libpng/build @@ -3116,11 +3116,11 @@ libiconv-clean: libiconv-install: install -d $(INSTALLDIR)/libiconv/usr/lib - install libiconv/lib/.libs/libiconv.so.2.6.1 $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.6.1 - $(STRIP) -s $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.6.1 + install libiconv/lib/.libs/libiconv.so.2.7.0 $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.7.0 + $(STRIP) -s $(INSTALLDIR)/libiconv/usr/lib/libiconv.so.2.7.0 cd $(INSTALLDIR)/libiconv/usr/lib/ && \ - ln -sf libiconv.so.2.6.1 libiconv.so.2 && \ - ln -sf libiconv.so.2.6.1 libiconv.so + ln -sf libiconv.so.2.7.0 libiconv.so.2 && \ + ln -sf libiconv.so.2.7.0 libiconv.so transmission/build/Makefile: @rm -rf transmission/build && mkdir -p transmission/build