Merge branch 'vyos:current' into current

1 files changed, 46 insertions, 18 deletions

diff --git a/debian/control b/debian/control
index 76fe5c331..1d152c18b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,24 @@ Build-Depends:
   fakeroot,
   gcc,
   iproute2,
-  libvyosconfig0 (>= 0.0.7),
   libzmq3-dev,
   python3 (>= 3.10),
-# For QA
+# For QA/Lint
   pylint,
+  python3-vici (>= 5.7.2),
+  python3-fastapi,
+  python3-pyudev,
+  python3-systemd,
+  python3-certbot-nginx,
+  python3-pam,
+  python3-dbus,
+  python3-pyroute2,
+  python3-voluptuous,
 # For generating command definitions
   python3-lxml,
   python3-xmltodict,
+# For generating serialization functions
+  protobuf-compiler,
 # For running tests
   python3-coverage,
   python3-hurry.filesize,
@@ -40,8 +50,9 @@ Pre-Depends:
   libpam-runtime [amd64],
   libnss-tacplus [amd64],
   libpam-tacplus [amd64],
-  libpam-radius-auth (= 1.5.0-cl3u7) [amd64],
-  libnss-mapuser (= 1.1.0-cl3u3) [amd64]
+  vyos-libpam-radius-auth,
+  vyos-libnss-mapuser,
+  tzdata (>= 2025b)
 Depends:
 ## Fundamentals
   ${python3:Depends} (>= 3.10),
@@ -71,6 +82,7 @@ Depends:
   python3-netifaces,
   python3-paramiko,
   python3-passlib,
+  python3-protobuf,
   python3-pyroute2,
   python3-psutil,
   python3-pyhumps,
@@ -78,6 +90,7 @@ Depends:
   python3-pyudev,
   python3-six,
   python3-tabulate,
+  python3-tomli,
   python3-voluptuous,
   python3-xmltodict,
   python3-zmq,
@@ -116,7 +129,7 @@ Depends:
   dosfstools,
   grub-efi-amd64-signed [amd64],
   grub-efi-arm64-bin [arm64],
-  mokutil [amd64],
+  mokutil,
   shim-signed [amd64],
   sbsigntool [amd64],
 # Image signature verification tool
@@ -124,13 +137,15 @@ Depends:
 # Live filesystem tools
   squashfs-tools,
   fuse-overlayfs,
+# Tools for checking password strength
+  python3-cracklib,
 ## End installer
   auditd,
   iputils-arping,
   iputils-ping,
   isc-dhcp-client,
 # For "vpn pptp", "vpn l2tp", "vpn sstp", "service ipoe-server"
-  accel-ppp,
+  accel-ppp-ng,
 # End "vpn pptp", "vpn l2tp", "vpn sstp", "service ipoe-server"
   avahi-daemon,
   conntrack,
@@ -184,13 +199,10 @@ Depends:
   console-data,
   dropbear,
 # End "service console-server"
-# For "service aws glb"
-  aws-gwlbtun,
 # For "service dns dynamic"
   ddclient (>= 3.11.1),
 # End "service dns dynamic"
 # # For "service ids"
-  fastnetmon [amd64],
   suricata,
   suricata-update,
 # End "service ids"
@@ -198,14 +210,11 @@ Depends:
   ndppd,
 # End "service ndp-proxy"
 # For "service router-advert"
-  radvd,
+  radvd (>= 2.20),
 # End "service route-advert"
 # For "load-balancing haproxy"
   haproxy,
 # End "load-balancing haproxy"
-# For "load-balancing wan"
-  vyatta-wanloadbalance,
-# End "load-balancing wan"
 # For "service dhcp-relay"
   isc-dhcp-relay,
 # For "service dhcp-server"
@@ -325,6 +334,15 @@ Depends:
 # iptables is only used for containers now, not the the firewall CLI
   iptables,
 # End container
+# For "vpp"
+  libvppinfra,
+  python3-vpp-api,
+  vpp,
+  vpp-crypto-engines,
+  vpp-dev,
+  vpp-plugin-core,
+  vpp-plugin-dpdk,
+# End "vpp"
 ## End Configuration mode
 ## Operational mode
 # Used for hypervisor model in "run show version"
@@ -374,13 +392,15 @@ Depends:
 Description: VyOS configuration scripts and data
  VyOS configuration scripts, interface definitions, and everything
 
-Package: vyos-1x-vmware
-Architecture: amd64
+Package: vyos-1x-aws
+Architecture: all
 Depends:
  vyos-1x,
- open-vm-tools
-Description: VyOS configuration scripts and data for VMware
- Adds configuration files required for VyOS running on VMware hosts.
+# For "service aws glb"
+ aws-gwlbtun,
+Description: VyOS configuration scripts and data for AWS Gateway Load Balancer
+ Adds configuration files required for AWS Gateway Load Balancer service
+ running on top of VyOS.
 
 Package: vyos-1x-smoketest
 Architecture: all
@@ -389,3 +409,11 @@ Depends:
  snmp,
  vyos-1x
 Description: VyOS build sanity checking toolkit
+
+Package: vyos-1x-vmware
+Architecture: all
+Depends:
+ vyos-1x,
+ open-vm-tools
+Description: VyOS configuration scripts and data for VMware
+ Adds configuration files required for VyOS running on VMware hosts.