patch-pppd_Makefile_linux 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. --- ppp-2.4.4.orig/pppd/Makefile.linux 2006-06-04 07:07:46.000000000 +0200
  2. +++ ppp-2.4.4/pppd/Makefile.linux 2009-06-05 19:12:00.000000000 +0200
  3. @@ -48,7 +48,7 @@ MPPE=y
  4. # Uncomment the next line to include support for PPP packet filtering.
  5. # This requires that the libpcap library and headers be installed
  6. # and that the kernel driver support PPP packet filtering.
  7. -FILTER=y
  8. +#FILTER=y
  9. # Uncomment the next line to enable multilink PPP (enabled by default)
  10. # Linux distributions: Please leave multilink ENABLED in your builds
  11. @@ -58,9 +58,9 @@ HAVE_MULTILINK=y
  12. # Uncomment the next line to enable the TDB database (enabled by default.)
  13. # If you enable multilink, then TDB is automatically enabled also.
  14. # Linux distributions: Please leave TDB ENABLED in your builds.
  15. -USE_TDB=y
  16. +#USE_TDB=y
  17. -HAS_SHADOW=y
  18. +#HAS_SHADOW=y
  19. #USE_PAM=y
  20. #HAVE_INET6=y
  21. @@ -77,7 +77,7 @@ MAXOCTETS=y
  22. INCLUDE_DIRS= -I../include
  23. -COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
  24. +COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP
  25. CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
  26. @@ -99,7 +99,7 @@ ifdef USE_SRP
  27. CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  28. LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
  29. TARGETS += srp-entry
  30. -EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
  31. +EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
  32. MANPAGES += srp-entry.8
  33. EXTRACLEAN += srp-entry.o
  34. NEEDDES=y
  35. @@ -117,10 +117,8 @@ CFLAGS += -DHAS_SHADOW
  36. #LIBS += -lshadow $(LIBS)
  37. endif
  38. -ifneq ($(wildcard /usr/include/crypt.h),)
  39. CFLAGS += -DHAVE_CRYPT_H=1
  40. LIBS += -lcrypt
  41. -endif
  42. ifdef NEEDDES
  43. ifndef USE_CRYPT
  44. @@ -200,7 +198,7 @@ all: $(TARGETS)
  45. install: pppd
  46. mkdir -p $(BINDIR) $(MANDIR)
  47. $(EXTRAINSTALL)
  48. - $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
  49. + $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
  50. if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  51. chmod o-rx,u+s $(BINDIR)/pppd; fi
  52. $(INSTALL) -c -m 444 pppd.8 $(MANDIR)