mirror of
https://abf.rosa.ru/djam/ppp.git
synced 2025-02-23 14:12:59 +00:00
117 lines
4.2 KiB
Diff
117 lines
4.2 KiB
Diff
|
diff -Naur ppp-2.4.5/chat/Makefile.linux ppp-2.4.5.tpg/chat/Makefile.linux
|
||
|
|
--- ppp-2.4.5/chat/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/chat/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
CDEF4= -DFNDELAY=O_NDELAY # Old name value
|
||
|
|
CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
|
||
|
|
|
||
|
|
-COPTS= -O2 -g -pipe
|
||
|
|
+COPTS= $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS= $(COPTS) $(CDEFS)
|
||
|
|
|
||
|
|
INSTALL= install
|
||
|
|
diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5.tpg/pppd/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -30,10 +30,10 @@
|
||
|
|
include .depend
|
||
|
|
endif
|
||
|
|
|
||
|
|
-# CC = gcc
|
||
|
|
+CC = gcc
|
||
|
|
#
|
||
|
|
-COPTS = -O2 -pipe -Wall -g
|
||
|
|
-LIBS =
|
||
|
|
+COPTS = -Wall $(RPM_OPT_FLAGS)
|
||
|
|
+LIBS = -lutil
|
||
|
|
|
||
|
|
# Uncomment the next 2 lines to include support for Microsoft's
|
||
|
|
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
|
||
|
|
@@ -61,7 +61,7 @@
|
||
|
|
USE_TDB=y
|
||
|
|
|
||
|
|
HAS_SHADOW=y
|
||
|
|
-#USE_PAM=y
|
||
|
|
+USE_PAM=y
|
||
|
|
#HAVE_INET6=y
|
||
|
|
|
||
|
|
# Enable plugins
|
||
|
|
diff -Naur ppp-2.4.5/pppd/plugins/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/plugins/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
#CC = gcc
|
||
|
|
-COPTS = -O2 -g
|
||
|
|
+COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
||
|
|
LDFLAGS = -shared
|
||
|
|
INSTALL = install
|
||
|
|
diff -Naur ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/pppoatm/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/plugins/pppoatm/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
#CC = gcc
|
||
|
|
-COPTS = -O2 -g
|
||
|
|
+COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
|
||
|
|
LDFLAGS = -shared
|
||
|
|
INSTALL = install
|
||
|
|
diff -Naur ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/pppol2tp/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/plugins/pppol2tp/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -1,5 +1,5 @@
|
||
|
|
#CC = gcc
|
||
|
|
-COPTS = -O2 -g
|
||
|
|
+COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
|
||
|
|
LDFLAGS = -shared
|
||
|
|
INSTALL = install
|
||
|
|
diff -Naur ppp-2.4.5/pppd/plugins/radius/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/radius/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/plugins/radius/Makefile.linux 2009-12-31 21:19:47.000000000 +0000
|
||
|
|
@@ -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 $(RPM_OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
|
||
|
|
|
||
|
|
# Uncomment the next line to include support for Microsoft's
|
||
|
|
# MS-CHAP authentication protocol.
|
||
|
|
diff -Naur ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/rp-pppoe/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppd/plugins/rp-pppoe/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -25,7 +25,7 @@
|
||
|
|
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
|
||
|
|
RP_VERSION=3.8p
|
||
|
|
|
||
|
|
-COPTS=-O2 -g
|
||
|
|
+COPTS=$(RPM_OPT_FLAGS)
|
||
|
|
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
|
||
|
|
all: rp-pppoe.so pppoe-discovery
|
||
|
|
|
||
|
|
diff -Naur ppp-2.4.5/pppdump/Makefile.linux ppp-2.4.5.tpg/pppdump/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppdump/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppdump/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -2,7 +2,7 @@
|
||
|
|
BINDIR = $(DESTDIR)/sbin
|
||
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
||
|
|
|
||
|
|
-CFLAGS= -O -I../include/net
|
||
|
|
+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
|
||
|
|
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
|
||
|
|
|
||
|
|
INSTALL= install
|
||
|
|
diff -Naur ppp-2.4.5/pppstats/Makefile.linux ppp-2.4.5.tpg/pppstats/Makefile.linux
|
||
|
|
--- ppp-2.4.5/pppstats/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
|
||
|
|
+++ ppp-2.4.5.tpg/pppstats/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
PPPSTATOBJS = pppstats.o
|
||
|
|
|
||
|
|
#CC = gcc
|
||
|
|
-COPTS = -O
|
||
|
|
+COPTS = $(RPM_OPT_FLAGS)
|
||
|
|
COMPILE_FLAGS = -I../include
|
||
|
|
LIBS =
|
||
|
|
|