Changeset e77c478 for networking

Timestamp:

07/18/2023 04:51:51 PM (11 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

Files:

• connect/connect.xml (modified) (1 diff)
• connect/kea.xml (added)
• netlibs/curl.xml (modified) (1 diff)
• netlibs/glib-networking.xml (modified) (1 diff)
• netprogs/samba.xml (modified) (2 diffs)
• netprogs/wpa_supplicant.xml (modified) (1 diff)
• netutils/networkmanager.xml (modified) (3 diffs)

networking/connect/connect.xml

@@ -37 +37 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kea.xml"/>
 
 </chapter>

networking/netlibs/curl.xml

@@ -381 +381 @@
 rm -rf docs/examples/.deps &&
 
-find docs \( -name Makefile\* -o -name \*.1 -o -name \*.3 \) -exec rm {} \; &&
-
-install -v -d -m755 /usr/share/doc/curl-&curl-version; &&
-cp -v -R docs/*     /usr/share/doc/curl-&curl-version;</userinput></screen>
+find docs \( -name Makefile\* -o  \
+             -name \*.1       -o  \
+             -name \*.3       -o  \
+             -name CMakeLists.txt \) -delete &amp;&amp;
+
+cp -v -R docs -T /usr/share/doc/curl-&curl-version;</userinput></screen>
 
     <para>

networking/netlibs/glib-networking.xml

@@ -10 +10 @@
 <!--  <!ENTITY glib-networking-download-ftp
     "&gnome-download-ftp;/glib-networking/2.66/glib-networking-&glib-networking-version;.tar.xz"> -->
-  <!ENTITY glib-networking-md5sum        "7f57d2f6a68d49a656912a5d226c2ed1">
+  <!ENTITY glib-networking-md5sum        "05b519bb1f009789e6b82af88ed1b59a">
   <!ENTITY glib-networking-size          "276 KB">
   <!ENTITY glib-networking-buildsize     "5.6 MB (with tests)">

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

networking/netutils/networkmanager.xml

@@ -9 +9 @@
   <!ENTITY NetworkManager-download-ftp
 "&gnome-download-ftp;/NetworkManager/&NetworkManager-minor;/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "e2aa7bf567206a55b10f6b2e332c109e">
+  <!ENTITY NetworkManager-md5sum        "e496a6af920e788fd39710799f88721a">
   <!ENTITY NetworkManager-size          "6.4 MB">
-  <!ENTITY NetworkManager-buildsize     "280 MB (with tests and documentation)">
-  <!ENTITY NetworkManager-time          "0.8 SBU (with tests, using parallelism=4)">
+  <!ENTITY NetworkManager-buildsize     "257 MB (with tests and documentation)">
+  <!ENTITY NetworkManager-time          "0.7 SBU (with tests, using parallelism=4)">
 ]>
 
@@ -92 +92 @@
     <para role="recommended">
       <xref linkend="curl"/>,
-      <!--<xref linkend="dhcpcd"/> or
-          DHCPCD support is known to be broken with dhcpcd-9 -->
-      <xref role="nodep" linkend="dhcp"/> (client only),
+      <xref linkend="dhcpcd"/>
       <xref linkend="gobject-introspection"/>,
       <xref linkend="iptables"/>,
@@ -455 +453 @@
         To use something other than the built-in dhcp client (recommended if
         using only <command>nmcli</command>), use the following configuration
-        (valid values include either dhclient <!--dhcpcd --> or internal):
+        (valid values include either dhcpcd or internal):
       </para>
 
 <screen role="nodump"><userinput>cat &gt; /etc/NetworkManager/conf.d/dhcp.conf &lt;&lt; "EOF"
 <literal>[main]
-dhcp=</literal><replaceable>dhclient</replaceable>
+dhcp=</literal><replaceable>dhcpcd</replaceable>
 EOF</userinput></screen>