summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/ppp
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/ppp')
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns12
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns5
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch290
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch13
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/init50
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/ip-down43
-rwxr-xr-xmeta/recipes-connectivity/ppp/ppp-2.4.5/ip-up44
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch19
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch93
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/poff26
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/pon9
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch43
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb77
13 files changed, 724 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
new file mode 100644
index 0000000000..998219de97
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
@@ -0,0 +1,12 @@
1#!/bin/sh
2ACTUALCONF=/var/run/resolv.conf
3PPPCONF=/var/run/ppp/resolv.conf
4if [ -f $PPPCONF ] ; then
5 if [ -f $ACTUALCONF ] ; then
6 if [ ! -h $ACTUALCONF -o ! "`readlink $ACTUALCONF 2>&1`" = "$PPPCONF" ] ; then
7 mv $ACTUALCONF $ACTUALCONF.ppporig
8 fi
9 fi
10
11 ln -sf $PPPCONF $ACTUALCONF
12fi
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
new file mode 100644
index 0000000000..2eadec6899
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
@@ -0,0 +1,5 @@
1#!/bin/sh
2ACTUALCONF=/var/run/resolv.conf
3if [ -f $ACTUALCONF.ppporig ] ; then
4 mv $ACTUALCONF.ppporig $ACTUALCONF
5fi
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
new file mode 100644
index 0000000000..6473a08bc7
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
@@ -0,0 +1,290 @@
1This patch comes from OpenEmbedded.
2The original patch is from Debian / SuSE to implement replacedefaultroute
3Rebased it to fit ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
4
5diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
6--- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800
7+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 16:40:00.478716855 +0800
8@@ -198,6 +198,16 @@
9 "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
10 &ipcp_wantoptions[0].default_route },
11
12+#ifdef __linux__
13+ { "replacedefaultroute", o_bool,
14+ &ipcp_wantoptions[0].replace_default_route,
15+ "Replace default route", 1
16+ },
17+ { "noreplacedefaultroute", o_bool,
18+ &ipcp_allowoptions[0].replace_default_route,
19+ "Never replace default route", OPT_A2COPY,
20+ &ipcp_wantoptions[0].replace_default_route },
21+#endif
22 { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
23 "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
24 { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
25@@ -271,7 +281,7 @@
26 ip_active_pkt
27 };
28
29-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
30+static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
31 static void ipcp_script __P((char *, int)); /* Run an up/down script */
32 static void ipcp_script_done __P((void *));
33
34@@ -1742,7 +1752,12 @@
35 if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
36 return 0;
37 if (wo->default_route)
38+#ifndef __linux__
39 if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
40+#else
41+ if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr,
42+ wo->replace_default_route))
43+#endif
44 default_route_set[u] = 1;
45 if (wo->proxy_arp)
46 if (sifproxyarp(u, wo->hisaddr))
47@@ -1830,7 +1845,8 @@
48 */
49 if (demand) {
50 if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
51- ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
52+ ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr,
53+ wo->replace_default_route);
54 if (go->ouraddr != wo->ouraddr) {
55 warn("Local IP address changed to %I", go->ouraddr);
56 script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
57@@ -1855,7 +1871,12 @@
58
59 /* assign a default route through the interface if required */
60 if (ipcp_wantoptions[f->unit].default_route)
61+#ifndef __linux__
62 if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
63+#else
64+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
65+ wo->replace_default_route))
66+#endif
67 default_route_set[f->unit] = 1;
68
69 /* Make a proxy ARP entry if requested. */
70@@ -1905,7 +1926,12 @@
71
72 /* assign a default route through the interface if required */
73 if (ipcp_wantoptions[f->unit].default_route)
74+#ifndef __linux__
75 if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
76+#else
77+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
78+ wo->replace_default_route))
79+#endif
80 default_route_set[f->unit] = 1;
81
82 /* Make a proxy ARP entry if requested. */
83@@ -1983,7 +2009,7 @@
84 sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
85 sifdown(f->unit);
86 ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
87- ipcp_hisoptions[f->unit].hisaddr);
88+ ipcp_hisoptions[f->unit].hisaddr, 0);
89 }
90
91 /* Execute the ip-down script */
92@@ -1999,12 +2025,21 @@
93 * proxy arp entries, etc.
94 */
95 static void
96-ipcp_clear_addrs(unit, ouraddr, hisaddr)
97+ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute)
98 int unit;
99 u_int32_t ouraddr; /* local address */
100 u_int32_t hisaddr; /* remote address */
101+ bool replacedefaultroute;
102 {
103- if (proxy_arp_set[unit]) {
104+ /* If replacedefaultroute, sifdefaultroute will be called soon
105+ * with replacedefaultroute set and that will overwrite the current
106+ * default route. This is the case only when doing demand, otherwise
107+ * during demand, this cifdefaultroute would restore the old default
108+ * route which is not what we want in this case. In the non-demand
109+ * case, we'll delete the default route and restore the old if there
110+ * is one saved by an sifdefaultroute with replacedefaultroute.
111+ */
112+ if (!replacedefaultroute && default_route_set[unit]) {
113 cifproxyarp(unit, hisaddr);
114 proxy_arp_set[unit] = 0;
115 }
116diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h
117--- ppp-2.4.5-orig/pppd/ipcp.h 2010-06-30 15:51:12.043682063 +0800
118+++ ppp-2.4.5/pppd/ipcp.h 2010-06-30 16:40:49.586203129 +0800
119@@ -70,6 +70,7 @@
120 bool old_addrs; /* Use old (IP-Addresses) option? */
121 bool req_addr; /* Ask peer to send IP address? */
122 bool default_route; /* Assign default route through interface? */
123+ bool replace_default_route; /* Replace default route through interface? */
124 bool proxy_arp; /* Make proxy ARP entry for peer? */
125 bool neg_vj; /* Van Jacobson Compression? */
126 bool old_vj; /* use old (short) form of VJ option? */
127diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8
128--- ppp-2.4.5-orig/pppd/pppd.8 2010-06-30 15:51:12.043682063 +0800
129+++ ppp-2.4.5/pppd/pppd.8 2010-06-30 16:42:47.102413859 +0800
130@@ -121,6 +121,13 @@
131 This entry is removed when the PPP connection is broken. This option
132 is privileged if the \fInodefaultroute\fR option has been specified.
133 .TP
134+.B replacedefaultroute
135+This option is a flag to the defaultroute option. If defaultroute is
136+set and this flag is also set, pppd replaces an existing default route
137+with the new default route.
138+
139+
140+.TP
141 .B disconnect \fIscript
142 Execute the command specified by \fIscript\fR, by passing it to a
143 shell, after
144@@ -717,7 +724,12 @@
145 .TP
146 .B nodefaultroute
147 Disable the \fIdefaultroute\fR option. The system administrator who
148-wishes to prevent users from creating default routes with pppd
149+wishes to prevent users from adding a default route with pppd
150+can do so by placing this option in the /etc/ppp/options file.
151+.TP
152+.B noreplacedefaultroute
153+Disable the \fIreplacedefaultroute\fR option. The system administrator who
154+wishes to prevent users from replacing a default route with pppd
155 can do so by placing this option in the /etc/ppp/options file.
156 .TP
157 .B nodeflate
158diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h
159--- ppp-2.4.5-orig/pppd/pppd.h 2010-06-30 15:51:12.050166398 +0800
160+++ ppp-2.4.5/pppd/pppd.h 2010-06-30 16:43:36.514148327 +0800
161@@ -643,7 +643,11 @@
162 int cif6addr __P((int, eui64_t, eui64_t));
163 /* Remove an IPv6 address from i/f */
164 #endif
165+#ifndef __linux__
166 int sifdefaultroute __P((int, u_int32_t, u_int32_t));
167+#else
168+int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
169+#endif
170 /* Create default route through i/f */
171 int cifdefaultroute __P((int, u_int32_t, u_int32_t));
172 /* Delete default route through i/f */
173diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
174--- ppp-2.4.5-orig/pppd/sys-linux.c 2010-06-30 15:51:12.050166398 +0800
175+++ ppp-2.4.5/pppd/sys-linux.c 2010-06-30 16:54:00.362716231 +0800
176@@ -206,6 +206,8 @@
177
178 static int if_is_up; /* Interface has been marked up */
179 static int have_default_route; /* Gateway for default route added */
180+static struct rtentry old_def_rt; /* Old default route */
181+static int default_rt_repl_rest; /* replace and restore old default rt */
182 static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */
183 static char proxy_arp_dev[16]; /* Device for proxy arp entry */
184 static u_int32_t our_old_addr; /* for detecting address changes */
185@@ -1537,6 +1539,9 @@
186 p = NULL;
187 }
188
189+ SET_SA_FAMILY (rt->rt_dst, AF_INET);
190+ SET_SA_FAMILY (rt->rt_gateway, AF_INET);
191+
192 SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
193 SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
194 SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
195@@ -1606,20 +1611,51 @@
196 /********************************************************************
197 *
198 * sifdefaultroute - assign a default route through the address given.
199- */
200-
201-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
202-{
203- struct rtentry rt;
204-
205- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
206- if (rt.rt_flags & RTF_GATEWAY)
207- error("not replacing existing default route via %I",
208- SIN_ADDR(rt.rt_gateway));
209- else
210- error("not replacing existing default route through %s",
211- rt.rt_dev);
212- return 0;
213+ *
214+ * If the global default_rt_repl_rest flag is set, then this function
215+ * already replaced the original system defaultroute with some other
216+ * route and it should just replace the current defaultroute with
217+ * another one, without saving the current route. Use: demand mode,
218+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
219+ * and then changes the temporary addresses to the addresses for the real
220+ * ppp connection when it has come up.
221+ */
222+
223+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
224+{
225+ struct rtentry rt, tmp_rt;
226+ struct rtentry *del_rt = NULL;
227+
228+ if (default_rt_repl_rest) {
229+ /* We have already reclaced the original defaultroute, if we
230+ * are called again, we will delete the current default route
231+ * and set the new default route in this function.
232+ * - this is normally only the case the doing demand: */
233+ if (defaultroute_exists( &tmp_rt ))
234+ del_rt = &tmp_rt;
235+ } else if ( defaultroute_exists( &old_def_rt ) &&
236+ strcmp( old_def_rt.rt_dev, ifname ) != 0) {
237+ /* We did not yet replace an existing default route, let's
238+ * check if we should save and replace a default route:
239+ */
240+ u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
241+ if (old_gateway != gateway) {
242+ if (!replace) {
243+ error("not replacing default route to %s [%I]",
244+ old_def_rt.rt_dev, old_gateway);
245+ return 0;
246+ } else {
247+ // we need to copy rt_dev because we need it permanent too:
248+ char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
249+ strcpy(tmp_dev, old_def_rt.rt_dev);
250+ old_def_rt.rt_dev = tmp_dev;
251+
252+ notice("replacing old default route to %s [%I]",
253+ old_def_rt.rt_dev, old_gateway);
254+ default_rt_repl_rest = 1;
255+ del_rt = &old_def_rt;
256+ }
257+ }
258 }
259
260 memset (&rt, 0, sizeof (rt));
261@@ -1638,6 +1674,12 @@
262 error("default route ioctl(SIOCADDRT): %m");
263 return 0;
264 }
265+ if (default_rt_repl_rest && del_rt)
266+ if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) {
267+ if ( ! ok_error ( errno ))
268+ error("del old default route ioctl(SIOCDELRT): %m(%d)", errno);
269+ return 0;
270+ }
271
272 have_default_route = 1;
273 return 1;
274@@ -1673,6 +1715,16 @@
275 return 0;
276 }
277 }
278+ if (default_rt_repl_rest) {
279+ notice("restoring old default route to %s [%I]",
280+ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
281+ if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) {
282+ if ( ! ok_error ( errno ))
283+ error("restore default route ioctl(SIOCADDRT): %m(%d)", errno);
284+ return 0;
285+ }
286+ default_rt_repl_rest = 0;
287+ }
288
289 return 1;
290 }
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
new file mode 100644
index 0000000000..daa7f2ecc6
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
@@ -0,0 +1,13 @@
1The patch comes from OpenEmbedded
2
3--- ppp-2.4.3/pppd/Makefile.linux.orig 2005-10-28 21:07:40.396359250 +0100
4+++ ppp-2.4.3/pppd/Makefile.linux 2005-10-28 21:07:54.217223000 +0100
5@@ -62,7 +62,7 @@
6
7 HAS_SHADOW=y
8 #USE_PAM=y
9-#HAVE_INET6=y
10+HAVE_INET6=y
11
12 # Enable plugins
13 PLUGIN=y
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/init b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
new file mode 100755
index 0000000000..5b3b7abe2f
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
@@ -0,0 +1,50 @@
1#!/bin/sh
2#
3# /etc/init.d/ppp: start or stop PPP link.
4#
5# If you want PPP started on boot time (most dialup systems won't need it)
6# rename the /etc/ppp/no_ppp_on_boot file to /etc/ppp/ppp_on_boot, and
7# follow the instructions in the comments in that file.
8
9test -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot || exit 0
10if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi
11
12case "$1" in
13 start)
14 echo -n "Starting up PPP link: pppd"
15 if [ "$RUNFILE" = "1" ]; then
16 /etc/ppp/ppp_on_boot
17 else
18 pppd call provider
19 fi
20 echo "."
21 ;;
22 stop)
23 echo -n "Shutting down PPP link: pppd"
24 if [ "$RUNFILE" = "1" ]; then
25 poff
26 else
27 poff provider
28 fi
29 echo "."
30 ;;
31 restart|force-reload)
32 echo -n "Restarting PPP link: pppd"
33 if [ "$RUNFILE" = "1" ]; then
34 poff
35 sleep 5
36 /etc/ppp/ppp_on_boot
37 else
38 poff provider
39 sleep 5
40 pppd call provider
41 fi
42 echo "."
43 ;;
44 *)
45 echo "Usage: /etc/init.d/ppp {start|stop|restart|force-reload}"
46 exit 1
47 ;;
48esac
49
50exit 0
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
new file mode 100755
index 0000000000..06d35487a5
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
@@ -0,0 +1,43 @@
1#!/bin/sh
2#
3# $Id: ip-down,v 1.2 1998/02/10 21:21:55 phil Exp $
4#
5# This script is run by the pppd _after_ the link is brought down.
6# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete
7# routes, unset IP addresses etc. you should create script(s) there.
8#
9# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named
10# after that package), so choose local script names with that in mind.
11#
12# This script is called with the following arguments:
13# Arg Name Example
14# $1 Interface name ppp0
15# $2 The tty ttyS1
16# $3 The link speed 38400
17# $4 Local IP number 12.34.56.78
18# $5 Peer IP number 12.34.56.99
19# $6 Optional ``ipparam'' value foo
20
21# The environment is cleared before executing this script
22# so the path must be reset
23PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
24export PATH
25# These variables are for the use of the scripts run by run-parts
26PPP_IFACE="$1"
27PPP_TTY="$2"
28PPP_SPEED="$3"
29PPP_LOCAL="$4"
30PPP_REMOTE="$5"
31PPP_IPPARAM="$6"
32export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
33
34# as an additional convenience, $PPP_TTYNAME is set to the tty name,
35# stripped of /dev/ (if present) for easier matching.
36PPP_TTYNAME=`/usr/bin/basename "$2"`
37export PPP_TTYNAME
38
39# Main Script starts here
40
41run-parts /etc/ppp/ip-down.d
42
43# last line
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
new file mode 100755
index 0000000000..fc2fae9fe0
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
@@ -0,0 +1,44 @@
1#!/bin/sh
2#
3# $Id: ip-up,v 1.2 1998/02/10 21:25:34 phil Exp $
4#
5# This script is run by the pppd after the link is established.
6# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes,
7# set IP address, run the mailq etc. you should create script(s) there.
8#
9# Be aware that other packages may include /etc/ppp/ip-up.d scripts (named
10# after that package), so choose local script names with that in mind.
11#
12# This script is called with the following arguments:
13# Arg Name Example
14# $1 Interface name ppp0
15# $2 The tty ttyS1
16# $3 The link speed 38400
17# $4 Local IP number 12.34.56.78
18# $5 Peer IP number 12.34.56.99
19# $6 Optional ``ipparam'' value foo
20
21# The environment is cleared before executing this script
22# so the path must be reset
23PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
24export PATH
25# These variables are for the use of the scripts run by run-parts
26PPP_IFACE="$1"
27PPP_TTY="$2"
28PPP_SPEED="$3"
29PPP_LOCAL="$4"
30PPP_REMOTE="$5"
31PPP_IPPARAM="$6"
32export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
33
34
35# as an additional convenience, $PPP_TTYNAME is set to the tty name,
36# stripped of /dev/ (if present) for easier matching.
37PPP_TTYNAME=`/usr/bin/basename "$2"`
38export PPP_TTYNAME
39
40# Main Script starts here
41
42run-parts /etc/ppp/ip-up.d
43
44# last line
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
new file mode 100644
index 0000000000..9ba868839e
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
@@ -0,0 +1,19 @@
1The patch comes from OpenEmbedded.
2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3
4diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
5--- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800
6+++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 17:08:21.806363042 +0800
7@@ -117,10 +117,10 @@
8 #LIBS += -lshadow $(LIBS)
9 endif
10
11-ifneq ($(wildcard /usr/include/crypt.h),)
12+#ifneq ($(wildcard /usr/include/crypt.h),)
13 CFLAGS += -DHAVE_CRYPT_H=1
14 LIBS += -lcrypt
15-endif
16+#endif
17
18 ifdef NEEDDES
19 ifndef USE_CRYPT
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
new file mode 100644
index 0000000000..94af5af6de
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
@@ -0,0 +1,93 @@
1The patch comes from OpenEmbedded
2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3
4diff -ruN ppp-2.4.5-orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux
5--- ppp-2.4.5-orig/chat/Makefile.linux 2010-06-30 15:51:12.050166398 +0800
6+++ ppp-2.4.5/chat/Makefile.linux 2010-06-30 15:51:30.450118446 +0800
7@@ -25,7 +25,7 @@
8
9 install: chat
10 mkdir -p $(BINDIR) $(MANDIR)
11- $(INSTALL) -s -c chat $(BINDIR)
12+ $(INSTALL) -c chat $(BINDIR)
13 $(INSTALL) -c -m 644 chat.8 $(MANDIR)
14
15 clean:
16diff -ruN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
17--- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800
18+++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 15:52:11.214170607 +0800
19@@ -99,7 +99,7 @@
20 CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
21 LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
22 TARGETS += srp-entry
23-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
24+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
25 MANPAGES += srp-entry.8
26 EXTRACLEAN += srp-entry.o
27 NEEDDES=y
28@@ -200,7 +200,7 @@
29 install: pppd
30 mkdir -p $(BINDIR) $(MANDIR)
31 $(EXTRAINSTALL)
32- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
33+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
34 if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
35 chmod o-rx,u+s $(BINDIR)/pppd; fi
36 $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
37diff -ruN ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.5/pppd/plugins/radius/Makefile.linux
38--- ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux 2010-06-30 15:51:12.047676187 +0800
39+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2010-06-30 15:53:47.750182267 +0800
40@@ -36,11 +36,11 @@
41
42 install: all
43 $(INSTALL) -d -m 755 $(LIBDIR)
44- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
45- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
46- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
47- $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
48- $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
49+ $(INSTALL) -c -m 755 radius.so $(LIBDIR)
50+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
51+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
52+ $(INSTALL) -m 444 pppd-radius.8 $(MANDIR)
53+ $(INSTALL) -m 444 pppd-radattr.8 $(MANDIR)
54
55 radius.so: radius.o libradiusclient.a
56 $(CC) -o radius.so -shared radius.o libradiusclient.a
57diff -ruN ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
58--- ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux 2010-06-30 15:51:12.047676187 +0800
59+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2010-06-30 15:53:15.454486877 +0800
60@@ -43,9 +43,9 @@
61
62 install: all
63 $(INSTALL) -d -m 755 $(LIBDIR)
64- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
65+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
66 $(INSTALL) -d -m 755 $(BINDIR)
67- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
68+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
69
70 clean:
71 rm -f *.o *.so pppoe-discovery
72diff -ruN ppp-2.4.5-orig/pppdump/Makefile.linux ppp-2.4.5/pppdump/Makefile.linux
73--- ppp-2.4.5-orig/pppdump/Makefile.linux 2010-06-30 15:51:12.058183383 +0800
74+++ ppp-2.4.5/pppdump/Makefile.linux 2010-06-30 15:52:25.762183537 +0800
75@@ -17,5 +17,5 @@
76
77 install:
78 mkdir -p $(BINDIR) $(MANDIR)
79- $(INSTALL) -s -c pppdump $(BINDIR)
80+ $(INSTALL) -c pppdump $(BINDIR)
81 $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
82diff -ruN ppp-2.4.5-orig/pppstats/Makefile.linux ppp-2.4.5/pppstats/Makefile.linux
83--- ppp-2.4.5-orig/pppstats/Makefile.linux 2010-06-30 15:51:12.058183383 +0800
84+++ ppp-2.4.5/pppstats/Makefile.linux 2010-06-30 15:52:42.486341081 +0800
85@@ -22,7 +22,7 @@
86
87 install: pppstats
88 -mkdir -p $(MANDIR)
89- $(INSTALL) -s -c pppstats $(BINDIR)
90+ $(INSTALL) -c pppstats $(BINDIR)
91 $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
92
93 pppstats: $(PPPSTATSRCS)
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/poff b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
new file mode 100644
index 0000000000..0521a9406a
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
@@ -0,0 +1,26 @@
1#!/bin/sh
2
3# Lets see how many pppds are running....
4set -- `cat /var/run/ppp*.pid 2>/dev/null`
5
6case $# in
7 0) # pppd only creates a pid file once ppp is up, so let's try killing pppd
8 # on the assumption that we've not got that far yet.
9 killall pppd
10 ;;
11 1) # If only one was running then it can be killed (apparently killall
12 # caused problems for some, so lets try killing the pid from the file)
13 kill $1
14 ;;
15 *) # More than one! Aieehh.. Dont know which one to kill.
16 echo "More than one pppd running. None stopped"
17 exit 1
18 ;;
19esac
20
21if [ -r /var/run/ppp-quick ]
22then
23 rm -f /var/run/ppp-quick
24fi
25
26exit 0
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pon b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
new file mode 100644
index 0000000000..91c059501a
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3if [ "$1" = "quick" ]
4then
5 touch /var/run/ppp-quick
6 shift
7fi
8
9/usr/sbin/pppd call ${1:-provider}
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
new file mode 100644
index 0000000000..c4e61fdd28
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
@@ -0,0 +1,43 @@
1The patch comes from OpenEmbedded
2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3
4diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
5--- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800
6+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800
7@@ -55,6 +55,8 @@
8 #include <sys/socket.h>
9 #include <netinet/in.h>
10 #include <arpa/inet.h>
11+#include <sys/stat.h>
12+#include <unistd.h>
13
14 #include "pppd.h"
15 #include "fsm.h"
16@@ -2095,6 +2097,14 @@
17 u_int32_t peerdns1, peerdns2;
18 {
19 FILE *f;
20+ struct stat dirinfo;
21+
22+ if(stat(_PATH_OUTDIR, &dirinfo)) {
23+ if(mkdir(_PATH_OUTDIR, 0775)) {
24+ error("Failed to create directory %s: %m", _PATH_OUTDIR);
25+ return;
26+ }
27+ }
28
29 f = fopen(_PATH_RESOLV, "w");
30 if (f == NULL) {
31diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h
32--- ppp-2.4.5-orig/pppd/pathnames.h 2010-06-30 15:51:12.043682063 +0800
33+++ ppp-2.4.5/pppd/pathnames.h 2010-06-30 17:03:20.594371055 +0800
34@@ -30,7 +30,8 @@
35 #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options."
36 #define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors"
37 #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/"
38-#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf"
39+#define _PATH_OUTDIR _ROOT_PATH _PATH_VARRUN "/ppp"
40+#define _PATH_RESOLV _PATH_OUTDIR "/resolv.conf"
41
42 #define _PATH_USEROPT ".ppprc"
43 #define _PATH_PSEUDONYM ".ppp_pseudonym"
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
new file mode 100644
index 0000000000..e9caf3d13e
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -0,0 +1,77 @@
1DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \
2the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
3SECTION = "console/network"
4HOMEPAGE = "http://samba.org/ppp/"
5BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
6DEPENDS = "libpcap"
7LICENSE = "BSD & GPLv2+ & LGPLv2+ & public domain"
8LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
9 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
10 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
11 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
12PR = "r0"
13
14SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
15 file://makefile.patch \
16 file://cifdefroute.patch \
17 file://pppd-resolv-varrun.patch \
18 file://enable-ipv6.patch \
19 file://makefile-remove-hard-usr-reference.patch \
20 file://pon \
21 file://poff \
22 file://init \
23 file://ip-up \
24 file://ip-down \
25 file://08setupdns \
26 file://92removedns"
27
28SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
29
30inherit autotools
31
32EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
33EXTRA_OECONF = "--disable-strip"
34
35do_install_append () {
36 make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
37 mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
38 mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
39 mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/
40 install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon
41 install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff
42 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp
43 install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/
44 install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/
45 install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
46 install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
47 rm -rf ${D}/${mandir}/man8/man8
48}
49
50CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
51PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
52FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
53FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
54FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug"
55FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
56FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
57FILES_ppp-radius = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so"
58FILES_ppp-winbind = "/usr/lib/pppd/2.4.3/winbind.so"
59FILES_ppp-minconn = "/usr/lib/pppd/2.4.3/minconn.so"
60FILES_ppp-password = "/usr/lib/pppd/2.4.3/pass*.so"
61FILES_ppp-tools = "/usr/sbin/pppstats /usr/sbin/pppdump"
62DESCRIPTION_ppp-oa = "Plugin for PPP needed for PPP-over-ATM"
63DESCRIPTION_ppp-oe = "Plugin for PPP needed for PPP-over-Ethernet"
64DESCRIPTION_ppp-radius = "Plugin for PPP that are related to RADIUS"
65DESCRIPTION_ppp-winbind = "Plugin for PPP to authenticate against Samba or Windows"
66DESCRIPTION_ppp-minconn = "Plugin for PPP to specify a minimum connect time before the idle timeout applies"
67DESCRIPTION_ppp-password = "Plugin for PPP to get passwords via a pipe"
68DESCRIPTION_ppp-tools = "The pppdump and pppstats utitilities"
69RDEPENDS_ppp_minconn += "libpcap0.8"
70
71pkg_postinst_${PN}() {
72if test "x$D" != "x"; then
73 exit 1
74else
75 chmod u+s ${sbindir}/pppd
76fi
77}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-03-20 14:51:21 +0000