1 files changed, 0 insertions, 93 deletions
diff --git a/meta/packages/ppp/ppp-2.4.5/makefile.patch b/meta/packages/ppp/ppp-2.4.5/makefile.patch
deleted file mode 100644
index 94af5af6de..0000000000
--- a/meta/packages/ppp/ppp-2.4.5/makefile.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-The patch comes from OpenEmbedded
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-diff -ruN ppp-2.4.5-orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux
--- ppp-2.4.5-orig/chat/Makefile.linux  2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/chat/Makefile.linux       2010-06-30 15:51:30.450118446 +0800
-@@ -25,7 +25,7 @@
- 
- install: chat
-        mkdir -p $(BINDIR) $(MANDIR)
-       $(INSTALL) -s -c chat $(BINDIR)
-+       $(INSTALL) -c chat $(BINDIR)
-        $(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
-diff -ruN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
--- ppp-2.4.5-orig/pppd/Makefile.linux  2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/Makefile.linux       2010-06-30 15:52:11.214170607 +0800
-@@ -99,7 +99,7 @@
- CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
- LIBS   += -lsrp -L/usr/local/ssl/lib -lcrypto
- TARGETS        += srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -200,7 +200,7 @@
- install: pppd
-        mkdir -p $(BINDIR) $(MANDIR)
-        $(EXTRAINSTALL)
-       $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+       $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
-        if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
-          chmod o-rx,u+s $(BINDIR)/pppd; fi
-        $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.5/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux   2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux        2010-06-30 15:53:47.750182267 +0800
-@@ -36,11 +36,11 @@
- 
- install: all
-        $(INSTALL) -d -m 755 $(LIBDIR)
-       $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-       $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-       $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
-       $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
-       $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
-+       $(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+       $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+       $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
-+       $(INSTALL) -m 444 pppd-radius.8 $(MANDIR)
-+       $(INSTALL) -m 444 pppd-radattr.8 $(MANDIR)
- 
- radius.so: radius.o libradiusclient.a
-        $(CC) -o radius.so -shared radius.o libradiusclient.a
-diff -ruN ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux 2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux      2010-06-30 15:53:15.454486877 +0800
-@@ -43,9 +43,9 @@
- 
- install: all
-        $(INSTALL) -d -m 755 $(LIBDIR)
-       $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+       $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
-        $(INSTALL) -d -m 755 $(BINDIR)
-       $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+       $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
- 
- clean:
-        rm -f *.o *.so pppoe-discovery
-diff -ruN ppp-2.4.5-orig/pppdump/Makefile.linux ppp-2.4.5/pppdump/Makefile.linux
--- ppp-2.4.5-orig/pppdump/Makefile.linux       2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppdump/Makefile.linux    2010-06-30 15:52:25.762183537 +0800
-@@ -17,5 +17,5 @@
- 
- install:
-        mkdir -p $(BINDIR) $(MANDIR)
-       $(INSTALL) -s -c pppdump $(BINDIR)
-+       $(INSTALL) -c pppdump $(BINDIR)
-        $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppstats/Makefile.linux ppp-2.4.5/pppstats/Makefile.linux
--- ppp-2.4.5-orig/pppstats/Makefile.linux      2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppstats/Makefile.linux   2010-06-30 15:52:42.486341081 +0800
-@@ -22,7 +22,7 @@
- 
- install: pppstats
-        -mkdir -p $(MANDIR)
-       $(INSTALL) -s -c pppstats $(BINDIR)
-+       $(INSTALL) -c pppstats $(BINDIR)
-        $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
- 
- pppstats: $(PPPSTATSRCS)

diff --git a/meta/packages/ppp/ppp-2.4.5/makefile.patch b/meta/packages/ppp/ppp-2.4.5/makefile.patch deleted file mode 100644 index 94af5af6de..0000000000 --- a/meta/packages/ppp/ppp-2.4.5/makefile.patch +++ /dev/null
@@ -1,93 +0,0 @@
1	The patch comes from OpenEmbedded
2	Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3
4	diff -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:
16	diff -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)
37	diff -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
57	diff -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
72	diff -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)
82	diff -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)