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

Commit

Permalink
Bumped revision to 5.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@paldier
paldier committed Sep 9, 2020
1 parent 757c89a commit 70451d0
Show file tree
Hide file tree
Showing 146 changed files with 112,189 additions and 3,635 deletions.
4 changes: 2 additions & 2 deletions release/src-rt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ export PATH := $(RELEASEDIR)/tools:$(SRCBASE)/ctools:$(PATH)

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

Expand Down
193 changes: 144 additions & 49 deletions release/src/router/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,10 +728,8 @@ obj-y += smartdns
endif
ifeq ($(RTCONFIG_SOFTCENTER),y)
obj-y += skipdbv2 libev-4.22 softcenter libiconv-1.14
obj-y += ipset libmnl libnfnetlink
ifeq ($(RTCONFIG_SOFTCENTER_EXT),y)
obj-y += httpdb
endif
#obj-y += httpdb mbedtls-2.6.0
obj-y += ipset libmnl-1.0.4 libnfnetlink-1.0.1
endif
obj-y += dbus-1.8.8 libpcap
obj-y += readline-6.2
Expand Down Expand Up @@ -2366,6 +2364,100 @@ endif
bonnie-clean:
[ ! -f bonnie/Makefile ] || $(MAKE) -C bonnie clean
@rm -f bonnie/Makefile
libnfnetlink-1.0.1: libnfnetlink-1.0.1/Makefile
$(MAKE) -C libnfnetlink-1.0.1

libnfnetlink-1.0.1/Makefile:
$(MAKE) libnfnetlink-1.0.1-configure

libnfnetlink-1.0.1-configure:
( cd libnfnetlink-1.0.1 && autoreconf -i -f ; \
$(CONFIGURE) \
--prefix=/usr \
--bindir=/usr/sbin \
--libdir=/usr/lib \
)

libnfnetlink-1.0.1-install:
install -D libnfnetlink-1.0.1/src/.libs/libnfnetlink.so $(INSTALLDIR)/libnfnetlink-1.0.1/usr/lib/libnfnetlink.so.0
$(STRIP) $(INSTALLDIR)/libnfnetlink-1.0.1/usr/lib/libnfnetlink.so.0

libnfnetlink-1.0.1-clean:
-@$(MAKE) -C libnfnetlink-1.0.1 clean

libmnl-1.0.4: libmnl-1.0.4/Makefile
$(MAKE) -C libmnl-1.0.4

libmnl-1.0.4/Makefile:
(cd libmnl-1.0.4 && autoreconf -i -f)
$(MAKE) libmnl-1.0.4-configure

libmnl-1.0.4-configure:
( cd libmnl-1.0.4 ; \
$(CONFIGURE) \
--prefix=/usr \
--bindir=/usr/sbin \
--libdir=/usr/lib \
)

libmnl-1.0.4-install:
install -D libmnl-1.0.4/src/.libs/libmnl.so $(INSTALLDIR)/libmnl-1.0.4/usr/lib/libmnl.so.0
$(STRIP) $(INSTALLDIR)/libmnl-1.0.4/usr/lib/libmnl.so.0

libmnl-1.0.4-clean:
-@$(MAKE) -C libmnl-1.0.4 clean

libnetfilter_conntrack-1.0.7: libnfnetlink-1.0.1 libmnl-1.0.4 libnetfilter_conntrack-1.0.7/Makefile
$(MAKE) -C libnetfilter_conntrack-1.0.7

libnetfilter_conntrack-1.0.7/Makefile:
(cd libnetfilter_conntrack-1.0.7 && autoreconf -i -f)
$(MAKE) libnetfilter_conntrack-1.0.7-configure

libnetfilter_conntrack-1.0.7-configure:
( cd libnetfilter_conntrack-1.0.7 ; \
LIBNFNETLINK_CFLAGS="-L$(TOP)/libnfnetlink-1.0.1/src/.libs" \
LIBNFNETLINK_LIBS="-lnfnetlink" \
LIBMNL_CFLAGS="-L$(TOP)/libmnl-1.0.4/src/.libs" \
LIBMNL_LIBS="-lmnl" \
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" \
$(CONFIGURE) \
--prefix=/usr \
--bindir=/usr/sbin \
--libdir=/usr/lib \
)

libnetfilter_conntrack-1.0.7-install:
install -D libnetfilter_conntrack-1.0.7/src/.libs/libnetfilter_conntrack.so $(INSTALLDIR)/libnetfilter_conntrack-1.0.7/usr/lib/libnetfilter_conntrack.so.3
$(STRIP) $(INSTALLDIR)/libnetfilter_conntrack-1.0.7/usr/lib/libnetfilter_conntrack.so.3

libnetfilter_conntrack-1.0.7-clean:
-@$(MAKE) -C libnetfilter_conntrack-1.0.7 clean

libnetfilter_cttimeout-1.0.0: libnetfilter_cttimeout-1.0.0/Makefile
$(MAKE) -C libnetfilter_cttimeout-1.0.0

libnetfilter_cttimeout-1.0.0/Makefile:
(cd libnetfilter_cttimeout-1.0.0 && autoreconf -i -f)
$(MAKE) libnetfilter_cttimeout-1.0.0-configure

libnetfilter_cttimeout-1.0.0-configure:
( cd libnetfilter_cttimeout-1.0.0 ; \
LIBMNL_CFLAGS="-L$(TOP)/libmnl-1.0.4/src/.libs" \
LIBMNL_LIBS="-lmnl" \
CFLAGS="$(CFLAGS) -I$(TOP)/libmnl-1.0.4/include -L$(TOP)/libmnl-1.0.4/src/.libs -lmnl" \
$(CONFIGURE) \
--prefix=/usr \
--bindir=/usr/sbin \
--libdir=/usr/lib \
)

libnetfilter_cttimeout-1.0.0-install:
install -D libnetfilter_cttimeout-1.0.0/src/.libs/libnetfilter_cttimeout.so $(INSTALLDIR)/libnetfilter_cttimeout-1.0.0/usr/lib/libnetfilter_cttimeout.so.1
$(STRIP) $(INSTALLDIR)/libnetfilter_cttimeout-1.0.0/usr/lib/libnetfilter_cttimeout.so.1

libnetfilter_cttimeout-1.0.0-clean:
-@$(MAKE) -C libnetfilter_cttimeout-1.0.0 clean

stress-1.x: stress-1.x/Makefile
$(MAKE) -C stress-1.x
Expand Down Expand Up @@ -2812,6 +2904,7 @@ iptables-1.4.21-install: iptables-1.4.21
ifeq ($(RTCONFIG_IPV6),y)
cd $(INSTALLDIR)/iptables-1.4.21/usr/sbin && \
ln -sf xtables-multi ip6tables-restore && \
ln -sf xtables-multi ip6tables-save && \
ln -sf xtables-multi ip6tables
install -D iptables-1.4.21/libiptc/.libs/libip6tc.so $(INSTALLDIR)/iptables-1.4.21/usr/lib/libip6tc.so
cd $(INSTALLDIR)/iptables-1.4.21/usr/lib && \
Expand Down Expand Up @@ -2877,6 +2970,7 @@ iptables-1.4.x-install: iptables-1.4.x
ifeq ($(RTCONFIG_IPV6),y)
cd $(INSTALLDIR)/iptables-1.4.x/usr/sbin && \
ln -sf xtables-multi ip6tables-restore && \
ln -sf xtables-multi ip6tables-save && \
ln -sf xtables-multi ip6tables
install -D iptables-1.4.x/libiptc/.libs/libip6tc.so $(INSTALLDIR)/iptables-1.4.x/usr/lib/libip6tc.so
cd $(INSTALLDIR)/iptables-1.4.x/usr/lib && \
Expand Down Expand Up @@ -2922,7 +3016,9 @@ libev-4.22-install:
skipdbv2/Makefile: skipdbv2/CMakeLists.txt
cd skipdbv2 && cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_EXE_LINKER_FLAGS="-L$(STAGEDIR)/usr/lib -lev"
-DCMAKE_EXE_LINKER_FLAGS="-L$(STAGEDIR)/usr/lib -lev" \
-DLIBEV_INCLUDE_DIRS="$(TOP)/libev-4.22" \
-DLIBEV_LIBRARIES="$(TOP)/libev-4.22/.libs"

skipdbv2: libev-4.22 skipdbv2/Makefile
$(MAKE) -C $@
Expand All @@ -2942,37 +3038,14 @@ skipdbv2-install: skipdbv2
$(STRIP) $(INSTALLDIR)/skipdbv2/usr/sbin/skipd
$(STRIP) $(INSTALLDIR)/skipdbv2/usr/sbin/dbus

libmnl/stamp-h1:
cd $(TOP)/libmnl && CC=$(CC) STRIP="$(STRIP)" \
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
$(CONFIGURE) --prefix=/usr
touch libmnl/stamp-h1

libmnl: libmnl/stamp-h1
$(MAKE) -C libmnl
$(MAKE) -C libmnl DESTDIR=$(TOP)/libmnl/staged install

libmnl-install: libmnl
install -d $(INSTALLDIR)/libmnl/usr/lib/
install libmnl/src/.libs/libmnl.so.0.1.0 $(INSTALLDIR)/libmnl/usr/lib/libmnl.so.0.1.0
$(STRIP) $(INSTALLDIR)/libmnl/usr/lib/libmnl.so.0.1.0
cd $(INSTALLDIR)/libmnl/usr/lib/ && \
ln -sf libmnl.so.0.1.0 libmnl.so.0 && \
ln -sf libmnl.so.0.1.0 libmnl.so

libmnl-clean:
-@$(MAKE) -C libmnl clean
-@rm -rf libmnl/staged

ipset/stamp-h1: libmnl
cd $(TOP)/ipset && CC=$(CC) STRIP="$(STRIP)" \
ipset/stamp-h1: libmnl-1.0.4
cd $(TOP)/ipset && CC=$(CC) \
autoreconf -i -f && \
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
libmnl_CFLAGS="-I$(TOP)/libmnl/staged/usr/include" \
libmnl_LIBS="-L$(TOP)/libmnl/staged/usr/lib -lmnl" \
$(CONFIGURE) --prefix=/usr --with-kmod=yes --with-kbuild=$(LINUXDIR)
libmnl_CFLAGS="-I$(TOP)/libmnl-1.0.4/include" \
libmnl_LIBS="-L$(TOP)/libmnl-1.0.4/src/.libs -lmnl" \
$(CONFIGURE) --prefix=/usr --with-kmod=no --with-kbuild=$(LINUXDIR)
touch ipset/stamp-h1

ipset: ipset/stamp-h1
Expand All @@ -2994,23 +3067,45 @@ ipset-clean:
-@$(MAKE) -C ipset modules_clean
-@rm -rf ipset/Makefile ipset/stamp-h1

libnfnetlink/stamp-h1:
cd $(TOP)/libnfnetlink && CC=$(CC) STRIP="$(STRIP)" \
CFLAGS="-Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \
LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \
$(CONFIGURE) --prefix=/usr --enable-shared --enable-static
touch libnfnetlink/stamp-h1
mbedtls-2.6.0/stamp-h1:
cd mbedtls-2.6.0 && cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
-DENABLE_TESTING=OFF \
-DENABLE_PROGRAMS=ON

libnfnetlink: libnfnetlink/stamp-h1
@$(SEP)
$(MAKE) -C libnfnetlink

libnfnetlink-install:
install -D libnfnetlink/src/.libs/libnfnetlink.so.0.2.0 $(INSTALLDIR)/libnfnetlink/usr/lib/libnfnetlink.so.0.2.0
$(STRIP) -s $(INSTALLDIR)/libnfnetlink/usr/lib/libnfnetlink.so.0.2.0
cd $(INSTALLDIR)/libnfnetlink/usr/lib/ && \
ln -sf libnfnetlink.so.0.2.0 libnfnetlink.so.0 && \
ln -sf libnfnetlink.so.0.2.0 libnfnetlink.so
mbedtls-2.6.0: mbedtls-2.6.0/stamp-h1
$(MAKE) -C $@

mbedtls-2.6.0-clean:
[ ! -f mbedtls-2.16.3/Makefile ] || $(MAKE) -C mbedtls-2.16.3 -f Makefile clean

mbedtls-2.6.0-install: mbedtls-2.6.0
install -D mbedtls-2.6.0/library/libmbedtls.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedtls.so.2.6.0
install -D mbedtls-2.6.0/library/libmbedcrypto.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedcrypto.so.2.6.0
install -D mbedtls-2.6.0/library/libmbedx509.so.2.6.0 $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedx509.so.2.6.0
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedtls.so.2.6.0
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedcrypto.so.2.6.0
$(STRIP) $(INSTALLDIR)/mbedtls-2.6.0/usr/lib/libmbedx509.so.2.6.0
cd $(INSTALLDIR)/mbedtls-2.6.0/usr/lib && ln -sf libmbedtls.so.2.6.0 libmbedtls.so.10 && \
ln -sf libmbedtls.so.2.6.0 libmbedtls.so && ln -sf libmbedcrypto.so.2.6.0 libmbedcrypto.so.0 && \
ln -sf libmbedcrypto.so.2.6.0 libmbedcrypto.so && ln -sf libmbedx509.so.2.6.0 libmbedx509.so.0 && \
ln -sf libmbedx509.so.2.6.0 libmbedx509.so

httpdb/Makefile: mbedtls-2.6.0
cd httpdb && cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DMBEDTLS="$(TOP)/mbedtls-2.6.0/"

httpdb: httpdb/Makefile
$(MAKE) -C $@

httpdb-clean:
[ ! -f httpdb/Makefile ] || $(MAKE) -C httpdb -f Makefile clean
@rm -f httpdb/Makefile

httpdb-install: httpdb
install -D httpdb/bin/httpdb $(INSTALLDIR)/httpdb/usr/sbin/httpdb
$(STRIP) $(INSTALLDIR)/httpdb/usr/sbin/httpdb
endif

ifeq ($(RTCONFIG_SMARTDNS),y)
Expand Down
2 changes: 1 addition & 1 deletion release/src/router/busybox/config_base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ CONFIG_SORT=y
# CONFIG_TAC is not set
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
# CONFIG_TEE is not set
CONFIG_TEE=y
# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
CONFIG_TRUE=y
# CONFIG_TTY is not set
Expand Down
2 changes: 1 addition & 1 deletion release/src/router/extendno.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
EXTENDNO=RMAC2100_B5.1.1-g365cef9
EXTENDNO=RTAC85P_B5.1.2-g757c89a
27 changes: 27 additions & 0 deletions release/src/router/httpd/httpd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,11 @@ handle_request(void)
}

//2008.08 magic{
#ifdef RTCONFIG_SOFTCENTER
if (file[0] == '\0' || (index(file, '?') == NULL && file[len-1] == '/' && file[0] != '_')){//_api,_temp
#else
if (file[0] == '\0' || (index(file, '?') == NULL && file[len-1] == '/')){
#endif
if (is_firsttime()
#ifdef RTCONFIG_FINDASUS
&& !isDeviceDiscovery
Expand Down Expand Up @@ -1125,6 +1129,9 @@ handle_request(void)
login_error_status = 0;
}else{
if((strncmp(file, "Main_Login.asp", 14)==0 && login_error_status == LOGINLOCK)|| strstr(url, ".png")){
#if defined(RTCONFIG_SOFTCENTER)
}else if(strstr(url, "_resp") || strstr(url, "_result")){
#endif
}else{
send_login_page(fromapp, LOGINLOCK, url, NULL, login_dt, NOLOGINTRY);
return;
Expand All @@ -1141,6 +1148,9 @@ handle_request(void)
login_error_status = 0;
}else{
if((strncmp(file, "Main_Login.asp", 14)==0 && login_error_status == LOGINLOCK)|| strstr(url, ".png")){
#if defined(RTCONFIG_SOFTCENTER)
}else if(strstr(url, "_resp") || strstr(url, "_result")){
#endif
}else{
send_login_page(fromapp, LOGINLOCK, url, NULL, login_dt, NOLOGINTRY);
return;
Expand Down Expand Up @@ -1183,7 +1193,11 @@ handle_request(void)
#endif
nvram_set("httpd_handle_request", url);
nvram_set_int("httpd_handle_request_fromapp", fromapp);
#if defined(RTCONFIG_SOFTCENTER)
if(login_state==3 && !fromapp && !strstr(url, "_resp") && !strstr(url, "_result")){
#else
if(login_state==3 && !fromapp) { // few pages can be shown even someone else login
#endif
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))) {
if(strcasecmp(method, "post") == 0 && handler->input) //response post request
while (cl--) (void)fgetc(conn_fp);
Expand Down Expand Up @@ -1218,6 +1232,10 @@ handle_request(void)
#endif
else if((mime_exception&MIME_EXCEPTION_NOAUTH_ALL)) {
}
#if defined(RTCONFIG_SOFTCENTER)
else if(strstr(url, "_resp") || strstr(url, "_result")){
}
#endif
else {
if(do_referer&CHECK_REFERER){
referer_result = referer_check(referer, fromapp);
Expand Down Expand Up @@ -1258,6 +1276,9 @@ handle_request(void)
http_login(login_ip_tmp, url);
}
}
#if defined(RTCONFIG_SOFTCENTER)
}else if(strstr(url, "_resp") || strstr(url, "_result")){
#endif
}else{
if(do_referer&CHECK_REFERER){
referer_result = check_noauth_referrer(referer, fromapp);
Expand Down Expand Up @@ -1325,6 +1346,12 @@ handle_request(void)
&& !strstr(file, "ss_conf")
&& !strstr(file, "ss_status")
&& !strstr(file, "dbconf")
&& !strstr(url, "_api")
&& !strstr(url, "_root")
&& !strstr(url, "_temp")
&& !strstr(url, "_upload")
&& !strstr(url, "_resp")
&& !strstr(url, "_result")
#endif
){
send_error( 404, "Not Found", (char*) 0, "File not found." );
Expand Down
Loading

0 comments on commit 70451d0

Please sign in to comment.