From: jow Date: Mon, 6 Sep 2010 02:38:08 +0000 (+0000) Subject: [backfire] merge r22806 X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=d5bbc69f83210ec34563bd56e7a9f5a1470bf023 [backfire] merge r22806 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22951 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 168895544..8670dca13 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp PKG_VERSION:=2.4.4 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/patches/340-populate_default_gateway.patch b/package/ppp/patches/340-populate_default_gateway.patch new file mode 100644 index 000000000..ca11206c4 --- /dev/null +++ b/package/ppp/patches/340-populate_default_gateway.patch @@ -0,0 +1,21 @@ +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -1673,6 +1673,9 @@ int sifdefaultroute (int unit, u_int32_t + memset (&rt, 0, sizeof (rt)); + SET_SA_FAMILY (rt.rt_dst, AF_INET); + ++ SET_SA_FAMILY(rt.rt_gateway, AF_INET); ++ SIN_ADDR(rt.rt_gateway) = gateway; ++ + rt.rt_dev = ifname; + + if (kernel_version > KVERSION(2,1,0)) { +@@ -1680,7 +1683,7 @@ int sifdefaultroute (int unit, u_int32_t + SIN_ADDR(rt.rt_genmask) = 0L; + } + +- rt.rt_flags = RTF_UP; ++ rt.rt_flags = RTF_UP | RTF_GATEWAY; + if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { + if (!ok_error(errno)) + error("default route ioctl(SIOCADDRT): %m");