diff -ur ppp-2.4.5.orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux --- ppp-2.4.5.orig/chat/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/chat/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -10,7 +10,7 @@ CDEF4= -DFNDELAY=O_NDELAY # Old name value CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) -COPTS= -O2 -g -pipe +COPTS= -O2 -march=pentium3 -pipe CFLAGS= $(COPTS) $(CDEFS) INSTALL= install @@ -18,7 +18,7 @@ all: chat chat: chat.o - $(CC) -o chat chat.o + $(CC) -pie -o chat chat.o chat.o: chat.c $(CC) -c $(CFLAGS) -o chat.o chat.c diff -ur ppp-2.4.5.orig/configure ppp-2.4.5/configure --- ppp-2.4.5.orig/configure 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/configure 2009-11-18 03:26:03.000000000 +0900 @@ -2,7 +2,7 @@ # $Id: configure,v 1.38 2008/06/15 07:08:49 paulus Exp $ # Where to install stuff by default -DESTDIR=/usr/local +DESTDIR=/usr SYSCONF=/etc # if [ -d /NextApps ]; then diff -ur ppp-2.4.5.orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux --- ppp-2.4.5.orig/pppd/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -30,9 +30,9 @@ include .depend endif -# CC = gcc +CC = gcc # -COPTS = -O2 -pipe -Wall -g +COPTS = -O2 -march=pentium3 -pipe -Wall LIBS = # Uncomment the next 2 lines to include support for Microsoft's @@ -61,8 +61,8 @@ USE_TDB=y HAS_SHADOW=y -#USE_PAM=y -#HAVE_INET6=y +USE_PAM=y +HAVE_INET6=y # Enable plugins PLUGIN=y @@ -206,7 +206,7 @@ $(INSTALL) -c -m 444 pppd.8 $(MANDIR) pppd: $(PPPDOBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) + $(CC) $(CFLAGS) -pie $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) srp-entry: srp-entry.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) diff -ur ppp-2.4.5.orig/pppd/ipv6cp.c ppp-2.4.5/pppd/ipv6cp.c --- ppp-2.4.5.orig/pppd/ipv6cp.c 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/ipv6cp.c 2009-11-18 03:26:03.000000000 +0900 @@ -151,6 +151,7 @@ */ #include +#include #include #include #include @@ -1064,7 +1065,9 @@ return (rc); /* Return final code */ } - +#if defined(SOL2) || defined(__linux__) +int ether_to_eui64(eui64_t *p_eui64); +#endif /* * ipv6_check_options - check that any IP-related options are OK, * and assign appropriate defaults. diff -ur ppp-2.4.5.orig/pppd/plugins/Makefile.linux ppp-2.4.5/pppd/plugins/Makefile.linux --- ppp-2.4.5.orig/pppd/plugins/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -1,5 +1,5 @@ -#CC = gcc -COPTS = -O2 -g +CC = gcc +COPTS = -O2 -march=pentium3 CFLAGS = $(COPTS) -I.. -I../../include -fPIC LDFLAGS = -shared INSTALL = install diff -ur ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux --- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -1,5 +1,5 @@ -#CC = gcc -COPTS = -O2 -g +CC = gcc +COPTS = -O2 -march=pentium3 CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC LDFLAGS = -shared INSTALL = install diff -ur 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 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -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 -O2 -march=pentium3 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. diff -ur 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 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -23,9 +23,9 @@ INSTALL = install # Version is set ONLY IN THE MAKEFILE! Don't delete this! -RP_VERSION=3.8p +RP_VERSION=3.10 -COPTS=-O2 -g +COPTS=-O2 -march=pentium3 CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' all: rp-pppoe.so pppoe-discovery diff -ur ppp-2.4.5.orig/pppdump/Makefile.linux ppp-2.4.5/pppdump/Makefile.linux --- ppp-2.4.5.orig/pppdump/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppdump/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -2,7 +2,7 @@ BINDIR = $(DESTDIR)/sbin MANDIR = $(DESTDIR)/share/man/man8 -CFLAGS= -O -I../include/net +CFLAGS= -O2 -march=pentium3 -I../include/net OBJS = pppdump.o bsd-comp.o deflate.o zlib.o INSTALL= install diff -ur ppp-2.4.5.orig/pppstats/Makefile.linux ppp-2.4.5/pppstats/Makefile.linux --- ppp-2.4.5.orig/pppstats/Makefile.linux 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/pppstats/Makefile.linux 2009-11-18 03:26:03.000000000 +0900 @@ -9,8 +9,8 @@ PPPSTATSRCS = pppstats.c PPPSTATOBJS = pppstats.o -#CC = gcc -COPTS = -O +CC = gcc +COPTS = -O2 -march=pentium3 COMPILE_FLAGS = -I../include LIBS = diff -ur ppp-2.4.5.orig/scripts/ppp-on-rsh ppp-2.4.5/scripts/ppp-on-rsh --- ppp-2.4.5.orig/scripts/ppp-on-rsh 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/scripts/ppp-on-rsh 2009-11-18 03:26:03.000000000 +0900 @@ -26,7 +26,7 @@ # For this example, we assume that pppd on both local and remote # machines reside in the same place, /usr/local/bin/pppd # -PPPD_LOC=/usr/local/bin/pppd +PPPD_LOC=/usr/sbin/pppd # # The location of local options file (where rsh client is running). diff -ur ppp-2.4.5.orig/scripts/ppp-on-ssh ppp-2.4.5/scripts/ppp-on-ssh --- ppp-2.4.5.orig/scripts/ppp-on-ssh 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/scripts/ppp-on-ssh 2009-11-18 03:26:03.000000000 +0900 @@ -26,7 +26,7 @@ # For this example, we assume that pppd on both local and remote # machines reside in the same place, /usr/local/bin/pppd # -PPPD_LOC=/usr/local/bin/pppd +PPPD_LOC=/usr/sbin/pppd # # The location of local options file (where ssh client is running). diff -ur ppp-2.4.5.orig/scripts/secure-card ppp-2.4.5/scripts/secure-card --- ppp-2.4.5.orig/scripts/secure-card 2009-11-17 07:26:07.000000000 +0900 +++ ppp-2.4.5/scripts/secure-card 2009-11-18 03:26:03.000000000 +0900 @@ -1,4 +1,4 @@ -#!/usr/local/bin/expect -f +#!/usr/bin/expect -f # # This script was written by Jim Isaacson . It is # designed to work as a script to use the SecureCARD(tm) device. This