1 diff -urN ppp-2.4.3.org/chat/Makefile.linux ppp-2.4.3/chat/Makefile.linux
2 --- ppp-2.4.3.org/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100
3 +++ ppp-2.4.3/chat/Makefile.linux 2004-11-15 14:23:18.818290942 +0100
5 CDEF4= -DFNDELAY=O_NDELAY # Old name value
6 CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
9 +COPTS= $(OPT_FLAGS) -g -pipe
10 CFLAGS= $(COPTS) $(CDEFS)
17 - $(INSTALL) -s -c chat $(BINDIR)
18 + $(INSTALL) -c chat $(BINDIR)
19 $(INSTALL) -c -m 644 chat.8 $(MANDIR)
22 diff -urN ppp-2.4.3.org/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux
23 --- ppp-2.4.3.org/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100
24 +++ ppp-2.4.3/pppd/Makefile.linux 2004-11-15 14:21:24.219840972 +0100
29 -COPTS = -O2 -pipe -Wall -g
30 +COPTS = $(OPT_FLAGS) -pipe -Wall -g
33 # Uncomment the next 2 lines to include support for Microsoft's
44 # Enable Microsoft proprietary Callback Control Protocol
48 # Enable EAP SRP-SHA1 authentication (requires libsrp)
56 ifneq ($(wildcard /usr/include/crypt.h),)
57 CFLAGS += -DHAVE_CRYPT_H=1
59 -ifneq ($(wildcard /usr/lib/libcrypt.*),)
65 mkdir -p $(BINDIR) $(MANDIR)
67 - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
68 - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
69 - chmod o-rx,u+s $(BINDIR)/pppd; fi
70 + $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
71 $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
74 diff -urN ppp-2.4.3.org/pppd/plugins/Makefile.linux ppp-2.4.3/pppd/plugins/Makefile.linux
75 --- ppp-2.4.3.org/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100
76 +++ ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-15 14:23:52.454085262 +0100
80 +COPTS = $(OPT_FLAGS) -g
81 CFLAGS = $(COPTS) -I.. -I../../include -fPIC
86 SUBDIRS := rp-pppoe pppoatm radius
87 # Uncomment the next line to include the radius authentication plugin
90 PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
92 # include dependencies if present
93 diff -urN ppp-2.4.3.org/pppd/plugins/radius/Makefile.linux ppp-2.4.3/pppd/plugins/radius/Makefile.linux
94 --- ppp-2.4.3.org/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100
95 +++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2004-11-15 14:28:51.171092149 +0100
99 PLUGIN=radius.so radattr.so radrealms.so
100 -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
101 +CFLAGS=-I. -I../.. -I../../../include $(OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
103 # Uncomment the next line to include support for Microsoft's
104 # MS-CHAP authentication protocol.
108 $(INSTALL) -d -m 755 $(LIBDIR)
109 - $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
110 - $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
111 - $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
112 + $(INSTALL) -c -m 755 radius.so $(LIBDIR)
113 + $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
114 + $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
115 $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
116 $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
118 radius.so: radius.o libradiusclient.a
119 - $(CC) -o radius.so -shared radius.o libradiusclient.a
120 + $(CC) -o radius.so -shared radius.o -lradiusclient
122 radattr.so: radattr.o
123 $(CC) -o radattr.so -shared radattr.o
124 diff -urN ppp-2.4.3.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
125 --- ppp-2.4.3.org/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100
126 +++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-15 14:24:04.077595197 +0100
128 # Version is set ONLY IN THE MAKEFILE! Don't delete this!
132 +COPTS=$(OPT_FLAGS) -g
133 CFLAGS=$(COPTS) -I../../../include/linux
134 all: rp-pppoe.so pppoe-discovery
136 diff -urN ppp-2.4.3.org/pppdump/Makefile.linux ppp-2.4.3/pppdump/Makefile.linux
137 --- ppp-2.4.3.org/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200
138 +++ ppp-2.4.3/pppdump/Makefile.linux 2004-11-15 14:21:50.615186388 +0100
140 BINDIR = $(DESTDIR)/sbin
141 MANDIR = $(DESTDIR)/share/man/man8
143 -CFLAGS= -O -I../include/net
144 +CFLAGS= $(OPT_FLAGS) -I../include/net
145 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
151 mkdir -p $(BINDIR) $(MANDIR)
152 - $(INSTALL) -s -c pppdump $(BINDIR)
153 + $(INSTALL) -c pppdump $(BINDIR)
154 $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
155 diff -urN ppp-2.4.3.org/ppp-make.patch ppp-2.4.3/ppp-make.patch
156 --- ppp-2.4.3.org/ppp-make.patch 1970-01-01 01:00:00.000000000 +0100
157 +++ ppp-2.4.3/ppp-make.patch 2004-03-31 11:58:35.000000000 +0200
159 +diff -urN ppp-2.4.2-20020809.org/linux/Makefile.top ppp-2.4.2-20020809/linux/Makefile.top
160 +--- ppp-2.4.2-20020809.org/linux/Makefile.top Fri Aug 9 22:14:40 2002
161 ++++ ppp-2.4.2-20020809/linux/Makefile.top Sat Aug 10 00:31:18 2002
164 + BINDIR = $(DESTDIR)/usr/sbin
165 + INCDIR = $(DESTDIR)/usr/include
166 +-MANDIR = $(DESTDIR)/usr/man
167 ++MANDIR = $(DESTDIR)/usr/share/man
168 + ETCDIR = $(DESTDIR)/etc/ppp
171 +--- ppp-2.4.2/pppd/Makefile.linux.orig Thu Nov 27 22:55:19 2003
172 ++++ ppp-2.4.2/pppd/Makefile.linux Wed Mar 31 11:51:17 2004
177 +-COPTS = -O2 -pipe -Wall -g
178 ++COPTS = $(OPT_FLAGS) -pipe -Wall
181 + # Uncomment the next 2 lines to include support for Microsoft's
192 + # Enable Microsoft proprietary Callback Control Protocol
196 + # Enable EAP SRP-SHA1 authentication (requires libsrp)
200 + ifneq ($(wildcard /usr/include/crypt.h),)
201 + CFLAGS += -DHAVE_CRYPT_H=1
203 +-ifneq ($(wildcard /usr/lib/libcrypt.*),)
207 +@@ -192,16 +190,14 @@
208 + CFLAGS += -DMAXOCTETS
211 +-INSTALL= install -o root
217 + mkdir -p $(BINDIR) $(MANDIR)
219 +- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
220 +- if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
221 +- chmod o-rx,u+s $(BINDIR)/pppd; fi
223 ++ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
224 + $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
227 +diff -urN ppp-2.4.2-20020809.org/pppdump/Makefile.linux ppp-2.4.2-20020809/pppdump/Makefile.linux
228 +--- ppp-2.4.2-20020809.org/pppdump/Makefile.linux Fri Aug 9 22:14:40 2002
229 ++++ ppp-2.4.2-20020809/pppdump/Makefile.linux Sat Aug 10 00:31:18 2002
233 + mkdir -p $(BINDIR) $(MANDIR)/man8
234 +- $(INSTALL) -s -c pppdump $(BINDIR)
235 ++ $(INSTALL) -c pppdump $(BINDIR)
236 + $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
237 +diff -urN ppp-2.4.2-20020809.org/pppstats/Makefile.linux ppp-2.4.2-20020809/pppstats/Makefile.linux
238 +--- ppp-2.4.2-20020809.org/pppstats/Makefile.linux Fri Aug 9 22:14:40 2002
239 ++++ ppp-2.4.2-20020809/pppstats/Makefile.linux Sat Aug 10 00:31:18 2002
241 + PPPSTATOBJS = pppstats.o
245 ++COPTS = $(OPT_FLAGS)
246 + COMPILE_FLAGS = -I../include
249 +-INSTALL= install -o root -g daemon
252 + CFLAGS = $(COPTS) $(COMPILE_FLAGS)
257 + -mkdir -p $(MANDIR)/man8
258 +- $(INSTALL) -s -c pppstats $(BINDIR)/pppstats
259 ++ $(INSTALL) -c pppstats $(BINDIR)/pppstats
260 + $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
262 + pppstats: $(PPPSTATSRCS)
263 +--- ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux.orig 2002-10-05 06:35:24.000000000 +0200
264 ++++ ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux 2003-06-17 08:02:16.000000000 +0200
268 + PLUGIN=radius.so radattr.so radrealms.so
269 +-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
270 ++CFLAGS=-I../.. -I../../../include -Iradiusclient/include $(OPT_FLAGS)
272 + # Uncomment the next line to include support for Microsoft's
273 + # MS-CHAP authentication protocol.
274 +--- ppp-2.4.2/chat/Makefile.linux.orig 2004-01-13 04:57:55.000000000 +0100
275 ++++ ppp-2.4.2/chat/Makefile.linux 2004-02-08 12:01:47.000000000 +0100
277 + CDEF4= -DFNDELAY=O_NDELAY # Old name value
278 + CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
280 +-COPTS= -O2 -g -pipe $(CDEFS)
281 ++COPTS= $(OPT_FLAGS) -pipe $(CDEFS)
282 + CFLAGS= $(COPTS) $(CDEFS)
285 +--- ppp-2.4.2/pppd/plugins/Makefile.linux.orig 2004-01-13 04:56:24.000000000 +0100
286 ++++ ppp-2.4.2/pppd/plugins/Makefile.linux 2004-02-08 12:04:45.000000000 +0100
290 ++COPTS = $(OPT_FLAGS)
291 + CFLAGS = $(COPTS) -I.. -I../../include -fPIC
293 +-INSTALL = install -o root
296 + SUBDIRS := rp-pppoe
297 + # Uncomment the next line to include the radius authentication plugin
298 +-# SUBDIRS += radius
300 + PLUGINS := minconn.so passprompt.so passwordfd.so
302 + # include dependencies if present
303 +--- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.orig 2004-01-13 04:57:55.000000000 +0100
304 ++++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux 2004-02-08 12:06:47.000000000 +0100
306 + # Version is set ONLY IN THE MAKEFILE! Don't delete this!
311 + CFLAGS=$(COPTS) -I../../../include/linux
314 diff -urN ppp-2.4.3.org/pppstats/Makefile.linux ppp-2.4.3/pppstats/Makefile.linux
315 --- ppp-2.4.3.org/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100
316 +++ ppp-2.4.3/pppstats/Makefile.linux 2004-11-15 14:22:16.616616192 +0100
318 PPPSTATOBJS = pppstats.o
322 +COPTS = $(OPT_FLAGS)
323 COMPILE_FLAGS = -I../include
330 - $(INSTALL) -s -c pppstats $(BINDIR)
331 + $(INSTALL) -c pppstats $(BINDIR)
332 $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
334 pppstats: $(PPPSTATSRCS)