source: npl/internetserver/poptop_ppp/patches/ppp-2.4.3-make.patch @ c5c522c

gcc484ntopperl-5.22
Last change on this file since c5c522c was c5c522c, checked in by Edwin Eefting <edwin@datux.nl>, 8 years ago

initial commit, transferred from cleaned syn3 svn tree
  • Property mode set to 100644
File size: 2.8 KB
RevLine 
[c5c522c]1Obey RPM_OPT_FLAGS, link with pppd with libutil to get logwtmp(), and enable
2PAM support.
3--- ppp-2.4.3/chat/Makefile.linux       2004-11-03 11:51:47.000000000 +0000
4+++ ppp-2.4.3/chat/Makefile.linux       2004-11-22 14:28:51.100642512 +0000
5@@ -10,7 +10,7 @@
6 CDEF4= -DFNDELAY=O_NDELAY              # Old name value
7 CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
8 
9-COPTS= -O2 -g -pipe
10+COPTS= $(RPM_OPT_FLAGS)
11 CFLAGS=        $(COPTS) $(CDEFS)
12 
13 INSTALL= install
14--- ppp-2.4.3/pppd/Makefile.linux       2003-11-27 16:55:19.000000000 -0500
15+++ ppp-2.4.3/pppd/Makefile.linux       2004-03-10 18:32:46.000000000 -0500
16@@ -29,10 +29,10 @@
17 include .depend
18 endif
19 
20-# CC = gcc
21+CC = gcc
22 #
23-COPTS = -O2 -pipe -Wall -g
24-LIBS =
25+COPTS = -Wall $(RPM_OPT_FLAGS)
26+LIBS = -lutil
27 
28 # Uncomment the next 2 lines to include support for Microsoft's
29 # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
30@@ -60,7 +60,7 @@
31 USE_TDB=y
32 
33 HAS_SHADOW=y
34-#USE_PAM=y
35+USE_PAM=y
36-#HAVE_INET6=y
37+HAVE_INET6=y
38 
39 # Enable plugins
40--- ppp-2.4.3/pppdump/Makefile.linux    2004-10-31 01:36:52.000000000 +0100
41+++ ppp-2.4.3/pppdump/Makefile.linux    2004-11-22 14:31:17.128620741 +0000
42@@ -2,7 +2,7 @@
43 BINDIR = $(DESTDIR)/sbin
44 MANDIR = $(DESTDIR)/share/man/man8
45 
46-CFLAGS= -O -I../include/net
47+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
48 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
49 
50 INSTALL= install
51--- ppp-2.4.2/pppstats/Makefile.linux   2002-11-09 06:24:43.000000000 -0500
52+++ ppp-2.4.2/pppstats/Makefile.linux   2004-03-10 18:32:55.000000000 -0500
53@@ -7,7 +7,7 @@
54 PPPSTATOBJS = pppstats.o
55 
56 #CC = gcc
57-COPTS = -O
58+COPTS = $(RPM_OPT_FLAGS)
59 COMPILE_FLAGS = -I../include
60 LIBS =
61 
62--- ppp-2.4.3/pppd/plugins/Makefile.linux       2004-01-12 22:56:24.000000000 -0500
63+++ ppp-2.4.3/pppd/plugins/Makefile.linux       2004-03-10 18:41:20.000000000 -0500
64@@ -1,5 +1,5 @@
65 CC     = gcc
66-COPTS  = -O2 -g
67+COPTS  = $(RPM_OPT_FLAGS)
68 CFLAGS = $(COPTS) -I.. -I../../include -fPIC
69 LDFLAGS        = -shared
70 INSTALL        = install -o root
71--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux        2004-11-14 07:02:31.000000000 +0000
72+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux        2004-11-22 14:32:51.512336114 +0000
73@@ -12,7 +12,7 @@
74 INSTALL        = install
75 
76 PLUGIN=radius.so radattr.so radrealms.so
77-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
78+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
79 
80 # Uncomment the next line to include support for Microsoft's
81 # MS-CHAP authentication protocol.
82--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux      2004-03-10 18:46:52.000000000 -0500
83+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux      2004-03-10 18:46:58.000000000 -0500
84@@ -16,7 +16,7 @@
85 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
86 VERSION=3.3
87 
88-COPTS=-O2 -g
89+COPTS=$(RPM_OPT_FLAGS)
90 CFLAGS=$(COPTS) -I../../../include/linux
91 all: rp-pppoe.so
92 
Note: See TracBrowser for help on using the repository browser.