Skip to content
This repository was archived by the owner on Jan 3, 2022. It is now read-only.

Commit 70451d0

Browse files
paldierpaldier
committed
Bumped revision to 5.1.2
1 parent 757c89a commit 70451d0

File tree

146 files changed

+112189
-3635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+112189
-3635
lines changed

‎release/src-rt/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ export PATH := $(RELEASEDIR)/tools:$(SRCBASE)/ctools:$(PATH)
6969

7070
#K3C/K3/SBRAC1900P/SBRAC3200P/R7000/R8000/R7900P/R8000P/RTACRH17/RTAC85P/GTAC2900/GTAC5300/RTAC86U/RTAC68U/RTAC3100/RTAC3200/RTAC68P/BLUECAVE/EA6700
7171
#aimesh:R(384 and 385),non-aimesh:B(382 and 384),special:X(382/384/385/386)
72-
export MERLINR_NAME := RMAC2100
72+
export MERLINR_NAME := RTAC85P
7373
export MERLINR_VER_MAJOR :=B
74-
export MERLINR_VER_MINOR :=5.1.1
74+
export MERLINR_VER_MINOR :=5.1.2
7575
export MERLINR_VER := $(MERLINR_VER_MAJOR)$(MERLINR_VER_MINOR)
7676
export MERLINRVER := $(MERLINR_NAME)_$(MERLINR_VER)
7777

‎release/src/router/Makefile

+144-49
Original file line numberDiff line numberDiff line change
@@ -728,10 +728,8 @@ obj-y += smartdns
728728
endif
729729
ifeq ($(RTCONFIG_SOFTCENTER),y)
730730
obj-y += skipdbv2 libev-4.22 softcenter libiconv-1.14
731-
obj-y += ipset libmnl libnfnetlink
732-
ifeq ($(RTCONFIG_SOFTCENTER_EXT),y)
733-
obj-y += httpdb
734-
endif
731+
#obj-y += httpdb mbedtls-2.6.0
732+
obj-y += ipset libmnl-1.0.4 libnfnetlink-1.0.1
735733
endif
736734
obj-y += dbus-1.8.8 libpcap
737735
obj-y += readline-6.2
@@ -2366,6 +2364,100 @@ endif
23662364
bonnie-clean:
23672365
[ ! -f bonnie/Makefile ] || $(MAKE) -C bonnie clean
23682366
@rm -f bonnie/Makefile
2367+
libnfnetlink-1.0.1: libnfnetlink-1.0.1/Makefile
2368+
$(MAKE) -C libnfnetlink-1.0.1
2369+
2370+
libnfnetlink-1.0.1/Makefile:
2371+
$(MAKE) libnfnetlink-1.0.1-configure
2372+
2373+
libnfnetlink-1.0.1-configure:
2374+
( cd libnfnetlink-1.0.1 && autoreconf -i -f ; \
2375+
$(CONFIGURE) \
2376+
--prefix=/usr \
2377+
--bindir=/usr/sbin \
2378+
--libdir=/usr/lib \
2379+
)
2380+
2381+
libnfnetlink-1.0.1-install:
2382+
install -D libnfnetlink-1.0.1/src/.libs/libnfnetlink.so $(INSTALLDIR)/libnfnetlink-1.0.1/usr/lib/libnfnetlink.so.0
2383+
$(STRIP) $(INSTALLDIR)/libnfnetlink-1.0.1/usr/lib/libnfnetlink.so.0
2384+
2385+
libnfnetlink-1.0.1-clean:
2386+
-@$(MAKE) -C libnfnetlink-1.0.1 clean
2387+
2388+
libmnl-1.0.4: libmnl-1.0.4/Makefile
2389+
$(MAKE) -C libmnl-1.0.4
2390+
2391+
libmnl-1.0.4/Makefile:
2392+
(cd libmnl-1.0.4 && autoreconf -i -f)
2393+
$(MAKE) libmnl-1.0.4-configure
2394+
2395+
libmnl-1.0.4-configure:
2396+
( cd libmnl-1.0.4 ; \
2397+
$(CONFIGURE) \
2398+
--prefix=/usr \
2399+
--bindir=/usr/sbin \
2400+
--libdir=/usr/lib \
2401+
)
2402+
2403+
libmnl-1.0.4-install:
2404+
install -D libmnl-1.0.4/src/.libs/libmnl.so $(INSTALLDIR)/libmnl-1.0.4/usr/lib/libmnl.so.0
2405+
$(STRIP) $(INSTALLDIR)/libmnl-1.0.4/usr/lib/libmnl.so.0
2406+
2407+
libmnl-1.0.4-clean:
2408+
-@$(MAKE) -C libmnl-1.0.4 clean
2409+
2410+
libnetfilter_conntrack-1.0.7: libnfnetlink-1.0.1 libmnl-1.0.4 libnetfilter_conntrack-1.0.7/Makefile
2411+
$(MAKE) -C libnetfilter_conntrack-1.0.7
2412+
2413+
libnetfilter_conntrack-1.0.7/Makefile:
2414+
(cd libnetfilter_conntrack-1.0.7 && autoreconf -i -f)
2415+
$(MAKE) libnetfilter_conntrack-1.0.7-configure
2416+
2417+
libnetfilter_conntrack-1.0.7-configure:
2418+
( cd libnetfilter_conntrack-1.0.7 ; \
2419+
LIBNFNETLINK_CFLAGS="-L$(TOP)/libnfnetlink-1.0.1/src/.libs" \
2420+
LIBNFNETLINK_LIBS="-lnfnetlink" \
2421+
LIBMNL_CFLAGS="-L$(TOP)/libmnl-1.0.4/src/.libs" \
2422+
LIBMNL_LIBS="-lmnl" \
2423+
CFLAGS="$(CFLAGS) -I$(TOP)/libnfnetlink-1.0.1/include/ -I$(TOP)/libmnl-1.0.4/include -L$(TOP)/libnfnetlink-1.0.1/src/.libs -lnfnetlink -L$(TOP)/libmnl-1.0.4/src/.libs -lmnl" \
2424+
$(CONFIGURE) \
2425+
--prefix=/usr \
2426+
--bindir=/usr/sbin \
2427+
--libdir=/usr/lib \
2428+
)
2429+
2430+
libnetfilter_conntrack-1.0.7-install:
2431+
install -D libnetfilter_conntrack-1.0.7/src/.libs/libnetfilter_conntrack.so $(INSTALLDIR)/libnetfilter_conntrack-1.0.7/usr/lib/libnetfilter_conntrack.so.3
2432+
$(STRIP) $(INSTALLDIR)/libnetfilter_conntrack-1.0.7/usr/lib/libnetfilter_conntrack.so.3
2433+
2434+
libnetfilter_conntrack-1.0.7-clean:
2435+
-@$(MAKE) -C libnetfilter_conntrack-1.0.7 clean
2436+
2437+
libnetfilter_cttimeout-1.0.0: libnetfilter_cttimeout-1.0.0/Makefile
2438+
$(MAKE) -C libnetfilter_cttimeout-1.0.0
2439+
2440+
libnetfilter_cttimeout-1.0.0/Makefile:
2441+
(cd libnetfilter_cttimeout-1.0.0 && autoreconf -i -f)
2442+
$(MAKE) libnetfilter_cttimeout-1.0.0-configure
2443+
2444+
libnetfilter_cttimeout-1.0.0-configure:
2445+
( cd libnetfilter_cttimeout-1.0.0 ; \
2446+
LIBMNL_CFLAGS="-L$(TOP)/libmnl-1.0.4/src/.libs" \
2447+
LIBMNL_LIBS="-lmnl" \
2448+
CFLAGS="$(CFLAGS) -I$(TOP)/libmnl-1.0.4/include -L$(TOP)/libmnl-1.0.4/src/.libs -lmnl" \
2449+
$(CONFIGURE) \
2450+
--prefix=/usr \
2451+
--bindir=/usr/sbin \
2452+
--libdir=/usr/lib \
2453+
)
2454+
2455+
libnetfilter_cttimeout-1.0.0-install:
2456+
install -D libnetfilter_cttimeout-1.0.0/src/.libs/libnetfilter_cttimeout.so $(INSTALLDIR)/libnetfilter_cttimeout-1.0.0/usr/lib/libnetfilter_cttimeout.so.1
2457+
$(STRIP) $(INSTALLDIR)/libnetfilter_cttimeout-1.0.0/usr/lib/libnetfilter_cttimeout.so.1
2458+
2459+
libnetfilter_cttimeout-1.0.0-clean:
2460+
-@$(MAKE) -C libnetfilter_cttimeout-1.0.0 clean
23692461

23702462
stress-1.x: stress-1.x/Makefile
23712463
$(MAKE) -C stress-1.x
@@ -2812,6 +2904,7 @@ iptables-1.4.21-install: iptables-1.4.21
28122904
ifeq ($(RTCONFIG_IPV6),y)
28132905
cd $(INSTALLDIR)/iptables-1.4.21/usr/sbin && \
28142906
ln -sf xtables-multi ip6tables-restore && \
2907+
ln -sf xtables-multi ip6tables-save && \
28152908
ln -sf xtables-multi ip6tables
28162909
install -D iptables-1.4.21/libiptc/.libs/libip6tc.so $(INSTALLDIR)/iptables-1.4.21/usr/lib/libip6tc.so
28172910
cd $(INSTALLDIR)/iptables-1.4.21/usr/lib && \
@@ -2877,6 +2970,7 @@ iptables-1.4.x-install: iptables-1.4.x
28772970
ifeq ($(RTCONFIG_IPV6),y)
28782971
cd $(INSTALLDIR)/iptables-1.4.x/usr/sbin && \
28792972
ln -sf xtables-multi ip6tables-restore && \
2973+
ln -sf xtables-multi ip6tables-save && \
28802974
ln -sf xtables-multi ip6tables
28812975
install -D iptables-1.4.x/libiptc/.libs/libip6tc.so $(INSTALLDIR)/iptables-1.4.x/usr/lib/libip6tc.so
28822976
cd $(INSTALLDIR)/iptables-1.4.x/usr/lib && \
@@ -2922,7 +3016,9 @@ libev-4.22-install:
29223016
skipdbv2/Makefile: skipdbv2/CMakeLists.txt
29233017
cd skipdbv2 && cmake -DCMAKE_INSTALL_PREFIX=/usr \
29243018
-DCMAKE_BUILD_TYPE=Release \
2925-
-DCMAKE_EXE_LINKER_FLAGS="-L$(STAGEDIR)/usr/lib -lev"
3019+
-DCMAKE_EXE_LINKER_FLAGS="-L$(STAGEDIR)/usr/lib -lev" \
3020+
-DLIBEV_INCLUDE_DIRS="$(TOP)/libev-4.22" \
3021+
-DLIBEV_LIBRARIES="$(TOP)/libev-4.22/.libs"
29263022

29273023
skipdbv2: libev-4.22 skipdbv2/Makefile
29283024
$(MAKE) -C $@
@@ -2942,37 +3038,14 @@ skipdbv2-install: skipdbv2
29423038
$(STRIP) $(INSTALLDIR)/skipdbv2/usr/sbin/skipd
29433039
$(STRIP) $(INSTALLDIR)/skipdbv2/usr/sbin/dbus
29443040

2945-
libmnl/stamp-h1:
2946-
cd $(TOP)/libmnl && CC=$(CC) STRIP="$(STRIP)" \
2947-
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
2948-
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
2949-
$(CONFIGURE) --prefix=/usr
2950-
touch libmnl/stamp-h1
2951-
2952-
libmnl: libmnl/stamp-h1
2953-
$(MAKE) -C libmnl
2954-
$(MAKE) -C libmnl DESTDIR=$(TOP)/libmnl/staged install
2955-
2956-
libmnl-install: libmnl
2957-
install -d $(INSTALLDIR)/libmnl/usr/lib/
2958-
install libmnl/src/.libs/libmnl.so.0.1.0 $(INSTALLDIR)/libmnl/usr/lib/libmnl.so.0.1.0
2959-
$(STRIP) $(INSTALLDIR)/libmnl/usr/lib/libmnl.so.0.1.0
2960-
cd $(INSTALLDIR)/libmnl/usr/lib/ && \
2961-
ln -sf libmnl.so.0.1.0 libmnl.so.0 && \
2962-
ln -sf libmnl.so.0.1.0 libmnl.so
2963-
2964-
libmnl-clean:
2965-
-@$(MAKE) -C libmnl clean
2966-
-@rm -rf libmnl/staged
2967-
2968-
ipset/stamp-h1: libmnl
2969-
cd $(TOP)/ipset && CC=$(CC) STRIP="$(STRIP)" \
3041+
ipset/stamp-h1: libmnl-1.0.4
3042+
cd $(TOP)/ipset && CC=$(CC) \
29703043
autoreconf -i -f && \
29713044
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
29723045
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
2973-
libmnl_CFLAGS="-I$(TOP)/libmnl/staged/usr/include" \
2974-
libmnl_LIBS="-L$(TOP)/libmnl/staged/usr/lib -lmnl" \
2975-
$(CONFIGURE) --prefix=/usr --with-kmod=yes --with-kbuild=$(LINUXDIR)
3046+
libmnl_CFLAGS="-I$(TOP)/libmnl-1.0.4/include" \
3047+
libmnl_LIBS="-L$(TOP)/libmnl-1.0.4/src/.libs -lmnl" \
3048+
$(CONFIGURE) --prefix=/usr --with-kmod=no --with-kbuild=$(LINUXDIR)
29763049
touch ipset/stamp-h1
29773050

29783051
ipset: ipset/stamp-h1
@@ -2994,23 +3067,45 @@ ipset-clean:
29943067
-@$(MAKE) -C ipset modules_clean
29953068
-@rm -rf ipset/Makefile ipset/stamp-h1
29963069

2997-
libnfnetlink/stamp-h1:
2998-
cd $(TOP)/libnfnetlink && CC=$(CC) STRIP="$(STRIP)" \
2999-
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
3000-
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
3001-
$(CONFIGURE) --prefix=/usr --enable-shared --enable-static
3002-
touch libnfnetlink/stamp-h1
3070+
mbedtls-2.6.0/stamp-h1:
3071+
cd mbedtls-2.6.0 && cmake -DCMAKE_INSTALL_PREFIX=/usr \
3072+
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
3073+
-DENABLE_TESTING=OFF \
3074+
-DENABLE_PROGRAMS=ON
30033075

3004-
libnfnetlink: libnfnetlink/stamp-h1
3005-
@$(SEP)
3006-
$(MAKE) -C libnfnetlink
3007-
3008-
libnfnetlink-install:
3009-
install -D libnfnetlink/src/.libs/libnfnetlink.so.0.2.0 $(INSTALLDIR)/libnfnetlink/usr/lib/libnfnetlink.so.0.2.0
3010-
$(STRIP) -s $(INSTALLDIR)/libnfnetlink/usr/lib/libnfnetlink.so.0.2.0
3011-
cd $(INSTALLDIR)/libnfnetlink/usr/lib/ && \
3012-
ln -sf libnfnetlink.so.0.2.0 libnfnetlink.so.0 && \
3013-
ln -sf libnfnetlink.so.0.2.0 libnfnetlink.so
3076+
mbedtls-2.6.0: mbedtls-2.6.0/stamp-h1
3077+
$(MAKE) -C $@
3078+
3079+
mbedtls-2.6.0-clean:
3080+
[ ! -f mbedtls-2.16.3/Makefile ] || $(MAKE) -C mbedtls-2.16.3 -f Makefile clean
3081+
3082+
mbedtls-2.6.0-install: mbedtls-2.6.0
3083+
install -D mbedtls-2.6.0/library/libmbedtls.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedtls.so.2.6.0
3084+
install -D mbedtls-2.6.0/library/libmbedcrypto.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedcrypto.so.2.6.0
3085+
install -D mbedtls-2.6.0/library/libmbedx509.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedx509.so.2.6.0
3086+
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedtls.so.2.6.0
3087+
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedcrypto.so.2.6.0
3088+
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedx509.so.2.6.0
3089+
cd $(INSTALLDIR)/mbedtls-2.6.0/usr/lib && ln -sf libmbedtls.so.2.6.0 libmbedtls.so.10 && \
3090+
ln -sf libmbedtls.so.2.6.0 libmbedtls.so && ln -sf libmbedcrypto.so.2.6.0 libmbedcrypto.so.0 && \
3091+
ln -sf libmbedcrypto.so.2.6.0 libmbedcrypto.so && ln -sf libmbedx509.so.2.6.0 libmbedx509.so.0 && \
3092+
ln -sf libmbedx509.so.2.6.0 libmbedx509.so
3093+
3094+
httpdb/Makefile: mbedtls-2.6.0
3095+
cd httpdb && cmake -DCMAKE_INSTALL_PREFIX=/usr \
3096+
-DCMAKE_BUILD_TYPE=Release \
3097+
-DMBEDTLS="$(TOP)/mbedtls-2.6.0/"
3098+
3099+
httpdb: httpdb/Makefile
3100+
$(MAKE) -C $@
3101+
3102+
httpdb-clean:
3103+
[ ! -f httpdb/Makefile ] || $(MAKE) -C httpdb -f Makefile clean
3104+
@rm -f httpdb/Makefile
3105+
3106+
httpdb-install: httpdb
3107+
install -D httpdb/bin/httpdb $(INSTALLDIR)/httpdb/usr/sbin/httpdb
3108+
$(STRIP) $(INSTALLDIR)/httpdb/usr/sbin/httpdb
30143109
endif
30153110

30163111
ifeq ($(RTCONFIG_SMARTDNS),y)

‎release/src/router/busybox/config_base

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ CONFIG_SORT=y
295295
# CONFIG_TAC is not set
296296
CONFIG_TAIL=y
297297
CONFIG_FEATURE_FANCY_TAIL=y
298-
# CONFIG_TEE is not set
298+
CONFIG_TEE=y
299299
# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
300300
CONFIG_TRUE=y
301301
# CONFIG_TTY is not set

‎release/src/router/extendno.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
EXTENDNO=RMAC2100_B5.1.1-g365cef9
1+
EXTENDNO=RTAC85P_B5.1.2-g757c89a

‎release/src/router/httpd/httpd.c

+27
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,11 @@ handle_request(void)
10111011
}
10121012

10131013
//2008.08 magic{
1014+
#ifdef RTCONFIG_SOFTCENTER
1015+
if (file[0] == '\0' || (index(file, '?') == NULL && file[len-1] == '/' && file[0] != '_')){//_api,_temp
1016+
#else
10141017
if (file[0] == '\0' || (index(file, '?') == NULL && file[len-1] == '/')){
1018+
#endif
10151019
if (is_firsttime()
10161020
#ifdef RTCONFIG_FINDASUS
10171021
&& !isDeviceDiscovery
@@ -1125,6 +1129,9 @@ handle_request(void)
11251129
login_error_status = 0;
11261130
}else{
11271131
if((strncmp(file, "Main_Login.asp", 14)==0 && login_error_status == LOGINLOCK)|| strstr(url, ".png")){
1132+
#if defined(RTCONFIG_SOFTCENTER)
1133+
}else if(strstr(url, "_resp") || strstr(url, "_result")){
1134+
#endif
11281135
}else{
11291136
send_login_page(fromapp, LOGINLOCK, url, NULL, login_dt, NOLOGINTRY);
11301137
return;
@@ -1141,6 +1148,9 @@ handle_request(void)
11411148
login_error_status = 0;
11421149
}else{
11431150
if((strncmp(file, "Main_Login.asp", 14)==0 && login_error_status == LOGINLOCK)|| strstr(url, ".png")){
1151+
#if defined(RTCONFIG_SOFTCENTER)
1152+
}else if(strstr(url, "_resp") || strstr(url, "_result")){
1153+
#endif
11441154
}else{
11451155
send_login_page(fromapp, LOGINLOCK, url, NULL, login_dt, NOLOGINTRY);
11461156
return;
@@ -1183,7 +1193,11 @@ handle_request(void)
11831193
#endif
11841194
nvram_set("httpd_handle_request", url);
11851195
nvram_set_int("httpd_handle_request_fromapp", fromapp);
1196+
#if defined(RTCONFIG_SOFTCENTER)
1197+
if(login_state==3 && !fromapp && !strstr(url, "_resp") && !strstr(url, "_result")){
1198+
#else
11861199
if(login_state==3 && !fromapp) { // few pages can be shown even someone else login
1200+
#endif
11871201
if(!(mime_exception&MIME_EXCEPTION_MAINPAGE || (strncmp(file, "Main_Login.asp", 14)==0 && login_error_status == 9) || ((!handler->auth) && strncmp(file, "Main_Login.asp", 14) != 0))) {
11881202
if(strcasecmp(method, "post") == 0 && handler->input) //response post request
11891203
while (cl--) (void)fgetc(conn_fp);
@@ -1218,6 +1232,10 @@ handle_request(void)
12181232
#endif
12191233
else if((mime_exception&MIME_EXCEPTION_NOAUTH_ALL)) {
12201234
}
1235+
#if defined(RTCONFIG_SOFTCENTER)
1236+
else if(strstr(url, "_resp") || strstr(url, "_result")){
1237+
}
1238+
#endif
12211239
else {
12221240
if(do_referer&CHECK_REFERER){
12231241
referer_result = referer_check(referer, fromapp);
@@ -1258,6 +1276,9 @@ handle_request(void)
12581276
http_login(login_ip_tmp, url);
12591277
}
12601278
}
1279+
#if defined(RTCONFIG_SOFTCENTER)
1280+
}else if(strstr(url, "_resp") || strstr(url, "_result")){
1281+
#endif
12611282
}else{
12621283
if(do_referer&CHECK_REFERER){
12631284
referer_result = check_noauth_referrer(referer, fromapp);
@@ -1325,6 +1346,12 @@ handle_request(void)
13251346
&& !strstr(file, "ss_conf")
13261347
&& !strstr(file, "ss_status")
13271348
&& !strstr(file, "dbconf")
1349+
&& !strstr(url, "_api")
1350+
&& !strstr(url, "_root")
1351+
&& !strstr(url, "_temp")
1352+
&& !strstr(url, "_upload")
1353+
&& !strstr(url, "_resp")
1354+
&& !strstr(url, "_result")
13281355
#endif
13291356
){
13301357
send_error( 404, "Not Found", (char*) 0, "File not found." );

0 commit comments

Comments
 (0)