Merge remote-tracking branch 'upstream/current' into current

1 files changed, 92 insertions, 82 deletions

diff --git a/debian/control b/debian/control
index 3a441b47b..d9663d07b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,111 +2,116 @@ Source: vyos-1x
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 9),
-  quilt,
+Build-Depends:
+  debhelper (>= 9),
+  fakeroot,
+  libvyosconfig0 (>= 0.0.7),
+  libzmq3-dev,
   python3,
-  python3-setuptools,
-  python3-xmltodict,
+  python3-coverage,
   python3-lxml,
   python3-nose,
-  python3-coverage,
-  whois,
-  fakeroot,
-  libvyosconfig0 (>= 0.0.7)
+  python3-setuptools,
+  python3-xmltodict,
+  quilt,
+  whois
 Standards-Version: 3.9.6
 
 Package: vyos-1x
 Architecture: all
-Depends: python3,
-  ${python3:Depends},
-  python3-netifaces,
-  python3-jinja2,
-  python3-pystache,
-  python3-psutil,
-  python3-tabulate,
-  python3-six,
-  python3-isc-dhcp-leases,
-  python3-hurry.filesize,
-  python3-vici (>= 5.7.2),
-  python3-flask,
-  python3-waitress,
-  python3-netaddr,
-  python3-zmq,
-  python3-jmespath,
-  python3-xmltodict,
-  python3-pyudev,
-  python3-voluptuous,
+Depends:
+  accel-ppp,
+  beep,
+  bmon,
   bsdmainutils,
+  conntrack,
+  conserver-client,
+  conserver-server,
+  crda,
   cron,
-  etherwake,
-  systemd,
+  dbus,
+  dropbear,
   easy-rsa,
+  etherwake,
+  fastnetmon,
+  file,
+  frr,
+  frr-pythontools,
+  hostapd (>= 0.6.8),
+  hvinfo,
+  igmpproxy,
   ipaddrcheck,
-  tcpdump,
+  iperf,
+  iperf3,
+  iputils-arping,
   isc-dhcp-client,
-  wide-dhcpv6-client,
-  bmon,
-  hvinfo,
+  isc-dhcp-relay,
+  isc-dhcp-server,
+  iw,
+  keepalived (>=2.0.5),
+  lcdproc,
+  libatomic1,
+  libndp-tools,
+  libpam-radius-auth (>= 1.5.0),
+  libvyosconfig0,
+  lldpd,
   lm-sensors,
-  file,
   lsscsi,
-  pciutils,
-  usbutils,
-  procps,
-  snmp, snmpd,
-  openssh-server,
+  mdns-repeater,
+  mtr-tiny,
+  nftables (>= 0.9.3),
+  nginx-light,
   ntp,
   ntpdate,
-  iputils-arping,
-  libvyosconfig0,
-  beep,
-  dropbear,
-  conserver-server,
-  conserver-client,
-  isc-dhcp-server,
-  isc-dhcp-relay,
-  keepalived (>=2.0.5),
-  wireguard,
-  tftpd-hpa,
-  igmpproxy,
-  accel-ppp,
-  mdns-repeater,
-  udp-broadcast-relay,
-  pdns-recursor,
-  lcdproc,
-  lcdproc-extra-drivers,
+  ocserv,
+  openssh-server,
   openvpn,
   openvpn-auth-ldap,
   openvpn-auth-radius,
-  libpam-radius-auth (>= 1.5.0),
-  mtr-tiny,
-  telnet,
-  traceroute,
-  ssl-cert,
-  nginx-light,
-  lldpd,
-  iperf,
-  iperf3,
-  frr,
-  frr-pythontools,
-  radvd,
-  dbus,
-  usb-modeswitch,
-  hostapd (>= 0.6.8),
-  wpasupplicant (>= 0.6.7),
-  iw,
-  crda,
-  wireless-regdb,
+  pciutils,
+  pdns-recursor,
   pmacct (>= 1.6.0),
-  python3-certbot-nginx,
   pppoe,
+  procps,
+  python3,
+  python3-certbot-nginx,
+  ${python3:Depends},
+  python3-flask,
+  python3-hurry.filesize,
+  python3-isc-dhcp-leases,
+  python3-jinja2,
+  python3-jmespath,
+  python3-netaddr,
+  python3-netifaces,
+  python3-psutil,
+  python3-pystache,
+  python3-pyudev,
+  python3-six,
+  python3-tabulate,
+  python3-vici (>= 5.7.2),
+  python3-voluptuous,
+  python3-waitress,
+  python3-xmltodict,
+  python3-zmq,
+  radvd,
   salt-minion,
+  snmp,
+  snmpd,
+  ssl-cert,
+  systemd,
+  tcpdump,
+  tcptraceroute,
+  telnet,
+  tftpd-hpa,
+  traceroute,
+  udp-broadcast-relay,
+  usb-modeswitch,
+  usbutils,
   vyos-utils,
-  nftables (>= 0.9.3),
-  conntrack,
-  libatomic1,
-  fastnetmon,
-  libndp-tools
+  wide-dhcpv6-client,
+  wireguard-tools,
+  wireless-regdb,
+  wpasupplicant (>= 0.6.7)
 Description: VyOS configuration scripts and data
  VyOS configuration scripts, interface definitions, and everything
 
@@ -118,3 +123,8 @@ Depends:
 Description: VyOS configuration scripts and data for VMware
  Adds configuration files required for VyOS running on VMware hosts.
 
+Package: vyos-1x-smoketest
+Architecture: all
+Depends:
+ vyos-1x
+Description: VyOS build sanity checking toolkit