Merge with GPL 3459 (RT-AC87U).

Note: this check point is only compilable for RT-AC87U due to a change in the model enum.

release/src-rt/Makefile

@@ -586,6 +586,10 @@ define RouterOptions
 		sed -i "/RTCONFIG_QCA_TW_AUTO_BAND4/d" $(1); \
 		echo "RTCONFIG_QCA_TW_AUTO_BAND4=y" >>$(1); \
 	fi; \
+	if [ "$(NEWSSID_REV2)" = "y" ]; then \
+		sed -i "/RTCONFIG_NEWSSID_REV2/d" $(1); \
+		echo "RTCONFIG_NEWSSID_REV2=y" >>$(1); \
+	fi; \
 	if [ "$(FINDASUS)" = "y" ]; then \
 		sed -i "/RTCONFIG_FINDASUS/d" $(1); \
 		echo "RTCONFIG_FINDASUS=y" >>$(1); \

release/src/router/APP-IPK/AiCloud-ipk/opt/etc/apps_asus_script/smartsync_remove

@@ -6,4 +6,4 @@ APPS_INSTALL_PATH=$APPS_MOUNTED_PATH/$APPS_INSTALL_FOLDER
 
 sleep 4
 
-app_remove.sh smartsync
+/usr/sbin/app_remove.sh smartsync

release/src/router/APP-IPK/SmartSync-ipk/opt/etc/apps_asus_script/smartsync_rm

@@ -7,12 +7,12 @@ APPS_INSTALL_PATH=$APPS_MOUNTED_PATH/$APPS_INSTALL_FOLDER
 
 sleep 4
 
-app_remove.sh webdavclient
+/usr/sbin/app_remove.sh webdavclient
 sleep 2
-app_remove.sh asuswebstorage
+/usr/sbin/app_remove.sh asuswebstorage
 sleep 2
-app_remove.sh ftpclient
+/usr/sbin/app_remove.sh ftpclient
 sleep 2
-app_remove.sh dropboxclient
+/usr/sbin/app_remove.sh dropboxclient
 sleep 2
-app_remove.sh inotify
+/usr/sbin/app_remove.sh inotify

release/src/router/LPRng/src/common/lpd.c

@@ -23,6 +23,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <net/if.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <linux/lp.h>
@@ -152,6 +153,8 @@ int main(int argc, char *argv[])
 	int lock;
 	int pid = 0;
 	FILE *fp;
+	struct ifreq ifr;
+	struct in_addr local;
 
 	fp = fopen("/var/run/lpdparent.pid", "r");
 	if (fp) {
@@ -191,11 +194,20 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
+    local.s_addr = htonl(INADDR_ANY);
+    if (argv[1]) {
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name));
+	if(ioctl(sockfd, SIOCGIFADDR, &ifr) < 0)
+	    syslog(LOGOPTS, "can't get interface %s address: %m", argv[1]);
+	else
+	    local.s_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr;
+    }
+
     bzero((char *)&serv_addr , sizeof(serv_addr));
     serv_addr.sin_family        = AF_INET;
-    serv_addr.sin_addr.s_addr   = htonl(INADDR_ANY);
+    serv_addr.sin_addr.s_addr   = local.s_addr;
     serv_addr.sin_port          = htons(PNT_SVR_PORT_LPR);
-
 
     if(bind(sockfd,(struct sockaddr *)&serv_addr , sizeof(serv_addr)) < 0 )
     {
@@ -223,7 +235,7 @@ int main(int argc, char *argv[])
 	}
 	netaddr.sin_family = AF_INET;
 	netaddr.sin_port = htons(BASEPORT);
-	netaddr.sin_addr.s_addr = htonl(INADDR_ANY);
+	netaddr.sin_addr.s_addr = local.s_addr;
 	memset(netaddr.sin_zero, 0, sizeof(netaddr.sin_zero));
 	if (bind(netfd, (struct sockaddr*) &netaddr, sizeof(netaddr)) < 0)
 	{
@@ -247,7 +259,7 @@ int main(int argc, char *argv[])
 	}
     	bzero((char *)&serv_addr_ASUS , sizeof(serv_addr_ASUS));
     	serv_addr_ASUS.sin_family        = AF_INET;
-    	serv_addr_ASUS.sin_addr.s_addr   = htonl(INADDR_ANY);
+    	serv_addr_ASUS.sin_addr.s_addr   = local.s_addr;
     	serv_addr_ASUS.sin_port          = htons(PNT_SVR_PORT_ASUS);
 
     	if(bind(sockfd_ASUS,(struct sockaddr *)&serv_addr_ASUS , sizeof(serv_addr_ASUS)) < 0 )
@@ -1244,15 +1256,18 @@ void check_prn_status(char *status_prn, char *cliadd_prn)
 /*JY1114: get printer queue name for LPR*/
 int get_queue_name(char *input)
 {
+#if 0
 	char QueueName_got[32];
 	char *index1;
 	int rps_i=0, rps_j=0;
 	while(index1 = strrchr(input, ' '))
 		index1[0] = 0;
 	rps_i = 0;
-	strcpy(QueueName_got, input);
+	memset(QueueName_got, 0, sizeof(QueueName_got));
+	strncpy(QueueName_got, input, sizeof(QueueName_got) - 1);
 	//return(strcmp(QueueName_got, "LPRServer"));
 	//by pass queue Name Check
+#endif
 	return 0;
 }
 

release/src/router/Makefile

@@ -495,10 +495,14 @@ obj-$(RTCONFIG_WEBDAV) += samba-3.5.8
 
 ifneq ($(RTCONFIG_SAMBA_MODERN),y)
 ifeq ($(CONFIG_BCMWL5),y)
+ifneq ($(RTCONFIG_8M_SFP),y)
 obj-$(NEED_SAMBA3) += samba-3.0.33
 else
 obj-$(NEED_SAMBA3) += samba3
 endif
+else
+obj-$(NEED_SAMBA3) += samba3
+endif
 
 else # Samba 3.6.x
 obj-$(NEED_SAMBA3) += samba36
@@ -3545,10 +3549,7 @@ nas$(BCMEX)$(EX7): nvram$(BCMEX)
 eapd$(BCMEX)$(EX7)-clean:
 	-@cd eapd$(BCMEX)$(EX7)/linux && make clean
 
-lighttpd-1.4.39/Makefile:
-	cd lighttpd-1.4.39 && ./autogen.sh
-
-lighttpd-1.4.39/stamp-h1: lighttpd-1.4.39/Makefile
+lighttpd-1.4.39/stamp-h1:
 ifneq ($(RTCONFIG_QTN),y)
 	cd lighttpd-1.4.39 && ./preconfigure-script touch $@
 else

release/src/router/config/config.in

@@ -564,6 +564,10 @@ config RTCONFIG_LOCALE2012
 	depends on RTCONFIG_RALINK_RT3883
 	default n
 
+config RTCONFIG_NEWSSID_REV2
+	bool "New ASUS_2GMAC_xG rule"
+	default n
+
 config RTCONFIG_QCA
 	bool "Qualcomm Atheros Chip Support"
 	default n

release/src/router/config_base

@@ -63,6 +63,7 @@ RTCONFIG_L7PAT=y
 # RTCONFIG_DHCP_OVERRIDE is not set
 # RTCONFIG_MTK_TW_AUTO_BAND4 is not set
 # RTCONFIG_QCA_TW_AUTO_BAND4 is not set
+# RTCONFIG_NEWSSID_REV2 is not set
 # RTCONFIG_LED_ALL is not set
 # RTCONFIG_COMA is not set
 # RTCONFIG_PARENTALCTRL is not set

release/src/router/dnsmasq/CHANGELOG

@@ -18,7 +18,106 @@ version 2.76
 	    that the same name is empty. Thanks to Edwin Török for
 	    the patch.
 
-
+	    Fix failure to correctly calculate cache-size when 
+	    reading a hosts-file fails. Thanks to André Glüpker 
+	    for the patch.
+
+	    Fix wrong answer to simple name query when --domain-needed
+	    set, but no upstream servers configured. Dnsmasq returned
+	    REFUSED, in this case, when it should be the same as when
+	    upstream servers are configured - NOERROR. Thanks to 
+	    Allain Legacy for spotting the problem.
+
+	    Return REFUSED when running out of forwarding table slots,
+	    not SERVFAIL.
+
+            Add --max-port configuration. Thanks to Hans Dedecker for
+	    the patch.
+
+	    Add --script-arp and two new functions for the dhcp-script.
+	    These are "arp" and "arp-old" which announce the arrival and
+	    removal of entries in the ARP or nieghbour tables.
+
+	    Extend --add-mac to allow a new encoding of the MAC address 
+	    as base64, by configurting --add-mac=base64
+
+	    Add --add-cpe-id option.
+
+            Don't crash with divide-by-zero if an IPv6 dhcp-range
+	    is declared as a whole /64.
+	    (ie xx::0 to xx::ffff:ffff:ffff:ffff) 
+	    Thanks to Laurent Bendel for spotting this problem.
+
+	    Add support for a TTL parameter in --host-record and
+	    --cname.
+
+	    Add --dhcp-ttl option.
+
+	    Add --tftp-mtu option. Thanks to Patrick McLean for the 
+	    initial patch.
+
+	    Check return-code of inet_pton() when parsing dhcp-option.
+	    Bad addresses could fail to generate errors and result in
+	    garbage dhcp-options being sent. Thanks to Marc Branchaud 
+	    for spotting this.
+
+	    Fix wrong value for EDNS UDP packet size when using 
+	    --servers-file to define upstream DNS servers. Thanks to
+	    Scott Bonar for the bug report.
+
+	    Move the dhcp_release and dhcp_lease_time tools from 
+	    contrib/wrt to contrib/lease-tools.
+
+	    Add dhcp_release6 to contrib/lease-tools. Many thanks 
+	    to Sergey Nechaev for this code.
+
+	    To avoid filling logs in configurations which define
+	    many upstream nameservers, don't log more that 30 servers.
+	    The number to be logged can be changed as SERVERS_LOGGED
+	    in src/config.h.
+
+	    Swap the values if BC_EFI and x86-64_EFI in --pxe-service. 
+	    These were previously wrong due to an error in RFC 4578.
+	    If you're using BC_EFI to boot 64-bit EFI machines, you
+	    will need to update your config.
+
+	    Add ARM32_EFI and ARM64_EFI as valid architectures in
+	    --pxe-service.
+
+            Fix PXE booting for UEFI architectures. Modify PXE boot
+	    sequence in this case to force the client to talk to dnsmasq
+	    over port 4011. This makes PXE and especially proxy-DHCP PXE
+	    work with these archictectures.
+
+	    Workaround problems with UEFI PXE clients. There exist
+	    in the wild PXE clients which have problems with PXE
+	    boot menus. To work around this, when there's a single
+	    --pxe-service which applies to client, then that target
+	    will be booted directly, rather then sending a
+	    single-item boot menu.
+
+            Many thanks to Jarek Polok, Michael Kuron and Dreamcat4 
+	    for their work on the long-standing UEFI PXE problem.
+
+	    Subtle change in the semantics of "basename" in
+	    --pxe-service. The historical behaviour has always been
+	    that the actual filename downloaded from the TFTP server
+	    is <basename>.<layer> where <layer> is an integer which
+	    corresponds to the layer parameter supplied by the client.
+	    It's not clear what the function of the "layer" 
+	    actually is in the PXE protocol, and in practise layer 
+	    is always zero, so the filename is <basename>.0
+	    The new behaviour is the same as the old, except when
+	    <basename> includes a file suffix, in which case
+	    the layer suffix is no longer added. This allows
+	    sensible suffices to be used, rather then the
+	    meaningless ".0". Only in the unlikely event that you
+	    have a config with a basename which already has a
+	    suffix, is this an incompatible change, since the file
+	    downloaded will change from name.suffix.0 to just 
+	    name.suffix
+
+
 version 2.75
             Fix reversion on 2.74 which caused 100% CPU use when a 
 	    dhcp-script is configured. Thanks to Adrian Davey for

release/src/router/dnsmasq/Makefile

@@ -1,4 +1,4 @@
-# dnsmasq is Copyright (c) 2000-2015 Simon Kelley
+# dnsmasq is Copyright (c) 2000-2016 Simon Kelley
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -73,7 +73,8 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \
        dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
        helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
        dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \
-       domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o
+       domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \
+       poll.o rrfilter.o edns0.o arp.o
 
 hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
        dns-protocol.h radv-protocol.h ip6addr.h

release/src/router/dnsmasq/VERSION

@@ -1 +1 @@
-2.76-g0007ee9
+2.76

release/src/router/dnsmasq/bld/Android.mk

@@ -10,7 +10,7 @@ LOCAL_SRC_FILES :=  bpf.c cache.c dbus.c dhcp.c dnsmasq.c \
 		    dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
 		    radv.c slaac.c auth.c ipset.c domain.c \
 	            dnssec.c dnssec-openssl.c blockdata.c tables.c \
-		    loop.c inotify.c poll.c
+		    loop.c inotify.c poll.c rrfilter.c edns0.c arp.c
 
 LOCAL_MODULE := dnsmasq
 

release/src/router/dnsmasq/contrib/lease-tools/Makefile

@@ -0,0 +1,6 @@
+CFLAGS?= -O2 -Wall -W
+
+all: dhcp_release dhcp_release6 dhcp_lease_time
+
+clean:
+	rm -f *~ *.o core dhcp_release dhcp_release6 dhcp_lease_time

release/src/router/dnsmasq/contrib/lease-tools/dhcp_release6.1

@@ -0,0 +1,38 @@
+.TH DHCP_RELEASE 1
+.SH NAME
+dhcp_release6 \- Release a DHCPv6 lease on a the local dnsmasq DHCP server.
+.SH SYNOPSIS
+.B dhcp_release6 --iface <interface> --client-id <client-id> --server-id
+server-id --iaid <iaid>  --ip <IP>  [--dry-run] [--help]
+.SH "DESCRIPTION"
+A utility which forces the DHCP server running on this machine to release a 
+DHCPv6 lease.
+.SS OPTIONS
+.IP "-a, --ip"
+IPv6 address to release.
+.IP "-c, --client-id"
+Colon-separated hex string representing DHCPv6 client id. Normally
+it can be found in leases file both on client and server.
+.IP "-d, --dry-run"
+Print hexadecimal representation of generated DHCPv6 release packet to standard
+output and exit.
+.IP "-h, --help"
+print usage information to standard output and exit.
+.IP "-i, --iaid"
+Decimal representation of DHCPv6 IAID. Normally it can be found in leases file
+both on client and server.
+.IP "-n, --iface"
+Network interface to send a DHCPv6 release packet from.
+.IP "-s, --server-id"
+Colon-separated hex string representing DHCPv6 server id. Normally
+it can be found in leases file both on client and server.
+.SH NOTES
+MUST be run as root - will fail otherwise.
+.SH LIMITATIONS
+Only usable on IPv6 DHCP leases.
+.SH SEE ALSO
+.BR dnsmasq (8)
+.SH AUTHOR
+This manual page was written by Simon Kelley <simon@thekelleys.org.uk>.
+
+