ppp-make.patch

   1 diff -urN ppp-2.4.4.org/chat/Makefile.linux ppp-2.4.4/chat/Makefile.linux
   2 --- ppp-2.4.4.org/chat/Makefile.linux   2006-06-04 07:07:46.000000000 +0200
   3 +++ ppp-2.4.4/chat/Makefile.linux       2006-07-09 13:28:04.831141500 +0200
   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) $(MANDIR)
  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.4.org/pppd/Makefile.linux ppp-2.4.4/pppd/Makefile.linux
  23 --- ppp-2.4.4.org/pppd/Makefile.linux   2006-06-04 07:07:46.000000000 +0200
  24 +++ ppp-2.4.4/pppd/Makefile.linux       2006-07-09 13:29:38.368987250 +0200
  25 @@ -32,7 +32,7 @@
  26
  27  # CC = gcc
  28  #
  29 -COPTS = -O2 -pipe -Wall -g
  30 +COPTS = $(OPT_FLAGS) -pipe -Wall -g
  31  LIBS =
  32
  33  # Uncomment the next 2 lines to include support for Microsoft's
  34 @@ -62,13 +62,13 @@
  35
  36  HAS_SHADOW=y
  37  #USE_PAM=y
  38 -#HAVE_INET6=y
  39 +HAVE_INET6=y
  40
  41  # Enable plugins
  42  PLUGIN=y
  43
  44  # Enable Microsoft proprietary Callback Control Protocol
  45 -#CBCP=y
  46 +CBCP=y
  47
  48  # Enable EAP SRP-SHA1 authentication (requires libsrp)
  49  #USE_SRP=y
  50 @@ -200,9 +200,7 @@
  51  install: pppd
  52         mkdir -p $(BINDIR) $(MANDIR)
  53         $(EXTRAINSTALL)
  54 -       $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
  55 -       if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  56 -         chmod o-rx,u+s $(BINDIR)/pppd; fi
  57 +       $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
  58         $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  59
  60  pppd: $(PPPDOBJS)
  61 diff -urN ppp-2.4.4.org/pppd/plugins/Makefile.linux ppp-2.4.4/pppd/plugins/Makefile.linux
  62 --- ppp-2.4.4.org/pppd/plugins/Makefile.linux   2006-06-04 07:04:14.000000000 +0200
  63 +++ ppp-2.4.4/pppd/plugins/Makefile.linux       2006-07-09 13:29:59.842329250 +0200
  64 @@ -1,5 +1,5 @@
  65  CC     = gcc
  66 -COPTS  = -O2 -g
  67 +COPTS  = $(OPT_FLAGS) -g
  68  CFLAGS = $(COPTS) -I.. -I../../include -fPIC
  69  LDFLAGS        = -shared
  70  INSTALL        = install
  71 diff -urN ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux ppp-2.4.4/pppd/plugins/radius/Makefile.linux
  72 --- ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux    2006-06-04 07:04:14.000000000 +0200
  73 +++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux        2006-07-09 13:30:31.928334500 +0200
  74 @@ -12,7 +12,7 @@
  75  INSTALL        = install
  76
  77  PLUGIN=radius.so radattr.so radrealms.so
  78 -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
  79 +CFLAGS=-I. -I../.. -I../../../include $(OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
  80
  81  # Uncomment the next line to include support for Microsoft's
  82  # MS-CHAP authentication protocol.
  83 @@ -36,9 +36,9 @@
  84
  85  install: all
  86         $(INSTALL) -d -m 755 $(LIBDIR)
  87 -       $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
  88 -       $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
  89 -       $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
  90 +       $(INSTALL) -c -m 755 radius.so $(LIBDIR)
  91 +       $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
  92 +       $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
  93         $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  94         $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  95
  96 diff -urN ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
  97 --- ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux  2006-06-04 07:07:46.000000000 +0200
  98 +++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux      2006-07-09 13:30:55.833828500 +0200
  99 @@ -24,7 +24,7 @@
 100  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 101  VERSION=3.3
 102
 103 -COPTS=-O2 -g
 104 +COPTS=$(OPT_FLAGS) -g
 105  CFLAGS=$(COPTS) -I../../../include/linux
 106  all: rp-pppoe.so pppoe-discovery
 107
 108 @@ -39,7 +39,7 @@
 109
 110  install: all
 111         $(INSTALL) -d -m 755 $(LIBDIR)
 112 -       $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
 113 +       $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
 114         $(INSTALL) -d -m 755 $(BINDIR)
 115         $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
 116
 117 diff -urN ppp-2.4.4.org/pppdump/Makefile.linux ppp-2.4.4/pppdump/Makefile.linux
 118 --- ppp-2.4.4.org/pppdump/Makefile.linux        2006-06-04 07:04:14.000000000 +0200
 119 +++ ppp-2.4.4/pppdump/Makefile.linux    2006-07-09 13:31:16.499120000 +0200
 120 @@ -2,7 +2,7 @@
 121  BINDIR = $(DESTDIR)/sbin
 122  MANDIR = $(DESTDIR)/share/man/man8
 123
 124 -CFLAGS= -O -I../include/net
 125 +CFLAGS= $(OPT_FLAGS) -I../include/net
 126  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
 127
 128  INSTALL= install
 129 @@ -17,5 +17,5 @@
 130
 131  install:
 132         mkdir -p $(BINDIR) $(MANDIR)
 133 -       $(INSTALL) -s -c pppdump $(BINDIR)
 134 +       $(INSTALL) -c pppdump $(BINDIR)
 135         $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
 136 diff -urN ppp-2.4.4.org/pppstats/Makefile.linux ppp-2.4.4/pppstats/Makefile.linux
 137 --- ppp-2.4.4.org/pppstats/Makefile.linux       2006-06-04 07:07:46.000000000 +0200
 138 +++ ppp-2.4.4/pppstats/Makefile.linux   2006-07-09 13:31:41.380675000 +0200
 139 @@ -10,7 +10,7 @@
 140  PPPSTATOBJS = pppstats.o
 141
 142  #CC = gcc
 143 -COPTS = -O
 144 +COPTS = $(OPT_FLAGS)
 145  COMPILE_FLAGS = -I../include
 146  LIBS =
 147
 148 @@ -22,7 +22,7 @@
 149
 150  install: pppstats
 151         -mkdir -p $(MANDIR)
 152 -       $(INSTALL) -s -c pppstats $(BINDIR)
 153 +       $(INSTALL) -c pppstats $(BINDIR)
 154         $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 155
 156  pppstats: $(PPPSTATSRCS)