[packages/ppp.git] / ppp-make.patch

diff -urN ppp-2.4.3.org/chat/Makefile.linux ppp-2.4.3/chat/Makefile.linux
--- ppp-2.4.3.org/chat/Makefile.linux	2004-11-03 12:51:47.000000000 +0100
+++ ppp-2.4.3/chat/Makefile.linux	2004-11-15 14:23:18.818290942 +0100
@@ -10,7 +10,7 @@
 CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
 CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 
-COPTS=	-O2 -g -pipe
+COPTS=	$(OPT_FLAGS) -g -pipe
 CFLAGS=	$(COPTS) $(CDEFS)
 
 INSTALL= install
@@ -25,7 +25,7 @@
 
 install: chat
 	mkdir -p $(BINDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
+	$(INSTALL) -c chat $(BINDIR)
 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:
diff -urN ppp-2.4.3.org/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux
--- ppp-2.4.3.org/pppd/Makefile.linux	2004-11-13 13:02:22.000000000 +0100
+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-15 14:21:24.219840972 +0100
@@ -32,7 +32,7 @@
 
 # CC = gcc
 #
-COPTS = -O2 -pipe -Wall -g
+COPTS = $(OPT_FLAGS) -pipe -Wall -g
 LIBS =
 
 # Uncomment the next 2 lines to include support for Microsoft's
@@ -62,16 +62,16 @@
 
 HAS_SHADOW=y
 #USE_PAM=y
-#HAVE_INET6=y
+HAVE_INET6=y
 
 # Enable plugins
 PLUGIN=y
 
 # Enable Microsoft proprietary Callback Control Protocol
-#CBCP=y
+CBCP=y
 
 # Enable EAP SRP-SHA1 authentication (requires libsrp)
-#USE_SRP=y
+#USE_SRP=y
 
 MAXOCTETS=y
 
@@ -119,8 +119,6 @@
 
 ifneq ($(wildcard /usr/include/crypt.h),)
 CFLAGS   += -DHAVE_CRYPT_H=1
-endif
-ifneq ($(wildcard /usr/lib/libcrypt.*),)
 LIBS	+= -lcrypt
 endif
 
@@ -202,9 +200,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -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 555 pppd $(BINDIR)/pppd
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
 
 pppd: $(PPPDOBJS)
diff -urN ppp-2.4.3.org/pppd/plugins/Makefile.linux ppp-2.4.3/pppd/plugins/Makefile.linux
--- ppp-2.4.3.org/pppd/plugins/Makefile.linux	2004-11-14 08:57:35.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-15 14:23:52.454085262 +0100
@@ -1,5 +1,5 @@
 CC	= gcc
-COPTS	= -O2 -g
+COPTS	= $(OPT_FLAGS) -g
 CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS	= -shared
 INSTALL	= install
@@ -11,7 +11,7 @@
 
 SUBDIRS := rp-pppoe pppoatm radius
 # Uncomment the next line to include the radius authentication plugin
-# SUBDIRS += radius
+SUBDIRS += radius
 PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
 
 # include dependencies if present
diff -urN ppp-2.4.3.org/pppd/plugins/radius/Makefile.linux ppp-2.4.3/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.3.org/pppd/plugins/radius/Makefile.linux	2004-11-14 08:02:31.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-15 14:28:51.171092149 +0100
@@ -12,7 +12,7 @@
 INSTALL	= install
 
 PLUGIN=radius.so radattr.so radrealms.so
-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
+CFLAGS=-I. -I../.. -I../../../include $(OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
 
 # Uncomment the next line to include support for Microsoft's
 # MS-CHAP authentication protocol.
@@ -36,14 +36,14 @@
 
 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 755 radius.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
 radius.so: radius.o libradiusclient.a
-	$(CC) -o radius.so -shared radius.o libradiusclient.a
+	$(CC) -o radius.so -shared radius.o -lradiusclient
 
 radattr.so: radattr.o
 	$(CC) -o radattr.so -shared radattr.o
diff -urN ppp-2.4.3.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.3.org/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-14 08:58:37.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-15 14:24:04.077595197 +0100
@@ -24,7 +24,7 @@
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 
-COPTS=-O2 -g
+COPTS=$(OPT_FLAGS) -g
 CFLAGS=$(COPTS) -I../../../include/linux
 all: rp-pppoe.so pppoe-discovery
 
diff -urN ppp-2.4.3.org/pppdump/Makefile.linux ppp-2.4.3/pppdump/Makefile.linux
--- ppp-2.4.3.org/pppdump/Makefile.linux	2004-10-31 02:36:52.000000000 +0200
+++ ppp-2.4.3/pppdump/Makefile.linux	2004-11-15 14:21:50.615186388 +0100
@@ -2,7 +2,7 @@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 
-CFLAGS= -O -I../include/net
+CFLAGS= $(OPT_FLAGS) -I../include/net
 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
 
 INSTALL= install
@@ -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 -urN ppp-2.4.3.org/ppp-make.patch ppp-2.4.3/ppp-make.patch
--- ppp-2.4.3.org/ppp-make.patch	1970-01-01 01:00:00.000000000 +0100
+++ ppp-2.4.3/ppp-make.patch	2004-03-31 11:58:35.000000000 +0200
@@ -0,0 +1,155 @@
+diff -urN ppp-2.4.2-20020809.org/linux/Makefile.top ppp-2.4.2-20020809/linux/Makefile.top
+--- ppp-2.4.2-20020809.org/linux/Makefile.top	Fri Aug  9 22:14:40 2002
++++ ppp-2.4.2-20020809/linux/Makefile.top	Sat Aug 10 00:31:18 2002
+@@ -3,7 +3,7 @@
+ 
+ BINDIR = $(DESTDIR)/usr/sbin
+ INCDIR = $(DESTDIR)/usr/include
+-MANDIR = $(DESTDIR)/usr/man
++MANDIR = $(DESTDIR)/usr/share/man
+ ETCDIR = $(DESTDIR)/etc/ppp
+ 
+ # uid 0 = root
+--- ppp-2.4.2/pppd/Makefile.linux.orig	Thu Nov 27 22:55:19 2003
++++ ppp-2.4.2/pppd/Makefile.linux	Wed Mar 31 11:51:17 2004
+@@ -31,7 +31,7 @@
+ 
+ # CC = gcc
+ #
+-COPTS = -O2 -pipe -Wall -g
++COPTS = $(OPT_FLAGS) -pipe -Wall
+ LIBS =
+ 
+ # Uncomment the next 2 lines to include support for Microsoft's
+@@ -61,13 +61,13 @@
+ 
+ HAS_SHADOW=y
+ #USE_PAM=y
+-#HAVE_INET6=y
++HAVE_INET6=y
+ 
+ # Enable plugins
+ PLUGIN=y
+ 
+ # Enable Microsoft proprietary Callback Control Protocol
+-#CBCP=y
++CBCP=y
+ 
+ # Enable EAP SRP-SHA1 authentication (requires libsrp)
+ #USE_SRP=y
+@@ -118,8 +118,6 @@
+ 
+ ifneq ($(wildcard /usr/include/crypt.h),)
+ CFLAGS   += -DHAVE_CRYPT_H=1
+-endif
+-ifneq ($(wildcard /usr/lib/libcrypt.*),)
+ LIBS	+= -lcrypt
+ endif
+ 
+@@ -192,16 +190,14 @@
+      CFLAGS += -DMAXOCTETS
+ endif
+ 
+-INSTALL= install -o root
++INSTALL= install
+ 
+ all: $(TARGETS)
+ 
+ install: pppd
+ 	mkdir -p $(BINDIR) $(MANDIR)
+-	$(EXTRAINSTALL)
+-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+-	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
+-	  chmod o-rx,u+s $(BINDIR)/pppd; fi
++#	$(EXTRAINSTALL)
++	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
+ 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
+ 
+ pppd: $(PPPDOBJS)
+diff -urN ppp-2.4.2-20020809.org/pppdump/Makefile.linux ppp-2.4.2-20020809/pppdump/Makefile.linux
+--- ppp-2.4.2-20020809.org/pppdump/Makefile.linux	Fri Aug  9 22:14:40 2002
++++ ppp-2.4.2-20020809/pppdump/Makefile.linux	Sat Aug 10 00:31:18 2002
+@@ -13,5 +13,5 @@
+ 
+ install:
+ 	mkdir -p $(BINDIR) $(MANDIR)/man8
+-	$(INSTALL) -s -c pppdump $(BINDIR)
++	$(INSTALL) -c pppdump $(BINDIR)
+ 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
+diff -urN ppp-2.4.2-20020809.org/pppstats/Makefile.linux ppp-2.4.2-20020809/pppstats/Makefile.linux
+--- ppp-2.4.2-20020809.org/pppstats/Makefile.linux	Fri Aug  9 22:14:40 2002
++++ ppp-2.4.2-20020809/pppstats/Makefile.linux	Sat Aug 10 00:31:18 2002
+@@ -7,11 +7,11 @@
+ PPPSTATOBJS = pppstats.o
+ 
+ #CC = gcc
+-COPTS = -O
++COPTS = $(OPT_FLAGS)
+ COMPILE_FLAGS = -I../include
+ LIBS =
+ 
+-INSTALL= install -o root -g daemon
++INSTALL= install
+ 
+ CFLAGS = $(COPTS) $(COMPILE_FLAGS)
+ 
+@@ -19,7 +19,7 @@
+ 
+ install: pppstats
+ 	-mkdir -p $(MANDIR)/man8
+-	$(INSTALL) -s -c pppstats $(BINDIR)/pppstats
++	$(INSTALL) -c pppstats $(BINDIR)/pppstats
+ 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
+ 
+ pppstats: $(PPPSTATSRCS)
+--- ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux.orig	2002-10-05 06:35:24.000000000 +0200
++++ ppp-2.4.2-20030613/pppd/plugins/radius/Makefile.linux	2003-06-17 08:02:16.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ MANDIR=/usr/man
+ PLUGIN=radius.so radattr.so radrealms.so
+-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
++CFLAGS=-I../.. -I../../../include -Iradiusclient/include $(OPT_FLAGS)
+ 
+ # Uncomment the next line to include support for Microsoft's
+ # MS-CHAP authentication protocol.
+--- ppp-2.4.2/chat/Makefile.linux.orig	2004-01-13 04:57:55.000000000 +0100
++++ ppp-2.4.2/chat/Makefile.linux	2004-02-08 12:01:47.000000000 +0100
+@@ -6,7 +6,7 @@
+ CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
+ CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
+ 
+-COPTS=	-O2 -g -pipe $(CDEFS)
++COPTS=	$(OPT_FLAGS) -pipe $(CDEFS)
+ CFLAGS=	$(COPTS) $(CDEFS)
+ 
+ INSTALL= install
+--- ppp-2.4.2/pppd/plugins/Makefile.linux.orig	2004-01-13 04:56:24.000000000 +0100
++++ ppp-2.4.2/pppd/plugins/Makefile.linux	2004-02-08 12:04:45.000000000 +0100
+@@ -1,12 +1,12 @@
+ CC	= gcc
+-COPTS	= -O2 -g
++COPTS	= $(OPT_FLAGS)
+ CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS	= -shared
+-INSTALL	= install -o root
++INSTALL	= install 
+ 
+ SUBDIRS := rp-pppoe
+ # Uncomment the next line to include the radius authentication plugin
+-# SUBDIRS += radius
++SUBDIRS += radius
+ PLUGINS := minconn.so passprompt.so passwordfd.so
+ 
+ # include dependencies if present
+--- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.orig	2004-01-13 04:57:55.000000000 +0100
++++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux	2004-02-08 12:06:47.000000000 +0100
+@@ -16,7 +16,7 @@
+ # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
+ VERSION=3.3
+ 
+-COPTS=-O2 -g
++COPTS=$(OPT_FLAGS)
+ CFLAGS=$(COPTS) -I../../../include/linux
+ all: rp-pppoe.so
+ 
diff -urN ppp-2.4.3.org/pppstats/Makefile.linux ppp-2.4.3/pppstats/Makefile.linux
--- ppp-2.4.3.org/pppstats/Makefile.linux	2004-10-31 23:09:03.000000000 +0100
+++ ppp-2.4.3/pppstats/Makefile.linux	2004-11-15 14:22:16.616616192 +0100
@@ -10,7 +10,7 @@
 PPPSTATOBJS = pppstats.o
 
 #CC = gcc
-COPTS = -O
+COPTS = $(OPT_FLAGS)
 COMPILE_FLAGS = -I../include
 LIBS =
 
@@ -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)
Commit	Line	Data
5d717ee9 AM	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
	4	@@ -10,7 +10,7 @@
	5	CDEF4= -DFNDELAY=O_NDELAY # Old name value
	6	CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
	7
	8	-COPTS= -O2 -g -pipe
	9	+COPTS= $(OPT_FLAGS) -g -pipe
	10	CFLAGS= $(COPTS) $(CDEFS)
	11
	12	INSTALL= install
	13	@@ -25,7 +25,7 @@
	14
	15	install: chat
	16	mkdir -p $(BINDIR)
	17	- $(INSTALL) -s -c chat $(BINDIR)
	18	+ $(INSTALL) -c chat $(BINDIR)
	19	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
	20
	21	clean:
	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
	25	@@ -32,7 +32,7 @@
0d24a27d	26
	27	# CC = gcc
	28	#
	29	-COPTS = -O2 -pipe -Wall -g
5d717ee9	30	+COPTS = $(OPT_FLAGS) -pipe -Wall -g
0d24a27d	31	LIBS =
0d24a27d	32
d26023db	33	# Uncomment the next 2 lines to include support for Microsoft's
5d717ee9	34	@@ -62,16 +62,16 @@
c94df5ad AM	35
	36	HAS_SHADOW=y
	37	#USE_PAM=y
	38	-#HAVE_INET6=y
	39	+HAVE_INET6=y
	40
d26023db	41	# Enable plugins
c94df5ad AM	42	PLUGIN=y
c94df5ad AM	43
d26023db	44	# Enable Microsoft proprietary Callback Control Protocol
7d3cd975 AM	45	-#CBCP=y
7d3cd975 AM	46	+CBCP=y
e619c42e	47
d26023db	48	# Enable EAP SRP-SHA1 authentication (requires libsrp)
5d717ee9	49	-#USE_SRP=y
b229694a	50	+#USE_SRP=y
5d717ee9 AM	51
	52	MAXOCTETS=y
	53
	54	@@ -119,8 +119,6 @@
e94b1417 JB	55
	56	ifneq ($(wildcard /usr/include/crypt.h),)
	57	CFLAGS += -DHAVE_CRYPT_H=1
	58	-endif
	59	-ifneq ($(wildcard /usr/lib/libcrypt.*),)
	60	LIBS += -lcrypt
	61	endif
	62
5d717ee9	63	@@ -202,9 +200,7 @@
9113567e	64	install: pppd
9113567e	65	mkdir -p $(BINDIR) $(MANDIR)
5d717ee9	66	$(EXTRAINSTALL)
c94df5ad AM	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
7d3cd975	70	+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
5d717ee9	71	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
9113567e	72
9113567e	73	pppd: $(PPPDOBJS)
5d717ee9 AM	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
	77	@@ -1,5 +1,5 @@
99fe3f88	78	CC = gcc
99fe3f88	79	-COPTS = -O2 -g
5d717ee9	80	+COPTS = $(OPT_FLAGS) -g
99fe3f88	81	CFLAGS = $(COPTS) -I.. -I../../include -fPIC
99fe3f88	82	LDFLAGS = -shared
5d717ee9 AM	83	INSTALL = install
5d717ee9 AM	84	@@ -11,7 +11,7 @@
99fe3f88	85
5d717ee9	86	SUBDIRS := rp-pppoe pppoatm radius
99fe3f88	87	# Uncomment the next line to include the radius authentication plugin
	88	-# SUBDIRS += radius
	89	+SUBDIRS += radius
5d717ee9	90	PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
99fe3f88	91
99fe3f88	92	# include dependencies if present
5d717ee9 AM	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
	96	@@ -12,7 +12,7 @@
	97	INSTALL = install
	98
	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
	102
	103	# Uncomment the next line to include support for Microsoft's
	104	# MS-CHAP authentication protocol.
	105	@@ -36,14 +36,14 @@
	106
	107	install: all
	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)
	117
	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
	121
	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
	127	@@ -24,7 +24,7 @@
99fe3f88	128	# Version is set ONLY IN THE MAKEFILE! Don't delete this!
	129	VERSION=3.3
	130
	131	-COPTS=-O2 -g
5d717ee9	132	+COPTS=$(OPT_FLAGS) -g
99fe3f88	133	CFLAGS=$(COPTS) -I../../../include/linux
5d717ee9 AM	134	all: rp-pppoe.so pppoe-discovery
	135
	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
	139	@@ -2,7 +2,7 @@
	140	BINDIR = $(DESTDIR)/sbin
	141	MANDIR = $(DESTDIR)/share/man/man8
99fe3f88	142
5d717ee9 AM	143	-CFLAGS= -O -I../include/net
	144	+CFLAGS= $(OPT_FLAGS) -I../include/net
	145	OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
	146
	147	INSTALL= install
	148	@@ -17,5 +17,5 @@
	149
	150	install:
	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
	158	@@ -0,0 +1,155 @@
	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
	162	+@@ -3,7 +3,7 @@
	163	+
	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
	169	+
	170	+ # uid 0 = root
	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
	173	+@@ -31,7 +31,7 @@
	174	+
	175	+ # CC = gcc
	176	+ #
	177	+-COPTS = -O2 -pipe -Wall -g
	178	++COPTS = $(OPT_FLAGS) -pipe -Wall
	179	+ LIBS =
	180	+
	181	+ # Uncomment the next 2 lines to include support for Microsoft's
	182	+@@ -61,13 +61,13 @@
	183	+
	184	+ HAS_SHADOW=y
	185	+ #USE_PAM=y
	186	+-#HAVE_INET6=y
	187	++HAVE_INET6=y
	188	+
	189	+ # Enable plugins
	190	+ PLUGIN=y
	191	+
	192	+ # Enable Microsoft proprietary Callback Control Protocol
	193	+-#CBCP=y
	194	++CBCP=y
	195	+
	196	+ # Enable EAP SRP-SHA1 authentication (requires libsrp)
	197	+ #USE_SRP=y
	198	+@@ -118,8 +118,6 @@
	199	+
	200	+ ifneq ($(wildcard /usr/include/crypt.h),)
	201	+ CFLAGS += -DHAVE_CRYPT_H=1
	202	+-endif
	203	+-ifneq ($(wildcard /usr/lib/libcrypt.*),)
	204	+ LIBS += -lcrypt
	205	+ endif
	206	+
207	+@@ -192,16 +190,14 @@
208	+ CFLAGS += -DMAXOCTETS
209	+ endif
210	+
211	+-INSTALL= install -o root
212	++INSTALL= install
213	+
214	+ all: $(TARGETS)
215	+
216	+ install: pppd
217	+ mkdir -p $(BINDIR) $(MANDIR)
218	+- $(EXTRAINSTALL)
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
222	++# $(EXTRAINSTALL)
223	++ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
224	+ $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
225	+
226	+ pppd: $(PPPDOBJS)
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
230	+@@ -13,5 +13,5 @@
231	+
232	+ install:
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
240	+@@ -7,11 +7,11 @@
241	+ PPPSTATOBJS = pppstats.o
242	+
243	+ #CC = gcc
244	+-COPTS = -O
245	++COPTS = $(OPT_FLAGS)
246	+ COMPILE_FLAGS = -I../include
247	+ LIBS =
248	+
249	+-INSTALL= install -o root -g daemon
250	++INSTALL= install
251	+
252	+ CFLAGS = $(COPTS) $(COMPILE_FLAGS)
253	+
254	+@@ -19,7 +19,7 @@
255	+
256	+ install: pppstats
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
261	+
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
265	+@@ -5,7 +5,7 @@
266	+
267	+ MANDIR=/usr/man
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)
271	+
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
276	+@@ -6,7 +6,7 @@
277	+ CDEF4= -DFNDELAY=O_NDELAY # Old name value
278	+ CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
279	+
280	+-COPTS= -O2 -g -pipe $(CDEFS)
281	++COPTS= $(OPT_FLAGS) -pipe $(CDEFS)
282	+ CFLAGS= $(COPTS) $(CDEFS)
283	+
284	+ INSTALL= install
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
287	+@@ -1,12 +1,12 @@
288	+ CC = gcc
289	+-COPTS = -O2 -g
290	++COPTS = $(OPT_FLAGS)
291	+ CFLAGS = $(COPTS) -I.. -I../../include -fPIC
292	+ LDFLAGS = -shared
293	+-INSTALL = install -o root
294	++INSTALL = install
295	+
296	+ SUBDIRS := rp-pppoe
297	+ # Uncomment the next line to include the radius authentication plugin
298	+-# SUBDIRS += radius
299	++SUBDIRS += radius
300	+ PLUGINS := minconn.so passprompt.so passwordfd.so
301	+
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
305	+@@ -16,7 +16,7 @@
306	+ # Version is set ONLY IN THE MAKEFILE! Don't delete this!
307	+ VERSION=3.3
308	+
309	+-COPTS=-O2 -g
310	++COPTS=$(OPT_FLAGS)
311	+ CFLAGS=$(COPTS) -I../../../include/linux
312	+ all: rp-pppoe.so
313	+
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
317	@@ -10,7 +10,7 @@
318	PPPSTATOBJS = pppstats.o
319
320	#CC = gcc
321	-COPTS = -O
322	+COPTS = $(OPT_FLAGS)
323	COMPILE_FLAGS = -I../include
324	LIBS =
325
326	@@ -22,7 +22,7 @@
327
328	install: pppstats
329	-mkdir -p $(MANDIR)
330	- $(INSTALL) -s -c pppstats $(BINDIR)
331	+ $(INSTALL) -c pppstats $(BINDIR)
332	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
333
334	pppstats: $(PPPSTATSRCS)