Changeset e77c478 for networking/netprogs

Timestamp:

07/18/2023 04:51:51 PM (10 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

6dfe4ab

Parents:

4048bc73 (diff), 5af5876 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into lxqt

Location:

networking/netprogs

Files:

• samba.xml (modified) (2 diffs)
• wpa_supplicant.xml (modified) (1 diff)

networking/netprogs/samba.xml

@@ -79 +79 @@
       <xref linkend="perl-json"/>,
       <xref linkend="libtirpc"/>,
-      <xref linkend="lmdb"/>,
       <xref linkend="perl-parse-yapp"/>, and
       <xref linkend="rpcsvc-proto"/>
@@ -93 +92 @@
       <xref linkend="libtasn1"/>,
       <xref linkend="libxslt"/> (for documentation),
-      <xref linkend="linux-pam"/>, and
+      <xref linkend="linux-pam"/>,
+      <xref linkend="lmdb"/>, and
       <xref linkend="openldap"/>
     </para>

networking/netprogs/wpa_supplicant.xml

@@ -382 +382 @@
       <para revision="sysv">
         If your router/access point uses DHCP to allocate IP addresses, you
-        can install <xref linkend="dhcp"/> client and use it to
+        can install <xref linkend="dhcpcd" role="nodep"/> and use it to
         automatically obtain network addresses. Create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
-        </filename> by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="dhclient"
-DHCP_START=""
-DHCP_STOP=""
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-      <para revision="sysv">
-        If you prefer <xref linkend="dhcpcd"/> instead of
-        <xref linkend="dhcp"/> client, then create the
         <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
         </filename> by running the following command as the