diff -ur ppp-2.4.4/chat/Makefile.linux ppp-2.4.4.make.patch/chat/Makefile.linux --- ppp-2.4.4/chat/Makefile.linux 2006-06-04 09:07:46 +0400 +++ ppp-2.4.4.make.patch/chat/Makefile.linux 2007-03-13 22:49:57 +0300 @@ -25,8 +25,8 @@ install: chat mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) + $(INSTALL) -m 755 chat $(BINDIR) + $(INSTALL) -m 644 chat.8 $(MANDIR) clean: rm -f chat.o chat *~ diff -ur ppp-2.4.4/pppd/Makefile.linux ppp-2.4.4.make.patch/pppd/Makefile.linux --- ppp-2.4.4/pppd/Makefile.linux 2006-06-04 09:07:46 +0400 +++ ppp-2.4.4.make.patch/pppd/Makefile.linux 2007-03-13 22:35:39 +0300 @@ -33,7 +33,7 @@ # CC = gcc # COPTS = -O2 -pipe -Wall -g -LIBS = +LIBS = -lutil # Uncomment the next 2 lines to include support for Microsoft's # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. @@ -135,7 +135,7 @@ # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/. ifdef USE_PAM CFLAGS += -DUSE_PAM -LIBS += -lpam -ldl +LIBS += -lpam endif # Multi-linnk @@ -200,10 +200,8 @@ 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 444 pppd.8 $(MANDIR) + $(INSTALL) -m 755 pppd $(BINDIR)/pppd + $(INSTALL) -m 644 pppd.8 $(MANDIR) pppd: $(PPPDOBJS) $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) @@ -213,7 +211,7 @@ install-devel: mkdir -p $(INCDIR)/pppd - $(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd + $(INSTALL) -m 644 $(HEADERS) $(INCDIR)/pppd clean: rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core diff -ur ppp-2.4.4/pppd/plugins/Makefile.linux ppp-2.4.4.make.patch/pppd/plugins/Makefile.linux --- ppp-2.4.4/pppd/plugins/Makefile.linux 2006-06-04 09:04:14 +0400 +++ ppp-2.4.4.make.patch/pppd/plugins/Makefile.linux 2007-03-13 22:40:22 +0300 @@ -28,7 +28,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h) install: $(PLUGINS) - $(INSTALL) -d $(LIBDIR) + mkdir -p $(LIBDIR) $(INSTALL) $? $(LIBDIR) for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done diff -ur ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4.make.patch/pppd/plugins/pppoatm/Makefile.linux --- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 04:12:10 +0300 +++ ppp-2.4.4.make.patch/pppd/plugins/pppoatm/Makefile.linux 2007-03-13 22:41:45 +0300 @@ -36,8 +36,8 @@ $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) install: all - $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR) + mkdir -p $(LIBDIR) + $(INSTALL) -m 755 $(PLUGIN) $(LIBDIR) clean: rm -f *.o *.so diff -ur ppp-2.4.4/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make.patch/pppd/plugins/radius/Makefile.linux --- ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2006-06-04 09:04:14 +0400 +++ ppp-2.4.4.make.patch/pppd/plugins/radius/Makefile.linux 2007-03-13 22:45:59 +0300 @@ -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= $(COPTS) -I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. @@ -35,12 +35,12 @@ all: $(PLUGIN) 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 444 pppd-radius.8 $(MANDIR) - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) + mkdir -p $(LIBDIR) + $(INSTALL) -m 755 radius.so $(LIBDIR) + $(INSTALL) -m 755 radattr.so $(LIBDIR) + $(INSTALL) -m 755 radrealms.so $(LIBDIR) + $(INSTALL) -m 644 pppd-radius.8 $(MANDIR) + $(INSTALL) -m 644 pppd-radattr.8 $(MANDIR) radius.so: radius.o libradiusclient.a $(CC) -o radius.so -shared radius.o libradiusclient.a diff -ur ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make.patch/pppd/plugins/rp-pppoe/Makefile.linux --- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2006-06-04 09:07:46 +0400 +++ ppp-2.4.4.make.patch/pppd/plugins/rp-pppoe/Makefile.linux 2007-03-13 22:48:42 +0300 @@ -38,10 +38,10 @@ $(CC) -o rp-pppoe.so -shared plugin.o libplugin.a install: all - $(INSTALL) -d -m 755 $(LIBDIR) - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) - $(INSTALL) -d -m 755 $(BINDIR) - $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) + mkdir -p $(LIBDIR) + $(INSTALL) -m 755 rp-pppoe.so $(LIBDIR) + mkdir -p $(BINDIR) + $(INSTALL) -m 755 pppoe-discovery $(BINDIR) clean: rm -f *.o *.so diff -ur ppp-2.4.4/pppdump/Makefile.linux ppp-2.4.4.make.patch/pppdump/Makefile.linux --- ppp-2.4.4/pppdump/Makefile.linux 2006-06-04 09:04:14 +0400 +++ ppp-2.4.4.make.patch/pppdump/Makefile.linux 2007-03-13 22:53:37 +0300 @@ -17,5 +17,5 @@ install: mkdir -p $(BINDIR) $(MANDIR) - $(INSTALL) -s -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) + $(INSTALL) -m 755 pppdump $(BINDIR) + $(INSTALL) -m 644 pppdump.8 $(MANDIR) diff -ur ppp-2.4.4/pppstats/Makefile.linux ppp-2.4.4.make.patch/pppstats/Makefile.linux --- ppp-2.4.4/pppstats/Makefile.linux 2006-06-04 09:07:46 +0400 +++ ppp-2.4.4.make.patch/pppstats/Makefile.linux 2007-03-13 22:54:13 +0300 @@ -21,9 +21,9 @@ all: pppstats install: pppstats - -mkdir -p $(MANDIR) - $(INSTALL) -s -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + mkdir -p $(MANDIR) + $(INSTALL) -m 755 pppstats $(BINDIR) + $(INSTALL) -m 644 pppstats.8 $(MANDIR) pppstats: $(PPPSTATSRCS) $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)