PageRenderTime 46ms CodeModel.GetById 18ms RepoModel.GetById 0ms app.codeStats 0ms

/ppp/100-generic.patch

http://wl500g.googlecode.com/
Patch | 207 lines | 176 code | 31 blank | 0 comment | 0 complexity | 64c68e9e144e3f25914ffee18204bfc1 MD5 | raw file
Possible License(s): GPL-2.0 
    

  1. diff -urB ppp.orig/chat/Makefile.linux ppp/chat/Makefile.linux
    2. 

  2. --- ppp.orig/chat/Makefile.linux	2008-11-26 13:02:29.000000000 +0300
    3. 

  3. +++ ppp/chat/Makefile.linux	2009-02-09 18:08:34.000000000 +0300
    4. 

  4. @@ -11,7 +11,7 @@
    5. 

  5.  CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
    6. 

  6.  
    7. 

  7.  COPTS=	-O2 -g -pipe
    8. 

  8. -CFLAGS=	$(COPTS) $(CDEFS)
    9. 

  9. +CFLAGS=	$(COPTS) $(CDEFS) $(EXTRACFLAGS)
    10. 

  10.  
    11. 

  11.  INSTALL= install
    12. 

  12.  
    13. 

  13. diff -urB ppp.orig/pppd/Makefile.linux ppp/pppd/Makefile.linux
    14. 

  14. --- ppp.orig/pppd/Makefile.linux	2008-11-26 13:02:29.000000000 +0300
    15. 

  15. +++ ppp/pppd/Makefile.linux	2009-02-09 18:10:19.000000000 +0300
    16. 

  16. @@ -48,19 +48,19 @@
    17. 

  17.  # Uncomment the next line to include support for PPP packet filtering.
    18. 

  18.  # This requires that the libpcap library and headers be installed
    19. 

  19.  # and that the kernel driver support PPP packet filtering.
    20. 

  20. -FILTER=y
    21. 

  21. +#FILTER=y
    22. 

  22.  
    23. 

  23.  # Uncomment the next line to enable multilink PPP (enabled by default)
    24. 

  24.  # Linux distributions: Please leave multilink ENABLED in your builds
    25. 

  25.  # of pppd!
    26. 

  26. -HAVE_MULTILINK=y
    27. 

  27. +#HAVE_MULTILINK=y
    28. 

  28.  
    29. 

  29.  # Uncomment the next line to enable the TDB database (enabled by default.)
    30. 

  30.  # If you enable multilink, then TDB is automatically enabled also.
    31. 

  31.  # Linux distributions: Please leave TDB ENABLED in your builds.
    32. 

  32. -USE_TDB=y
    33. 

  33. +#USE_TDB=y
    34. 

  34.  
    35. 

  35. -HAS_SHADOW=y
    36. 

  36. +#HAS_SHADOW=y
    37. 

  37.  #USE_PAM=y
    38. 

  38.  #HAVE_INET6=y
    39. 

  39.  
    40. 

  40. @@ -73,13 +73,14 @@
    41. 

  41.  # Enable EAP SRP-SHA1 authentication (requires libsrp)
    42. 

  42.  #USE_SRP=y
    43. 

  43.  
    44. 

  44. -MAXOCTETS=y
    45. 

  45. +#MAXOCTETS=y
    46. 

  46.  
    47. 

  47.  INCLUDE_DIRS= -I../include
    48. 

  48.  
    49. 

  49. -COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
    50. 

  50. +COMPILE_FLAGS= #-DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP
    51. 

  51.  
    52. 

  52. -CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
    53. 

  53. +CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(EXTRACFLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
    54. 

  54. +LDFLAGS += $(EXTRA_LDFLAGS)
    55. 

  55.  
    56. 

  56.  ifdef CHAPMS
    57. 

  57.  CFLAGS   += -DCHAPMS=1
    58. 

  58. @@ -117,10 +117,10 @@
    59. 

  59.  #LIBS     += -lshadow $(LIBS)
    60. 

  60.  endif
    61. 

  61.  
    62. 

  62. -ifneq ($(wildcard /usr/include/crypt.h),)
    63. 

  63. +#ifneq ($(wildcard /usr/include/crypt.h),)
    64. 

  64.  CFLAGS  += -DHAVE_CRYPT_H=1
    65. 

  65.  LIBS	+= -lcrypt
    66. 

  66. -endif
    67. 

  67. +#endif
    68. 

  68.  
    69. 

  69.  ifdef NEEDDES
    70. 

  70.  ifndef USE_CRYPT
    71. 

  71. diff -urB ppp.orig/pppd/pathnames.h ppp/pppd/pathnames.h
    72. 

  72. --- ppp.orig/pppd/pathnames.h	2008-11-26 13:02:29.000000000 +0300
    73. 

  73. +++ ppp/pppd/pathnames.h	2009-02-09 18:08:09.000000000 +0300
    74. 

  74. @@ -9,40 +9,40 @@
    75. 

  75.  
    76. 

  76.  #else /* HAVE_PATHS_H */
    77. 

  77.  #ifndef _PATH_VARRUN
    78. 

  78. -#define _PATH_VARRUN 	"/etc/ppp/"
    79. 

  79. +#define _PATH_VARRUN 	"/var/run/"
    80. 

  80.  #endif
    81. 

  81.  #define _PATH_DEVNULL	"/dev/null"
    82. 

  82.  #endif /* HAVE_PATHS_H */
    83. 

  83.  
    84. 

  84.  #ifndef _ROOT_PATH
    85. 

  85. -#define _ROOT_PATH
    86. 

  86. +#define _ROOT_PATH	"/tmp"
    87. 

  87.  #endif
    88. 

  88.  
    89. 

  89. -#define _PATH_UPAPFILE 	 _ROOT_PATH "/etc/ppp/pap-secrets"
    90. 

  90. -#define _PATH_CHAPFILE 	 _ROOT_PATH "/etc/ppp/chap-secrets"
    91. 

  91. -#define _PATH_SRPFILE 	 _ROOT_PATH "/etc/ppp/srp-secrets"
    92. 

  92. -#define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
    93. 

  93. -#define _PATH_IPUP	 _ROOT_PATH "/etc/ppp/ip-up"
    94. 

  94. -#define _PATH_IPDOWN	 _ROOT_PATH "/etc/ppp/ip-down"
    95. 

  95. -#define _PATH_IPPREUP	 _ROOT_PATH "/etc/ppp/ip-pre-up"
    96. 

  96. -#define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
    97. 

  97. -#define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
    98. 

  98. -#define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
    99. 

  99. -#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
    100. 

  100. -#define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
    101. 

  101. -#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
    102. 

  102. +#define _PATH_UPAPFILE 	 _ROOT_PATH "/ppp/pap-secrets"
    103. 

  103. +#define _PATH_CHAPFILE 	 _ROOT_PATH "/ppp/chap-secrets"
    104. 

  104. +#define _PATH_SRPFILE 	 _ROOT_PATH "/ppp/srp-secrets"
    105. 

  105. +#define _PATH_SYSOPTIONS _ROOT_PATH "/ppp/options"
    106. 

  106. +#define _PATH_IPUP	 _ROOT_PATH "/ppp/ip-up"
    107. 

  107. +#define _PATH_IPDOWN	 _ROOT_PATH "/ppp/ip-down"
    108. 

  108. +#define _PATH_IPPREUP	 _ROOT_PATH "/ppp/ip-pre-up"
    109. 

  109. +#define _PATH_AUTHUP	 _ROOT_PATH "/ppp/auth-up"
    110. 

  110. +#define _PATH_AUTHDOWN	 _ROOT_PATH "/ppp/auth-down"
    111. 

  111. +#define _PATH_TTYOPT	 _ROOT_PATH "/ppp/options."
    112. 

  112. +#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp-connect-errors"
    113. 

  113. +#define _PATH_PEERFILES	 _ROOT_PATH "/ppp/peers/"
    114. 

  114. +#define _PATH_RESOLV	 _ROOT_PATH "/ppp/resolv.conf"
    115. 

  115.  
    116. 

  116.  #define _PATH_USEROPT	 ".ppprc"
    117. 

  117.  #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
    118. 

  118.  
    119. 

  119.  #ifdef INET6
    120. 

  120. -#define _PATH_IPV6UP     _ROOT_PATH "/etc/ppp/ipv6-up"
    121. 

  121. -#define _PATH_IPV6DOWN   _ROOT_PATH "/etc/ppp/ipv6-down"
    122. 

  122. +#define _PATH_IPV6UP     _ROOT_PATH "/ppp/ipv6-up"
    123. 

  123. +#define _PATH_IPV6DOWN   _ROOT_PATH "/ppp/ipv6-down"
    124. 

  124.  #endif
    125. 

  125.  
    126. 

  126.  #ifdef IPX_CHANGE
    127. 

  127. -#define _PATH_IPXUP	 _ROOT_PATH "/etc/ppp/ipx-up"
    128. 

  128. -#define _PATH_IPXDOWN	 _ROOT_PATH "/etc/ppp/ipx-down"
    129. 

  129. +#define _PATH_IPXUP	 _ROOT_PATH "/ppp/ipx-up"
    130. 

  130. +#define _PATH_IPXDOWN	 _ROOT_PATH "/ppp/ipx-down"
    131. 

  131.  #endif /* IPX_CHANGE */
    132. 

  132.  
    133. 

  133.  #ifdef __STDC__
    134. 

  134. @@ -51,13 +51,13 @@
    135. 

  135.  #ifdef HAVE_PATHS_H
    136. 

  136.  #define _PATH_PPPDB	"/var/run/pppd2.tdb"
    137. 

  137.  #else
    138. 

  138. -#define _PATH_PPPDB	"/etc/ppp/pppd2.tdb"
    139. 

  139. +#define _PATH_PPPDB	"/var/run/pppd2.tdb"
    140. 

  140.  #endif
    141. 

  141.  #endif /* __STDC__ */
    142. 

  142.  
    143. 

  143.  #ifdef PLUGIN
    144. 

  144.  #ifdef __STDC__
    145. 

  145. -#define _PATH_PLUGIN	DESTDIR "/lib/pppd/" VERSION
    146. 

  146. +#define _PATH_PLUGIN	"/usr/lib/pppd/"
    147. 

  147.  #else /* __STDC__ */
    148. 

  148.  #define _PATH_PLUGIN	"/usr/lib/pppd"
    149. 

  149.  #endif /* __STDC__ */
    150. 

  150. diff -urB ppp.orig/pppd/plugins/Makefile.linux ppp/pppd/plugins/Makefile.linux
    151. 

  151. --- ppp.orig/pppd/plugins/Makefile.linux	2008-11-26 13:02:29.000000000 +0300
    152. 

  152. +++ ppp/pppd/plugins/Makefile.linux	2009-02-09 18:10:50.000000000 +0300
    153. 

  153. @@ -1,6 +1,6 @@
    154. 

  154.  #CC	= gcc
    155. 

  155.  COPTS	= -O2 -g
    156. 

  156. -CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
    157. 

  157. +CFLAGS	= $(COPTS) -I.. -I../../include -fPIC $(EXTRACFLAGS)
    158. 

  158.  LDFLAGS	= -shared
    159. 

  159.  INSTALL	= install
    160. 

  160.  
    161. 

  161. diff -uBp a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
    162. 

  162. --- a/pppd/plugins/pppol2tp/Makefile.linux	2009-10-08 10:00:57.000000000 +0400
    163. 

  163. +++ b/pppd/plugins/pppol2tp/Makefile.linux	2010-11-22 21:56:19.000000000 +0300
    164. 

  164. @@ -1,6 +1,6 @@
    165. 

  165.  #CC	= gcc
    166. 

  166.  COPTS	= -O2 -g
    167. 

  167. -CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
    168. 

  168. +CFLAGS	= $(COPTS) -I. -I../.. -I$(LINUXDIR)/include -fPIC $(EXTRACFLAGS)
    169. 

  169.  LDFLAGS	= -shared
    170. 

  170.  INSTALL	= install
    171. 

  171.  
    172. 

  172. diff -uBp a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
    173. 

  173. --- a/pppd/plugins/radius/Makefile.linux	2009-11-17 01:26:07.000000000 +0300
    174. 

  174. +++ b/pppd/plugins/radius/Makefile.linux	2010-11-22 21:54:24.000000000 +0300
    175. 

  175. @@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/
    176. 

  176.  INSTALL	= install
    177. 

  177.  
    178. 

  178.  PLUGIN=radius.so radattr.so radrealms.so
    179. 

  179. -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
    180. 

  180. +CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON $(EXTRACFLAGS)
    181. 

  181.  
    182. 

  182.  # Uncomment the next line to include support for Microsoft's
    183. 

  183.  # MS-CHAP authentication protocol.
    184. 

  184. diff -urBp a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
    185. 

  185. --- a/pppd/plugins/rp-pppoe/Makefile.linux	2009-02-09 17:22:47.000000000 +0300
    186. 

  186. +++ b/pppd/plugins/rp-pppoe/Makefile.linux	2010-11-22 21:53:54.000000000 +0300
    187. 

  187. @@ -26,7 +26,7 @@ INSTALL	= install
    188. 

  188.  RP_VERSION=3.10p
    189. 

  189.  
    190. 

  190.  COPTS=-O2 -g
    191. 

  191. -CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
    192. 

  192. +CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' $(EXTRACFLAGS)
    193. 

  193.  all: rp-pppoe.so pppoe-discovery
    194. 

  194.  
    195. 

  195.  pppoe-discovery: pppoe-discovery.o debug.o
    196. 

  196. diff -urB ppp.orig/pppd/plugins/rp-pppoe/plugin.c ppp/pppd/plugins/rp-pppoe/plugin.c
    197. 

  197. --- ppp.orig/pppd/plugins/rp-pppoe/plugin.c	2009-02-09 17:16:52.000000000 +0300
    198. 

  198. +++ ppp/pppd/plugins/rp-pppoe/plugin.c	2009-02-09 18:04:49.000000000 +0300
    199. 

  199. @@ -55,7 +55,7 @@
    200. 

  200.  #define _ROOT_PATH ""
    201. 

  201.  #endif
    202. 

  202.  
    203. 

  203. -#define _PATH_ETHOPT         _ROOT_PATH "/etc/ppp/options."
    204. 

  204. +#define _PATH_ETHOPT         _ROOT_PATH "/ppp/options."
    205. 

  205.  
    206. 

  206.  char pppd_version[] = VERSION;
    207. 

  207.  
    208. 

  208.