336 lines
11 KiB
Diff
336 lines
11 KiB
Diff
diff -u -r ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.8 ./wpa_supplicant/doc/docbook/wpa_supplicant.8
|
|
--- ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.8 2020-03-10 21:49:08.458858646 +0100
|
|
+++ ./wpa_supplicant/doc/docbook/wpa_supplicant.8 2020-03-10 21:52:22.866338065 +0100
|
|
@@ -348,7 +348,7 @@
|
|
.RS
|
|
|
|
.nf
|
|
-wpa_supplicant -B -c/etc/wpa_supplicant.conf -iwlan0
|
|
+wpa_supplicant -B -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0
|
|
.fi
|
|
.RE
|
|
.PP
|
|
@@ -361,7 +361,7 @@
|
|
.RS
|
|
|
|
.nf
|
|
-wpa_supplicant -c/etc/wpa_supplicant.conf -iwlan0 -d
|
|
+wpa_supplicant -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0 -d
|
|
.fi
|
|
.RE
|
|
.PP
|
|
@@ -373,7 +373,7 @@
|
|
.RS
|
|
|
|
.nf
|
|
-wpa_supplicant -Dnl80211,wext -c/etc/wpa_supplicant.conf -iwlan0
|
|
+wpa_supplicant -Dnl80211,wext -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0
|
|
.fi
|
|
.RE
|
|
.PP
|
|
@@ -465,7 +465,7 @@
|
|
.SH "QUICK START"
|
|
.PP
|
|
First, make a configuration file, e.g.
|
|
-\fI/etc/wpa_supplicant.conf\fR, that describes the networks
|
|
+\fI@TERMUX_PREFIX@/etc/wpa_supplicant.conf\fR, that describes the networks
|
|
you are interested in. See \fBwpa_supplicant.conf\fR(5)
|
|
for details.
|
|
.PP
|
|
@@ -477,7 +477,7 @@
|
|
.RS
|
|
|
|
.nf
|
|
-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -d
|
|
+wpa_supplicant -iwlan0 -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -d
|
|
|
|
.fi
|
|
.RE
|
|
@@ -489,7 +489,7 @@
|
|
.RS
|
|
|
|
.nf
|
|
-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -B
|
|
+wpa_supplicant -iwlan0 -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -B
|
|
|
|
.fi
|
|
.RE
|
|
@@ -504,16 +504,16 @@
|
|
can be used to enable WPA support:
|
|
.PP
|
|
Add MODE="Managed" and WPA="y" to the network scheme in
|
|
-\fI/etc/pcmcia/wireless.opts\fR\&.
|
|
+\fI@TERMUX_PREFIX@/etc/pcmcia/wireless.opts\fR\&.
|
|
.PP
|
|
Add the following block to the end of \fBstart\fR
|
|
-action handler in \fI/etc/pcmcia/wireless\fR:
|
|
+action handler in \fI@TERMUX_PREFIX@/etc/pcmcia/wireless\fR:
|
|
.sp
|
|
.RS
|
|
|
|
.nf
|
|
-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
|
|
- /usr/local/bin/wpa_supplicant -B -c/etc/wpa_supplicant.conf -i$DEVICE
|
|
+if [ "$WPA" = "y" -a -x @TERMUX_PREFIX@/bin/wpa_supplicant ]; then
|
|
+ @TERMUX_PREFIX@/bin/wpa_supplicant -B -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -i$DEVICE
|
|
fi
|
|
|
|
.fi
|
|
@@ -521,12 +521,12 @@
|
|
.PP
|
|
Add the following block to the end of \fBstop\fR
|
|
action handler (may need to be separated from other actions) in
|
|
-\fI/etc/pcmcia/wireless\fR:
|
|
+\fI@TERMUX_PREFIX@/etc/pcmcia/wireless\fR:
|
|
.sp
|
|
.RS
|
|
|
|
.nf
|
|
-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
|
|
+if [ "$WPA" = "y" -a -x @TERMUX_PREFIX@/bin/wpa_supplicant ]; then
|
|
killall wpa_supplicant
|
|
fi
|
|
|
|
diff -u -r ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.conf.5 ./wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
|
|
--- ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.conf.5 2020-03-10 21:49:08.458858646 +0100
|
|
+++ ./wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 2020-03-10 21:52:22.882996517 +0100
|
|
@@ -12,7 +12,7 @@
|
|
\fBwpa_supplicant\fR is configured using a text
|
|
file that lists all accepted networks and security policies,
|
|
including pre-shared keys. See the example configuration file,
|
|
-probably in \fB/usr/share/doc/wpa_supplicant/\fR, for
|
|
+probably in \fB@TERMUX_PREFIX@/share/doc/wpa_supplicant/\fR, for
|
|
detailed information about the configuration format and supported
|
|
fields.
|
|
.PP
|
|
@@ -60,9 +60,9 @@
|
|
group=CCMP TKIP
|
|
eap=TLS
|
|
identity="user@example.com"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
}
|
|
.fi
|
|
@@ -84,7 +84,7 @@
|
|
eap=PEAP
|
|
identity="user@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
phase1="peaplabel=0"
|
|
phase2="auth=MSCHAPV2"
|
|
}
|
|
@@ -108,7 +108,7 @@
|
|
identity="user@example.com"
|
|
anonymous_identity="anonymous@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
phase2="auth=MD5"
|
|
}
|
|
.fi
|
|
@@ -129,9 +129,9 @@
|
|
key_mgmt=IEEE8021X
|
|
eap=TLS
|
|
identity="user@example.com"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
eapol_flags=3
|
|
}
|
|
@@ -159,14 +159,14 @@
|
|
eap=TTLS PEAP TLS
|
|
identity="user@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
phase1="peaplabel=0"
|
|
- ca_cert2="/etc/cert/ca2.pem"
|
|
- client_cert2="/etc/cer/user.pem"
|
|
- private_key2="/etc/cer/user.prv"
|
|
+ ca_cert2="@TERMUX_PREFIX@/etc/cert/ca2.pem"
|
|
+ client_cert2="@TERMUX_PREFIX@/etc/cer/user.pem"
|
|
+ private_key2="@TERMUX_PREFIX@/etc/cer/user.prv"
|
|
private_key2_passwd="password"
|
|
}
|
|
.fi
|
|
diff -u -r ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.conf.sgml ./wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml
|
|
--- ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.conf.sgml 2020-03-10 21:49:08.458858646 +0100
|
|
+++ ./wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml 2020-03-10 21:52:22.876333136 +0100
|
|
@@ -14,7 +14,7 @@
|
|
<para><command>wpa_supplicant</command> is configured using a text
|
|
file that lists all accepted networks and security policies,
|
|
including pre-shared keys. See the example configuration file,
|
|
- probably in <command>/usr/share/doc/wpa_supplicant/</command>, for
|
|
+ probably in <command>@TERMUX_PREFIX@/share/doc/wpa_supplicant/</command>, for
|
|
detailed information about the configuration format and supported
|
|
fields.</para>
|
|
|
|
@@ -65,9 +65,9 @@
|
|
group=CCMP TKIP
|
|
eap=TLS
|
|
identity="user@example.com"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
}
|
|
</programlisting></blockquote>
|
|
@@ -87,7 +87,7 @@
|
|
eap=PEAP
|
|
identity="user@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
phase1="peaplabel=0"
|
|
phase2="auth=MSCHAPV2"
|
|
}
|
|
@@ -110,7 +110,7 @@
|
|
identity="user@example.com"
|
|
anonymous_identity="anonymous@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
phase2="auth=MD5"
|
|
}
|
|
</programlisting></blockquote>
|
|
@@ -130,9 +130,9 @@
|
|
key_mgmt=IEEE8021X
|
|
eap=TLS
|
|
identity="user@example.com"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
eapol_flags=3
|
|
}
|
|
@@ -159,14 +159,14 @@
|
|
eap=TTLS PEAP TLS
|
|
identity="user@example.com"
|
|
password="foobar"
|
|
- ca_cert="/etc/cert/ca.pem"
|
|
- client_cert="/etc/cert/user.pem"
|
|
- private_key="/etc/cert/user.prv"
|
|
+ ca_cert="@TERMUX_PREFIX@/etc/cert/ca.pem"
|
|
+ client_cert="@TERMUX_PREFIX@/etc/cert/user.pem"
|
|
+ private_key="@TERMUX_PREFIX@/etc/cert/user.prv"
|
|
private_key_passwd="password"
|
|
phase1="peaplabel=0"
|
|
- ca_cert2="/etc/cert/ca2.pem"
|
|
- client_cert2="/etc/cer/user.pem"
|
|
- private_key2="/etc/cer/user.prv"
|
|
+ ca_cert2="@TERMUX_PREFIX@/etc/cert/ca2.pem"
|
|
+ client_cert2="@TERMUX_PREFIX@/etc/cer/user.pem"
|
|
+ private_key2="@TERMUX_PREFIX@/etc/cer/user.prv"
|
|
private_key2_passwd="password"
|
|
}
|
|
</programlisting></blockquote>
|
|
diff -u -r ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.sgml ./wpa_supplicant/doc/docbook/wpa_supplicant.sgml
|
|
--- ../wpa_supplicant-doc.orig/docbook/wpa_supplicant.sgml 2020-03-10 21:49:08.458858646 +0100
|
|
+++ ./wpa_supplicant/doc/docbook/wpa_supplicant.sgml 2020-03-10 21:52:22.873001446 +0100
|
|
@@ -505,7 +505,7 @@
|
|
started with:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-wpa_supplicant -B -c/etc/wpa_supplicant.conf -iwlan0
|
|
+wpa_supplicant -B -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0
|
|
</programlisting></blockquote>
|
|
|
|
<para>This makes the process fork into background.</para>
|
|
@@ -515,7 +515,7 @@
|
|
foreground with debugging enabled:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-wpa_supplicant -c/etc/wpa_supplicant.conf -iwlan0 -d
|
|
+wpa_supplicant -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0 -d
|
|
</programlisting></blockquote>
|
|
|
|
<para>If the specific driver wrapper is not known beforehand, it is
|
|
@@ -524,7 +524,7 @@
|
|
wrapper that is able to initialize the interface.</para>
|
|
|
|
<blockquote><programlisting>
|
|
-wpa_supplicant -Dnl80211,wext -c/etc/wpa_supplicant.conf -iwlan0
|
|
+wpa_supplicant -Dnl80211,wext -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -iwlan0
|
|
</programlisting></blockquote>
|
|
|
|
<para><command>wpa_supplicant</command> can control multiple
|
|
@@ -657,7 +657,7 @@
|
|
<title>Quick Start</title>
|
|
|
|
<para>First, make a configuration file, e.g.
|
|
- <filename>/etc/wpa_supplicant.conf</filename>, that describes the networks
|
|
+ <filename>@TERMUX_PREFIX@/etc/wpa_supplicant.conf</filename>, that describes the networks
|
|
you are interested in. See <citerefentry>
|
|
<refentrytitle>wpa_supplicant.conf</refentrytitle>
|
|
<manvolnum>5</manvolnum>
|
|
@@ -670,7 +670,7 @@
|
|
enabled:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -d
|
|
+wpa_supplicant -iwlan0 -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -d
|
|
</programlisting></blockquote>
|
|
|
|
<para>Assuming everything goes fine, you can start using following
|
|
@@ -678,7 +678,7 @@
|
|
without debugging:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -B
|
|
+wpa_supplicant -iwlan0 -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -B
|
|
</programlisting></blockquote>
|
|
|
|
<para>Please note that if you included more than one driver
|
|
@@ -699,24 +699,24 @@
|
|
can be used to enable WPA support:</para>
|
|
|
|
<para>Add MODE="Managed" and WPA="y" to the network scheme in
|
|
- <filename>/etc/pcmcia/wireless.opts</filename>.</para>
|
|
+ <filename>@TERMUX_PREFIX@/etc/pcmcia/wireless.opts</filename>.</para>
|
|
|
|
<para>Add the following block to the end of <emphasis>start</emphasis>
|
|
- action handler in <filename>/etc/pcmcia/wireless</filename>:</para>
|
|
+ action handler in <filename>@TERMUX_PREFIX@/etc/pcmcia/wireless</filename>:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
|
|
- /usr/local/bin/wpa_supplicant -B -c/etc/wpa_supplicant.conf -i$DEVICE
|
|
+if [ "$WPA" = "y" -a -x @TERMUX_PREFIX@/bin/wpa_supplicant ]; then
|
|
+ @TERMUX_PREFIX@/bin/wpa_supplicant -B -c@TERMUX_PREFIX@/etc/wpa_supplicant.conf -i$DEVICE
|
|
fi
|
|
</programlisting></blockquote>
|
|
|
|
|
|
<para>Add the following block to the end of <emphasis>stop</emphasis>
|
|
action handler (may need to be separated from other actions) in
|
|
- <filename>/etc/pcmcia/wireless</filename>:</para>
|
|
+ <filename>@TERMUX_PREFIX@/etc/pcmcia/wireless</filename>:</para>
|
|
|
|
<blockquote><programlisting>
|
|
-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
|
|
+if [ "$WPA" = "y" -a -x @TERMUX_PREFIX@/bin/wpa_supplicant ]; then
|
|
killall wpa_supplicant
|
|
fi
|
|
</programlisting></blockquote>
|