Skip to content

Commit

Permalink
Merge tag '384.15-mainline' into dsl-ac68u-384.15
Browse files Browse the repository at this point in the history 
384.15-mainline
  • Loading branch information
@zaloisio
zaloisio committed Feb 10, 2020
2 parents 4ff90ff + da0c8cd commit e5489e7
Show file tree
Hide file tree
Showing 1,340 changed files with 109,038 additions and 61,440 deletions.
89 changes: 89 additions & 0 deletions Changelog-NG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,95 @@
Asuswrt-Merlin 384/NG Changelog
===============================

384.15 (8-Feb-2020)
The RT-AC87U and RT-AC3200 are not supported by this release, see
the 384.13_4 release released separately for these two models.

- NEW: wan-event script. The first parameter will be the WAN unit
(0 for first WAN, 1 for secondary). The second parameter
will be a string describing the type of event (init,
connected, etc...). A wan-event of type "connected" will
be identical to when the original wan-start script was
being run (wan-start should be considered deprecated
and will be removed in a future release)
- NEW: Implemented an official API for addon developers to
better integrate with the router. This includes up
to ten different pages that can be added anywhere within
the webui, and a dedicated storage repository for your
settings, which can be interacted with through your
custom web page or through a shell script.
See the Wiki for more information:

https://github.com/RMerl/asuswrt-merlin/wiki/Addons-API

- NEW: amtm (Asuswrt-Merlin Terminal Menu) by thelonelycoder has
been added to the firmware. Running "amtm" over SSH will
give you a menu allowing you to select and install various
addons, such as Diversion (ad blocker) or SKynet (an
advanced firewall extension). The plugins for amtm are
still maintained by its original author (thelonelycoder).

https://github.com/RMerl/asuswrt-merlin/wiki/AMTM

- UPDATED: Backported some fixes from 384_81981, mostly related
to WAN, port bonding and mdns.
- UPDATED: Merged GPL 384_7756 for RT-AX88U, which adds OFDMA and
WPA3 support to that model.
- UPDATED: Merged with GPL 385_10002 for other models (from RT-AC68U)
- UPDATED: odhcp6c to 1.1-97-ge199804 (themiron)
- UPDATED: curl to 7.67.0.
- UPDATED: openssl-1.0 to 1.0.2u
- UPDATED: dnsmasq to 2.80-114-ge40d8be (themiron)
- CHANGED: Replaced entware-setup.sh script with link to amtm, as
using the amtm Entware installer is now the supported
method.
- CHANGED: Improved connection handling in httpd (themiron)
- FIXED: Some of the newest DNSFilter servers weren't properly set
up with IPv6 (dave14305)


384.13_4 (8-Feb-2020)
This release is only available for the RT-AC87U and RT-AC3200.

- NEW: wan-event script. The first parameter will be the WAN unit
(0 for first WAN, 1 for secondary). The second parameter
will be a string describing the type of event (init,
connected, etc...). A wan-event of type "connected" will
be identical to when the original wan-start script was
being run (wan-start should be considered deprecated
and will be removed in a future release)
- NEW: Implemented an official API for addon developers to
better integrate with the router. This includes up
to ten different pages that can be added anywhere within
the webui, and a dedicated storage repository for your
settings, which can be interacted with through your
custom web page or through a shell script.
See the Wiki for more information:

https://github.com/RMerl/asuswrt-merlin/wiki/Addons-API

- NEW: amtm (Asuswrt-Merlin Terminal Menu) by thelonelycoder has
been added to the firmware. Running "amtm" over SSH will
give you a menu allowing you to select and install various
addons, such as Diversion (ad blocker) or SKynet (an
advanced firewall extension). The plugins for amtm are
still maintained by its original author (thelonelycoder).

https://github.com/RMerl/asuswrt-merlin/wiki/AMTM

- UPDATED: odhcp6c to 1.1-97-ge199804 (themiron)
- UPDATED: openssl-1.0 to 1.0.2u
- UPDATED: curl to 7.67.0.
- UPDATED: OpenVPN to 2.4.8.
- UPDATED: dnsmasq to 2.80-114-ge40d8be (themiron)
- CHANGED: Replaced entware-setup.sh script with link to amtm, as
using the amtm Entware installer is now the supported
method.
- CHANGED: Improved connection handling in httpd (themiron)
- FIXED: Some of the newest DNSFilter servers weren't properly set
up with IPv6 (dave14305)


384.14_2 (1-1-2020)
- FIXED: Missing cifs kernel module
- FIXED: stubby was linked with OpenSSL 1.0 instead of 1.1
Expand Down
8 changes: 7 additions & 1 deletion release/src-rt/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ else
endif
@echo '#endif' >> router/shared/version.h
endif
@echo '$(BUILD_NAME) $(SERIALNO)-$(EXTENDNO)$(BUILDREV) $(BUILD_TIME)' > router/shared/version
@echo '$(BUILD_NAME) $(SERIALNO)_$(EXTENDNO)$(BUILDREV) $(BUILD_TIME)' > router/shared/version
@echo 'EXTENDNO=$(EXTENDNO)$(BUILDREV)' > router/extendno.conf

rt_ver_ntools:
Expand Down Expand Up @@ -1447,6 +1447,12 @@ define RouterOptions
sed -i "/RTCONFIG_PUSH_EMAIL/d" $(1); \
echo "RTCONFIG_PUSH_EMAIL=y" >>$(1); \
fi; \
if [ "$(AHS)" = "y" ]; then \
sed -i "/RTCONFIG_AHS/d" $(1); \
echo "RTCONFIG_AHS=y" >>$(1); \
sed -i "/RTCONFIG_HTTPS/d" $(1); \
echo "RTCONFIG_HTTPS=y" >>$(1); \
fi; \
if [ "$(RSYSLOGD)" = "y" ]; then \
sed -i "/RTCONFIG_RSYSLOGD/d" $(1); \
echo "RTCONFIG_RSYSLOGD=y" >>$(1); \
Expand Down
2 changes: 1 addition & 1 deletion release/src-rt/target.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export RT-AC68U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y U

export RT-AC68U := $(RT-AC68U_BASE) FAKEHDR=y FORCE_SN=384 FORCE_EN=20000
export RT-AC68U += BUILD_NAME="RT-AC68U" NEWSSID_REV2=y DBLOG=y ETHOBD=y DWB=y UUPLUGIN=y BTM_11V=y \
BCN_RPT=y INFO_EXAP=y RAST_NONMESH_KVONLY=y IPERF3=y
BCN_RPT=y INFO_EXAP=y RAST_NONMESH_KVONLY=y IPERF3=y AVBLCHAN=y FILEFLEX=y

export DSL-AC68U-NONE := LOGO_LED=y LED_BTN=y REPEATER=y ROG=y
export DSL-AC68U := $(filter-out $(DSL-AC68U-NONE),$(RT-AC68U_BASE))
Expand Down
4 changes: 2 additions & 2 deletions release/src-rt/version.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KERNEL_VER=3.0
FS_VER=0.4
SERIALNO=384.14
EXTENDNO=2
SERIALNO=384.15
EXTENDNO=0
RCNO=0
3 changes: 3 additions & 0 deletions release/src/btools/libfoo.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,14 +489,17 @@ sub genSO
my @u = usersOf($name);
if ((scalar(@used) == 0) && (scalar(@u) > 0)) {
print "$name: WARNING: Library symbol is not used by anything, but linked by (@u). so keep it ...\n";
$cmd .= " ". $arc;
}
elsif (scalar(@used) == 0) {
print "$name: WARNING: Library is not used by anything, deleting...\n";
unlink $so;
# <>;
return 0;
}
else {
$cmd .= " -u " . join(" -u ", @used) . " ". $arc;
}

print LOG "Command: $cmd\n";
print LOG "Used: ", join(",", @used), "\n";
Expand Down
81 changes: 48 additions & 33 deletions release/src/router/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#
#


export HND_ROUTER := $(shell pwd | sed 's/.*hnd.*/y/g')
ifeq ($(HND_ROUTER),y)
export BCM_CHIP := 4908
Expand Down Expand Up @@ -719,6 +720,11 @@ obj-$(RTCONFIG_LETSENCRYPT) += socat
#obj-$(RTCONFIG_SYSSTATE) += sysstate
obj-y += sysstate

obj-$(RTCONFIG_AHS) += openssl
obj-$(RTCONFIG_AHS) += $(CURL)
obj-$(RTCONFIG_AHS) += json-c
obj-$(RTCONFIG_AHS) += ahs

obj-$(RTCONFIG_OPENVPN) += libvpn

obj-y += rc
Expand Down Expand Up @@ -855,12 +861,10 @@ obj-y += scsi-idle
endif
obj-y += libusb10
obj-y += libusb
obj-y += libusb-0.1.12
ifeq ($(RTCONFIG_USB),y)
ifneq ($(RTCONFIG_8M_SFP),y)
obj-y += hub-ctrl
endif
endif
obj-$(RTCONFIG_USB_PRINTER) += libusb-0.1.12
obj-$(RTCONFIG_USB_PRINTER) += u2ec
obj-$(RTCONFIG_USB_PRINTER) += LPRng

Expand Down Expand Up @@ -3265,36 +3269,37 @@ libupnp-1.3.1/Makefile: libupnp-1.3.1/Makefile.in
$(CONFIGURE) --prefix=/usr --disable-dependency-tracking \
)

libusb10/stamp-h1:
cd libusb10 && CFLAGS="-Os -Wall $(EXTRACFLAGS)" LIBS="-lpthread -ldl -lc $(EXTRALDFLAGS)" \
$(CONFIGURE) --enable-shared --prefix=/usr ac_cv_lib_rt_clock_gettime=no
-@$(MAKE) -C libusb10 clean
touch $@
libusb10/Makefile:
cd libusb10 && \
$(CONFIGURE) --enable-shared --prefix=/usr --disable-udev \
CFLAGS="-Os -Wall $(EXTRACFLAGS)" \
LIBS="-lpthread -ldl -lc $(EXTRALDFLAGS)" \
ac_cv_lib_rt_clock_gettime=no

libusb10: libusb10/stamp-h1
libusb10: libusb10/Makefile
$(MAKE) -C $@

libusb10-install: libusb10
install -D libusb10/libusb/.libs/libusb-1.0.so.0.0.0 $(INSTALLDIR)/libusb10/usr/lib/libusb-1.0.so.0
install -D libusb10/libusb/.libs/libusb-1.0.so.0.2.0 $(INSTALLDIR)/libusb10/usr/lib/libusb-1.0.so.0
$(STRIP) $(INSTALLDIR)/libusb10/usr/lib/*.so.*
cd $(INSTALLDIR)/libusb10/usr/lib && \
ln -sf libusb-1.0.so.0 libusb-1.0.so.0.0.0 && \
ln -sf libusb-1.0.so.0 libusb-1.0.so.0.2.0 && \
ln -sf libusb-1.0.so.0 libusb-1.0.so

libusb10-clean:
-@$(MAKE) -C libusb10 clean
@rm -f libusb10/stamp-h1

libusb/stamp-h1:
cd libusb && CFLAGS="-Wall -Os $(EXTRACFLAGS)" LIBS="-lpthread -ldl -lc $(EXTRALDFLAGS)" \
$(CONFIGURE) --prefix=/usr \
[ ! -f libusb10/Makefile ] || $(MAKE) -C libusb10 distclean
@rm -f libusb10/Makefile

libusb/Makefile:
cd libusb && \
$(CONFIGURE) --enable-shared --prefix=/usr \
CFLAGS="-Os -Wall $(EXTRACFLAGS)" \
LIBS="-lpthread -ldl -lc $(EXTRALDFLAGS)" \
LIBUSB_1_0_CFLAGS="-I$(TOP)/libusb10/libusb" \
LIBUSB_1_0_LIBS="-L$(TOP)/libusb10/libusb/.libs -lusb-1.0 \
-Wl,-R/lib:/usr/lib:/opt/usr/lib:/usr/local/share"
-@$(MAKE) -C libusb clean
touch $@

libusb: libusb10 libusb/stamp-h1
libusb: libusb10 libusb/Makefile
$(MAKE) -C $@

libusb-install: libusb
Expand All @@ -3305,8 +3310,8 @@ libusb-install: libusb
ln -sf libusb-0.1.so.4 libusb.so

libusb-clean:
-@$(MAKE) -C libusb clean
@rm -f libusb/stamp-h1
[ ! -f libusb/Makefile ] || $(MAKE) -C libusb distclean
@rm -f libusb/Makefile

usb-modeswitch-1.2.3: libusb
$(MAKE) -C $@ CC=$(CC) CFLAGS="-Os $(EXTRACFLAGS) -I$(TOP)/libusb/libusb" LIBS="\
Expand Down Expand Up @@ -4735,6 +4740,19 @@ sysstate-install:
echo "install sysstate"
$(MAKE) -C sysstate install

ahs: openssl $(CURL) json-c
@$(SEP)
echo "build ahs"
$(MAKE) -C ahs

ahs-clean:
echo "clean ahs"
$(MAKE) -C ahs clean

ahs-install:
echo "install ahs"
$(MAKE) -C ahs install

qsr10g_image:
aqr107_image:

Expand Down Expand Up @@ -6890,28 +6908,25 @@ libical-2.0.0-install:
ln -sf libicalvcal.so.2.0.0 libicalvcal.so.2

libconfuse/Makefile:
cd libconfuse && $(CONFIGURE) \
CFLAGS="$(EXTRACFLAGS) -Os -I$(STAGEDIR)/usr/include -ffunction-sections -fdata-sections -fPIC" \
LDFLAGS="$(LDFLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections" \
--prefix=/usr --disable-shared \
--without-libiconv-prefix --without-libintl-prefix --disable-examples --disable-nls
cd libconfuse && $(CONFIGURE) --prefix=/usr --disable-shared \
--disable-examples --disable-nls \
--without-libiconv-prefix --without-libintl-prefix \
CFLAGS="-Wall -Os -ffunction-sections -fdata-sections -fPIC $(EXTRACFLAGS)" \
LDFLAGS="-Wl,--gc-sections $(LDFLAGS)"

libconfuse: libiconv-1.14 libconfuse/Makefile
@$(SEP)
$(MAKE) -C $@
libconfuse: libconfuse/Makefile
$(MAKE) -C $@ && $(MAKE) $@-stage

libconfuse-install:
@$(SEP)
# Do nothing
@true
# install -D libconfuse/src/.libs/libconfuse.so.1.1.0 $(INSTALLDIR)/libconfuse/usr/lib/libconfuse.so.1.1.0
# cd $(INSTALLDIR)/libconfuse/usr/lib && \
# ln -sf libconfuse.so.1.1.0 libconfuse.so.1 &&\
# ln -sf libconfuse.so.1.1.0 libconfuse.so
# $(STRIP) $(INSTALLDIR)/libconfuse/usr/lib/*.so.*


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

Expand Down
2 changes: 1 addition & 1 deletion release/src/router/acme.sh/acme.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4002,7 +4002,7 @@ $_authorizations_map"
fi

if [ "$ACME_VERSION" = "2" ]; then
response="$(echo "$_authorizations_map" | grep "^$(_idn "$d")," | sed "s/$d,//")"
response="$(echo "$_authorizations_map" | grep -i "^$(_idn "$d")," | sed "s/$d,//i")"
_debug2 "response" "$response"
if [ -z "$response" ]; then
_err "get to authz error."
Expand Down
Binary file modified release/src/router/acsd_arm/prebuilt/acsd
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions release/src/router/config/config.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,10 @@ config RTCONFIG_SYSSTATE
bool "Support additional debug logs"
default n

config RTCONFIG_AHS
bool "Auto Healing System"
default n

config RTCONFIG_DUALWAN
bool "Dual WAN Support"
default n
Expand Down
1 change: 1 addition & 0 deletions release/src/router/config_base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ RTCONFIG_DNSSEC_OPENSSL=y
# RTCONFIG_MERLINUPDATE is not set
# RTCONFIG_DNSFILTER is not set
RTCONFIG_NTPD=y
# RTCONFIG_AHS is not set
# RTCONFIG_LETSENCRYPT is not set
# RTCONFIG_FBWIFI is not set
# RTCONFIG_ADV_RAST is not set
Expand Down
Loading

0 comments on commit e5489e7

Please sign in to comment.