mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

130 lines
4.8 KiB

  1. diff -dur wpa_supplicant-0.4.9/defconfig wpa_supplicant-0.4.9-p/defconfig
  2. --- wpa_supplicant-0.4.9/defconfig 2006-04-29 05:25:43.000000000 +0200
  3. +++ wpa_supplicant-0.4.9-p/defconfig 2006-08-12 04:46:34.000000000 +0200
  4. @@ -12,8 +12,8 @@
  5. # Uncomment following two lines and fix the paths if you have installed openssl
  6. # in non-default location
  7. -#CFLAGS += -I/usr/local/openssl/include
  8. -#LIBS += -L/usr/local/openssl/lib
  9. +#CFLAGS += -I/usr/openssl/include
  10. +#LIBS += -L/usr/openssl/lib
  11. # Some Red Hat versions seem to include kerberos header files from OpenSSL, but
  12. # the kerberos files are not in the default include path. Following line can be
  13. @@ -78,13 +78,13 @@
  14. # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
  15. #CONFIG_DRIVER_BSD=y
  16. -#CFLAGS += -I/usr/local/include
  17. -#LIBS += -L/usr/local/lib
  18. +#CFLAGS += -I/usr/include
  19. +#LIBS += -L/usr/lib
  20. # Driver interface for Windows NDIS
  21. #CONFIG_DRIVER_NDIS=y
  22. #CFLAGS += -I/usr/include/w32api/ddk
  23. -#LIBS += -L/usr/local/lib
  24. +#LIBS += -L/usr/lib
  25. # For native build using mingw
  26. #CONFIG_NATIVE_WINDOWS=y
  27. # Additional directories for cross-compilation on Linux host for mingw target
  28. diff -dur wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.8 wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.8
  29. --- wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.8 2006-05-07 06:05:38.000000000 +0200
  30. +++ wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.8 2006-08-12 04:46:34.000000000 +0200
  31. @@ -500,8 +500,8 @@
  32. .RS
  33. .nf
  34. -if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  35. - /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE
  36. +if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  37. + /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE
  38. fi
  39. .fi
  40. @@ -514,7 +514,7 @@
  41. .RS
  42. .nf
  43. -if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  44. +if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  45. killall wpa_supplicant
  46. fi
  47. diff -dur wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.sgml wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.sgml
  48. --- wpa_supplicant-0.4.9/doc/docbook/wpa_supplicant.sgml 2005-08-27 07:02:15.000000000 +0200
  49. +++ wpa_supplicant-0.4.9-p/doc/docbook/wpa_supplicant.sgml 2006-08-12 04:46:34.000000000 +0200
  50. @@ -703,8 +703,8 @@
  51. in <filename>/etc/pcmcia/wireless</filename>:</para>
  52. <blockquote><programlisting>
  53. -if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  54. - /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE
  55. +if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  56. + /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE
  57. fi
  58. </programlisting></blockquote>
  59. @@ -714,7 +714,7 @@
  60. <filename>/etc/pcmcia/wireless</filename>:</para>
  61. <blockquote><programlisting>
  62. -if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  63. +if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  64. killall wpa_supplicant
  65. fi
  66. </programlisting></blockquote>
  67. diff -dur wpa_supplicant-0.4.9/Makefile wpa_supplicant-0.4.9-p/Makefile
  68. --- wpa_supplicant-0.4.9/Makefile 2006-05-07 06:05:36.000000000 +0200
  69. +++ wpa_supplicant-0.4.9-p/Makefile 2006-08-12 04:46:34.000000000 +0200
  70. @@ -32,8 +32,8 @@
  71. echo CONFIG_WIRELESS_EXTENSION=y >> .config
  72. install: all
  73. - mkdir -p $(DESTDIR)/usr/local/sbin/
  74. - for i in $(ALL); do cp $$i $(DESTDIR)/usr/local/sbin/$$i; done
  75. + mkdir -p $(DESTDIR)/usr/sbin/
  76. + for i in $(ALL); do cp $$i $(DESTDIR)/usr/sbin/$$i; done
  77. OBJS = config.o \
  78. eloop.o common.o md5.o \
  79. diff -dur wpa_supplicant-0.4.9/README wpa_supplicant-0.4.9-p/README
  80. --- wpa_supplicant-0.4.9/README 2006-01-30 05:39:54.000000000 +0100
  81. +++ wpa_supplicant-0.4.9-p/README 2006-08-12 04:46:34.000000000 +0200
  82. @@ -412,14 +412,14 @@
  83. After you have created a configuration file, you can build
  84. wpa_supplicant and wpa_cli with 'make' command. You may then install
  85. -the binaries to a suitable system directory, e.g., /usr/local/bin.
  86. +the binaries to a suitable system directory, e.g., /usr/bin.
  87. Example commands:
  88. # build wpa_supplicant and wpa_cli
  89. make
  90. # install binaries (this may need root privileges)
  91. -cp wpa_cli wpa_supplicant /usr/local/bin
  92. +cp wpa_cli wpa_supplicant /usr/bin
  93. You will need to make a configuration file, e.g.,
  94. @@ -863,15 +863,15 @@
  95. Add the following block to the end of 'start' action handler in
  96. /etc/pcmcia/wireless:
  97. - if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  98. - /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf \
  99. + if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  100. + /usr/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf \
  101. -i$DEVICE
  102. fi
  103. Add the following block to the end of 'stop' action handler (may need
  104. to be separated from other actions) in /etc/pcmcia/wireless:
  105. - if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
  106. + if [ "$WPA" = "y" -a -x /usr/bin/wpa_supplicant ]; then
  107. killall wpa_supplicant
  108. fi