Changeset 0f9a1f08 for networking

Timestamp:

01/18/2023 02:35:32 PM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

c10acfe

Parents:

f56d2e7 (diff), 97e7219 (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 plabs/python-mods

Location:

networking

Files:

• connect/dhcpcd.xml (modified) (1 diff)
• netlibs/libpcap.xml (modified) (1 diff)
• netutils/networkmanager.xml (modified) (3 diffs)

networking/connect/dhcpcd.xml

@@ -299 +299 @@
 IFACE="eth0"
 SERVICE="dhcpcd"
-DHCP_START="-b -q <replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
+DHCP_START="-b -q -h ''<replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
 DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"</literal>
 EOF</userinput></screen>

networking/netlibs/libpcap.xml

@@ -7 +7 @@
   <!ENTITY libpcap-download-http "https://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
   <!ENTITY libpcap-download-ftp  " ">
-  <!ENTITY libpcap-md5sum        "9f27d8e5595fb14e6bc8151ef6f5610b">
+  <!ENTITY libpcap-md5sum        "c42fde2eb75a5075f19116f8c9768573">
   <!ENTITY libpcap-size          "932 KB">
-  <!ENTITY libpcap-buildsize     "9.9 MB">
+  <!ENTITY libpcap-buildsize     "11 MB">
   <!ENTITY libpcap-time          "less than 0.1 SBU">
 ]>

networking/netutils/networkmanager.xml

@@ -9 +9 @@
   <!ENTITY NetworkManager-download-ftp
 "&gnome-download-ftp;/NetworkManager/&NetworkManager-minor;/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "46be005b3cae8c002339ada4c9f9f3ea">
-  <!ENTITY NetworkManager-size          "6.2 MB">
-  <!ENTITY NetworkManager-buildsize     "275 MB (with tests and documentation)">
+  <!ENTITY NetworkManager-md5sum        "465761b2b614c1f778a34c59adfabf1a">
+  <!ENTITY NetworkManager-size          "6.3 MB">
+  <!ENTITY NetworkManager-buildsize     "278 MB (with tests and documentation)">
   <!ENTITY NetworkManager-time          "0.9 SBU (with tests, using parallelism=4)">
 ]>
@@ -156 +156 @@
          below still one test (test-route) fails.-->
 
-<screen><literal>
-[*] Networking support---&gt;                                [CONFIG_NET]
+<screen><literal>[*] Networking support---&gt;                                [CONFIG_NET]
       Networking options---&gt;
       [*] TCP/IP networking                               [CONFIG_INET]
@@ -186 +185 @@
       &lt;*&gt;   Virtual eXtensible Local Area Network (VXLAN) [CONFIG_VXLAN]
       &lt;*&gt;   Virtual ethernet pair device                  [CONFIG_VETH]
-      &lt;*&gt;   Virtual Routing and Forwarding (Lite)         [CONFIG_VRF]
-  </literal></screen>
+      &lt;*&gt;   Virtual Routing and Forwarding (Lite)         [CONFIG_VRF]</literal></screen>
 
     <indexterm zone="NetworkManager NetworkManager-kernel">