From cf37f188a5403e991c6914db5d44850aa7f8120c Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sat, 20 May 2023 11:26:25 +0200 Subject: [PATCH] merge upstream debian packaging metadata with ours as first step towards hosting the debian/packaging fully ourselves. Signed-off-by: Thomas Lamprecht --- debian/changelog | 482 ++++++++++++++++++++-------- debian/compat | 2 +- debian/control | 9 +- debian/copyright | 28 ++ debian/ifup@.service | 17 + debian/ifupdown2.dirs | 4 + debian/ifupdown2.docs | 1 + debian/ifupdown2.examples | 1 + debian/ifupdown2.install | 1 - debian/ifupdown2.links | 5 + debian/ifupdown2.lintian-overrides | 1 + debian/ifupdown2.manpages | 6 + debian/ifupdown2.networking.service | 22 ++ debian/ifupdown2.postinst | 109 +++++++ debian/ifupdown2.postrm | 46 +++ debian/rules | 27 ++ debian/watch | 1 + 17 files changed, 619 insertions(+), 143 deletions(-) create mode 100644 debian/copyright create mode 100644 debian/ifup@.service create mode 100644 debian/ifupdown2.dirs create mode 100644 debian/ifupdown2.docs create mode 100644 debian/ifupdown2.examples create mode 100644 debian/ifupdown2.links create mode 100644 debian/ifupdown2.lintian-overrides create mode 100644 debian/ifupdown2.manpages create mode 100644 debian/ifupdown2.networking.service create mode 100644 debian/ifupdown2.postinst create mode 100644 debian/ifupdown2.postrm create mode 100755 debian/rules create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index d25cea4..93b3298 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,203 +1,413 @@ -ifupdown2 (3.1.0-1+pmx4) bullseye; urgency=medium +ifupdown2 (3.2.0) unstable; urgency=medium + + * Fix: Sonarqube issues + * Fix: ifquery hangs indefinitely on ^C + * Fix: Skipping admin down on deleted vlans + * Fix: Merge existing MTU into new netlink object + * Fix: scheduler: env variable not properly set for user commands (fixes #218) + * Fix: ifquery-check: vlan-protocol for dotted interfaces + * Fix: Down ops on vrf-slave should set the slave admin down + * New: Allow bond creation without slaves + * New: Add `--set-ring` option to ethtool + * New: Openvswitch : add support for fakebridge + * New: add support for systemd logging (--systemd) + * New: Process hwaddress before processing ip addresses + * New: Set protodown off on bond slave before bond is deleted + * New: Make sure bond speed and slaves (swps) speed are matching + + -- Julien Fortin Thu, 04 May 2023 23:42:00 -0700 + +ifupdown2 (3.1.0-1) unstable; urgency=medium + + * New: ifquery-check now validates admin state + * New: bond: bond mac should always be inherited from it's first slave + + * New: macvlan/addressvirtual features: + - check interface name lenght and warn if len > 15 + - sync macvlan forwarding state with lower-device + + * New: vxlan features: + - Single vxlan device support (bridge-vlan-vni-map) + New attributes: + - vxlan-mcastgrp-map (vxlan multicast group for single-vxlan device) + - vxlan-vnifilter (vxlan vni filter for single-vxlan device) + - vxlan-remoteip-map (static HREP entries for static single vxlan dev) + - vxlan-tos (ToS value) + - vxlan-udp-csum (whether to perform checksumming or not) + New policy: + - vxlan-support-mix-dev-types: allow mix of traditional and single + vxlan device (default to yes) + + * New: bridge features: + - add multi bridge support for bridge_set_static_mac_from_port=yes + - check if bridge mac is already inherited from a port + - detect VXLAN mis-config VNI "bridge-learning=on" and warn + - detect and warn when arp suppression is enabled but no vlan config + - bridge-arp-nd-suppress with ifquery --with-default if policy is set + - enable ipv6 on SVD brport + - enable forwarding on dhcp bridges (fixes: #179) + New attribute: + - bridge-vlan-vni-map (single vxlan device support) + New policy: + - bridge_always_up_dummy_brport + + * New: address features: + - warn user if L3-SVI is configured with "ip-forward off" + - enable ipv6 before adding new address + New policies: + - check_l3_svi_ip_forwarding (check ip forward on l3 svi, default off) + - ip_blacklist: blacklist specific ip addresses + + * New: vlan features: + - check vlan-id misconfiguration and print warning + New attribute: + - vlan-bridge-binding (if enabled link state is no longer automatically + transferred from the lower device) + + * Fix: address: remove stale fdb entry for svi (when hwaddress is used) + * Fix: usercmds: Set environment just like the original ifupdown + * Fix: update mako template warning (python3-mako) + * Fix: batman_adv: fix unresolved reference + + -- Julien Fortin Mon, 05 Jul 2021 23:42:42 +0200 + +ifupdown2 (3.0.0-1) unstable; urgency=medium + + * New: python3 support + * New: attribute alias support + * New: bridge-always-up attribute + * New: set bridge mtu with policy default + * New: ES bond with "es-sys-mac" attribute + * New: vxlan attribute: vxlan-mcastgrp-map + * New: support for "veth-peer-name" attribute + * New: dhcp policy: dhclient_retry_on_failure + * New: support for marking interfaces as mgmt interfaces + * New: bridge-vlan-vni-map attribute (single vxlan device) + * New: dhcp: skipping dhcp configuration if link-down yes + * New: vrf-slave: keep vlan down if lower device has "link-down yes" + * New: vxlan: support for vxlan-svcnodeip6 and vxlan-mcastgrp6 (fixes #43) + * New: support for add ovs-ports-condone-regex attribute (openvswitch) + * Fix: dry-run exceptions + * Fix: bond enslavement ordering + * Fix: process MTU before addrgen + * Fix: set bridge MTU after bridge creation + * Fix: ifquery-running: incorrect displayed data + * Fix: tunnel configuration compatibility with ifupdown1 + * Fix: start-networking script is back to handle mgmt & hotplug cases + * Fix: devices matching with ".{0,13}\-v" could get removed by ifreload + * Fix: mstpctl: check mstpctl-stp and bridge-stp and fix bridge cache update + * Removing python-argcomplete dependency + + -- Julien Fortin Tue, 04 Aug 2020 23:42:42 +0200 + +ifupdown2 (2.0.2-1) unstable; urgency=medium + + * New: addons: ethtool: add support for "ethtool_ignore_errors" policy + * New: addons: dhcp: if mgmt vrf context exec dhclient in default vrf + * Fix: nlpacket: don't raise an exception on 24 bytes mac address (#140) + * Fix: IFLA_INFO_KIND: decode tunnel data + * Fix: XFRM for 2.x release + * Fix: addons.conf: remove duplicate entry for tunnel pre-up + + -- Julien Fortin Wed, 04 Mar 2020 23:42:42 +0100 + +ifupdown2 (2.0.1-1) unstable; urgency=medium + + * New argv option: --nldebug to print netlink debug message + * New: ethtool: nics (GRO, LRO GSO, TSO, UFO, TX and RX) offload attributes + + -- Julien Fortin Tue, 31 Dec 2019 15:21:06 +0100 + +ifupdown2 (2.0.0-1) unstable; urgency=medium + + * Introduction of the live netlink cache + * Refactoring and PEP8 fixes + * Install systemd ifupdown2.netowrking.service and ifup.service + * Addons: bond: bond-primary attributes (closes: #9) + * Addons: address-virtual: vrrp support + * Addons: address: add arp-accept option + * Addons: tunnel: adding "tunnel-" prefix to every attributes + * Loopback interface won't go down (unless link-down yes) + * Macvlans (address-virtual) can now be configured without ips + * Add support for vxlan multicast group (vxlan-mcastgrp) + * New sets of poliicies: + - bridge polcy for vxlan port: bridge-vxlan-arp-nd-suppres (ON/off) + - bridge policy for vxlan port: bridge_vxlan_port_learning (ON/off) + - bridge policy for vxlan port: + vxlan_bridge_igmp_snooping_enable_port_mcrouter (1/0) + + -- Julien Fortin Tue, 01 Oct 2019 23:42:42 +0200 + +ifupdown2 (1.2.8-1) unstable; urgency=medium + + * New: Add policy dhcp6-duid to specify DUID type to be used for IPv6 interfaces + + -- Julien Fortin Thu, 11 Jul 2019 23:42:42 +0200 + +ifupdown2 (1.2.7-1) unstable; urgency=medium + + * New: Add bridge-ports-condone-regex option (closes #117) + + -- Julien Fortin Tue, 09 Jul 2019 23:42:42 +0200 + +ifupdown2 (1.2.6-1) unstable; urgency=medium + + * Fix: AttributeError exception in bridge module (fixes #90) + * Fix: ifupdownaddons: LinkUtils fix cmd concatenation (closes: #930839) + * New. policymanager: merge module policy instead of overriding duplicates + * New: set default mtu on user defined device (via link-type) + * New: add support for vxlan-ttl attribute + * New: add support for vrrp attribute + * New: introduce new bridge policy: + "vxlan_bridge_igmp_snooping_enable_port_mcrouter" + * New: link-down yes will also down macvlans + * New: XFRM addon module + * New: Add policy to wait for IPv6 link local address to be available + + -- Julien Fortin Sun, 23 Jun 2019 23:42:42 -1000 + +ifupdown2 (1.2.5-1) unstable; urgency=medium - * add ovs support for fakebridge + * Fix: ifupdown2 scripts: log warning on EACCES exception (Fixes #89) + * Fix: debian: install sysvinit script (closes: #918775) + * Fix: debian: postinst: remove diversion after upgrade from stretch + (closes: #919443) + + -- Julien Fortin Mon, 21 Jan 2019 23:42:42 +8000 + +ifupdown2 (1.2.4-1) unstable; urgency=medium + + * Fix: statemanager directory path customization via ifupdown2.conf + (closes: #918832) + + -- Julien Fortin Fri, 11 Jan 2019 23:42:42 +0000 - * vlan: fix vlan-protocol query check +ifupdown2 (1.2.3-1) unstable; urgency=medium - * Avoid updating VLAN attributes (vlan-protocol, vlan-id) on reload, if it's - not a full ifdown + ifup cycle. + * Fix: log: use stderr if syslog initialization fails (closes: #917534) - -- Proxmox Support Team Tue, 16 May 2023 12:01:14 +0200 + -- Julien Fortin Sun, 30 Dec 2018 23:42:42 +0700 -ifupdown2 (3.1.0-1+pmx3) bullseye; urgency=medium +ifupdown2 (1.2.2-1) unstable; urgency=medium - * fix a point-to-point regression introduced in 3.1 + * New: add support for B.A.T.M.A.N. adv. attributes + * New: support for new iproute2 format (bridge vlan show) + * New: add new checks for existing device with vxlan attributes + * Fix: pypi install: local addons modules should be loaded first + * Fix: link-down yes on vrf slaves + * Fix: nlmanager: use strerror to format kernel error + * Fix: ethtool: FEC: translate None and NotSupported values to link-fec off + * Fix: man: remove non-implemented -m option (closes: #905572) - -- Proxmox Support Team Mon, 26 Jul 2021 12:29:08 +0200 + -- Julien Fortin Thu, 20 Dec 2018 23:42:42 +0000 -ifupdown2 (3.1.0-1+pmx2) bullseye; urgency=medium +ifupdown2 (1.2.1) UNRELEASED; urgency=medium - * avoid re-generating and reloading network configuration in the installer + * Fix #54: address module new l3_intf_default_gateway_set_onlink policy + * Fix: Link down does not work on any intf configured in a VRF + * Add: ethtool: add link-speed 10 to valid values array + * Add: address: add l3_intf_arp_accept policy to control ARP_ACCEPT + * Add: warning when bridge attribute are used on non br[port] intf + * Add: point-to-point protocol (ppp) addon to create/configure ppp interfaces + * Add: tunnel support (gretap, ipip, sit, vti, ip6gre, ipip6, ip6ip6, vti6) + * Add: 0/1/on/off/yes/no support to ip[6]-forward attribute + * Add: address module_globals policy l3_intf_arp_accept to control ARP_ACCEPT + * addressvirtual module_globals "addressvirtual_with_route_metric" policy + * Closes: ethtool: link-fec: local variable 'fec_attrs' + referencede before assignment + * Fix: ifquery -r incorrect for address-virtual and vrf configuration under + an interface - -- Proxmox Support Team Thu, 15 Jul 2021 10:35:31 +0200 + -- Julien Fortin Wed, 24 Oct 2018 23:42:42 +0200 -ifupdown2 (3.1.0-1+pmx1) bullseye; urgency=medium +ifupdown2 (1.2.0) UNRELEASED; urgency=medium - * update to 3.1.0 upstream release + * Package architecture refactoring and cleanups + * Package can be build/install as debian, pip or rpm package + * Makefile to easily perform tasks (i.e.: install, build, test, upload..) + * VRF slaves: add support for link-down yes + * addressvirtual: macvlan: add default metric to ip4 and ip6 + * Closes #48: Run up/down on "manual" interfaces, but ignore any errors. + * Closes #58: address addon "vlan_aware_bridge_address_support" policy + * Traditional bridge support for mstpctl attr: (portautoedge, portrestrrole) + * Configuration for IPv6 link-local auto-generate mode, new attributes: + ipv6-addrgen (address addon) + address-virtual-ipv6-addrgen (addressvirtual addon) - * ship default policy to enable setting the MAC of a bridge to its first - port in a stable way. + -- Julien Fortin Mon, 25 Jun 2018 23:42:42 +0200 - -- Proxmox Support Team Wed, 14 Jul 2021 16:58:03 +0200 +ifupdown2 (1.1.18) UNRELEASED; urgency=medium -ifupdown2 (3.0.0-1+pve6) bullseye; urgency=medium + * Fix: Link down does not work on SVI configured in a VRF + * Fix: ifreload causes MTU to drop on bridge SVIs + * Fix: addons: addressvirtual: check if SVI name is first in routing table + * Fix: ifreload error on deleting bond slaves from an already configured bond + * Fix: ifupdown2 error is confusing when netmask is specified for vxlan-local-tunnelip + * Fix: ifupdown2 syntax check needed for vxlan interfaces + * Fix: vxlan-ageing default timer doesn't align with bridge-ageing + * Fix: Error with "ifreload -a -n" when MGMT VRF is not Applied + * Fix: using reserved VLAN range reports error but ifreload returns 0 + * Fix: unable to set bridge-portmcrouter to "2" + * Fix: vxlan syntax-check warn on missing vxlan-local-tunnelip + * Fix: traditional bridge svi breaks when extra bridge added + * Fix: github #39: addons: vrf: fix vrf slave link kind + * New. Enabled: addons: vxlan: add support for vxlan-port attribute - * always trigger a reload on first installation, to cope with ifupdown1 - doing a networking stop on its way out. + -- Julien Fortin Thu, 12 Apr 2018 11:10:04 +0200 - -- Proxmox Support Team Tue, 06 Jul 2021 14:00:17 +0200 +ifupdown2 (1.1.17) UNRELEASED; urgency=medium -ifupdown2 (3.0.0-1+pve5) bullseye; urgency=medium + * Fix: ip[6]-forward attributes not set at boot - * fix shipping networking.service for updated debhelper compat level + -- Julien Fortin Thu, 08 Feb 2018 09:48:37 +0100 - -- Proxmox Support Team Tue, 25 May 2021 10:36:40 +0200 +ifupdown2 (1.1.16) UNRELEASED; urgency=medium -ifupdown2 (3.0.0-1+pve4) bullseye; urgency=medium + * Fix: python exception on macvlans address dump + * Fix: eth0 doesn't acquire DHCP address when mgmt VRF is enabled - * re-build for Proxmox VE 7 / Debian Bullseye + -- Julien Fortin Tue, 09 Jan 2018 02:02:58 +0100 - -- Proxmox Support Team Mon, 24 May 2021 12:38:32 +0200 +ifupdown2 (1.1.15) UNRELEASED; urgency=medium -ifupdown2 (3.0.0-1+pve3) buster; urgency=medium + * New. Enabled: bridge: add support for bridge-l2protocol-tunnel + * New. Enabled: bridge attributes, when removed reset to default + * New. Enabled: vxlan attributes, when removed reset to default + * New. Enabled: improve handling of optional resources (if missing bridge-utils/ethtool) + * Fix: policy "iface_defaults" not supported for MTU + * Fix: address module: handling of ipv4 & ipv6 (add/remove) + * Fix: warning for vlan reserved range + * Fix: MTU handling on bridge SVIs - * allow vlan tag inside vxlan tunnel + -- Julien Fortin Wed, 22 Nov 2017 19:07:43 +0100 - * only rewrite config on first ifupdown2 installation +ifupdown2 (1.1.14) UNRELEASED; urgency=medium - * update ifupdown2 submodule to current master + * New. Enabled: default policy for bridge MAC address + * Fix: ethtool: don't set link speed and duplex if autoneg is on - -- Proxmox Support Team Fri, 25 Sep 2020 09:17:21 +0200 + -- Julien Fortin Wed, 25 Oct 2017 23:12:27 +0200 -ifupdown2 (3.0.0-1+pve2) pve; urgency=medium +ifupdown2 (1.1.13) UNRELEASED; urgency=medium - * OVS already manages the MTU if 'ovs-mtu' is defined, mind that. + * Fix: VRF: ssh session not killed on ifreload - -- Proxmox Support Team Fri, 05 Jun 2020 08:31:14 +0200 + -- Julien Fortin Fri, 15 Sep 2017 22:43:12 +0200 -ifupdown2 (3.0.0-1+pve1) pve; urgency=medium +ifupdown2 (1.1.12) UNRELEASED; urgency=medium - * update to new 3.0.0 upstream release + * New. Enabled: mpls-enable attribute + * New. Enabled: bond and bridge module moved to netlink configuration + * New. Enabled: handle a mix of auto and specified vrf table ids + * Fix: igmp attribute reset to defaults when removed from config - -- Proxmox Support Team Wed, 03 Jun 2020 09:22:02 +0200 + -- Julien Fortin Mon, 07 Aug 2017 22:14:03 +0200 -ifupdown2 (2.0.1-1+pve10) pve; urgency=medium +ifupdown2 (1.1.11) UNRELEASED; urgency=medium - * avoid bringing network config in sync if pve-common isn't available + * Fix: link-down attribute not applied on slave ports + * Fix: bug that prevented config of mtu below 1280 - * openvswitch: do not remove tap|veth interfaces when adding an internal ovs - port + -- Julien Fortin Thu, 18 May 2017 12:45:21 -0700 - -- Proxmox Support Team Tue, 19 May 2020 22:11:49 +0200 +ifupdown2 (1.1.10) UNRELEASED; urgency=medium -ifupdown2 (2.0.1-1+pve8) pve; urgency=medium + * New. Enabled: drop the dependency to pkg_resources, hardcode version number (closes: #855401) + * New. Enabled: adjust allow-hotplug behavior to ifupdown (closes: #855598) + * New. Enabled: bond-lacp-rate support slow/fast argument + * New. Enabled: ifquery --syntax-help: add support for json output + * New. Enabled: vlan: add new attribute 'vlan-protocol' + * New. Enabled: address: add new attribute 'ip6-forward' + * New. Enabled: bridge: add new attribute 'bridge-mcstats' + * New. Enabled: bridge: add new attribute 'bridge-vlan-stats' + * New. Enabled: bridge: add new attribute 'bridge-vlan-protocol' + * New. Enabled: bridge: add new attribute 'bridge-arp-nd-suppress' + * Fix: bond: add attribute bond-(up|down)delay + * Fix: bridge-vids: --syntax-check accepts legacy syntax - * drop now outdated allow=ovs systemd service ExecStart/Stop adaption + -- Julien Fortin Mon, 17 Apr 2017 06:18:04 +0200 - -- Proxmox Support Team Mon, 16 Mar 2020 06:33:45 +0100 +ifupdown2 (1.1.9) UNRELEASED; urgency=medium -ifupdown2 (2.0.1-1+pve7) pve; urgency=medium + * New. Enabled: support for bridge-learning attribute - * fupdown2-pre.service: fix udevadm path for non usr-merged systems + -- Julien Fortin Mon, 06 Feb 2017 13:22:51 -0800 - -- Proxmox Support Team Tue, 10 Mar 2020 08:09:53 +0100 +ifupdown2 (1.1.8) UNRELEASED; urgency=medium -ifupdown2 (2.0.1-1+pve6) pve; urgency=medium + * New. Enabled: update link-speed values: add 25G and 50G + * New. Enabled: new 'link-down' [yes|no] attribute to keep link down - * add openvswitch addon + -- Julien Fortin Tue, 17 Jan 2017 08:39:29 +0100 - * add patch to ifup/ifdown allow=ovs on start/stop +ifupdown2 (1.1.7) UNRELEASED; urgency=medium - * add ifupdown2-pre.service service to be sure that networking devices are - correctly setup before networking service is started + * New. Enabled: fix for inet and inet6 dhcp on the same interface + * New. Enabled: syntax check to warn on common configuration mistakes + * New. Enabled: addons: bridge: disable ip fwding on a bridge with no ip + and no upperifaces + * Fix: fixes for MTU handling + * Fix: dhcpv6 fails if interface doesn't have link-local addr - * do not change interface forwarding value if not defined + -- Julien Fortin Wed, 07 Dec 2016 05:48:45 +0100 - * read/write the network configuration on upgrade and removal of the - ifupdown2 package, writing eventual changes to the pending 'interfaces.new' - changes file. This ensures compatibility adapations for a respective - ifupdwon2 or ifupdown1 version are enforced. +ifupdown2 (1.1.6) UNRELEASED; urgency=medium - -- Proxmox Support Team Mon, 09 Mar 2020 13:25:58 +0100 + * Closes: github #14. add environment variables passed to user scripts + * New. Enabled: addons may provide a list of ifupdown scripts to ignore -ifupdown2 (2.0.1-1+pve4) pve; urgency=medium + -- Julien Fortin Mon, 19 Sep 2016 16:37:36 -0700 - * execute addon scripts before module to ensure OVS interfaces are available - at the time they're now being configured... +ifupdown2 (1.1.5) UNRELEASED; urgency=medium - -- Proxmox Support Team Mon, 03 Feb 2020 10:53:43 +0100 + * Fix: handling of EXISTS errors on address add + * Fix: handling of mtu on addressvirtual macvlan devices + * Fix: mako namespace handling -ifupdown2 (2.0.1-1+pve3) pve; urgency=medium + -- Julien Fortin Fri, 16 Sep 2016 12:48:04 -0700 - * fix ordering and dependencies of networking.service +ifupdown2 (1.1.4) UNRELEASED; urgency=medium - -- Proxmox Support Team Thu, 30 Jan 2020 12:51:45 +0100 + * Performance improvements + * New. Enabled: sbin: start-networking: support hotplug class from init script + * New. Enabled: support for classical numerical bond modes + * New. Enabled: extend ifquery support for mstpctl addons + * New. Enabled: each addon may perform semantic and syntax checks by + implementing a custom method + * Fix: Support for address-virtual lines under a vrf slave + * Fix: Defaults for link attributes were not applied + * Fix: Disable IPv6 duplicate address detection on VRR interfaces + * Fix: ifquery to extract vlan-id from iface if not preset + * Fix: ifquery -c bridge pvid error on a valid config -ifupdown2 (2.0.1-1+pve2) pve; urgency=medium + -- Julien Fortin Fri, 29 Jul 2016 08:55:50 -0700 - * Update to 2.0.1-1 +ifupdown2 (1.1.3) UNRELEASED; urgency=medium - -- Proxmox Support Team Mon, 13 Jan 2020 09:14:22 +0100 + * Fix: Interface configuration parsing error when keyword vlan + is the interface name. -ifupdown2 (1.2.8-1+pve4) pve; urgency=medium + -- Julien Fortin Sun, 05 Jun 2016 08:55:50 -0700 - * add arp-accept option required for bgp-evpn +ifupdown2 (1.1.2) UNRELEASED; urgency=medium - * config: keep addon_syntax_check off to allow openvswitch syntax + * Fix: checks for invalid address-virtual attributes + * New. Deprecated: `mstpctl-stp` attribute + * New. Deprecated: lacp parameters: bond-ad-sys-priority, bond-ad-sys-mac-addr + * New. Enabled: addon module for configuring vrf + * New. Enabled: bridge: display warning when (in vlan unware bridge) + an untagged bridge is not configured + * New. Enabled: adjusting MTU for vlan devices depending on lower device mtu + * New. Enabled: introduce checks for reserved vrf table names + * New. Enabled: ifquery: new option '--with-defaults' to include default + attributes + * New. Enabled: bridge: disabling ipv6 on bridge if any VXLAN port + * New. Enabled: vrf awareness in dhcp addon module - -- Proxmox Support Team Tue, 26 Nov 2019 14:29:11 +0100 + -- Julien Fortin Tue, 3 May 2016 14:42:42 -0700 -ifupdown2 (1.2.8-1+pve3) pve; urgency=medium +ifupdown2 (1.1) unstable; urgency=low - * re-add config tuning patch to allow multiple VLAN aware bridges and - allow `ovs_*` options to co-exist + * Initial release. - -- Proxmox Support Team Fri, 30 Aug 2019 06:58:55 +0200 - -ifupdown2 (1.2.8-1+pve2) pve; urgency=medium - - * restore the behavior to not remove (tap|veth|fwpr) interfaces from bridges - on ifup - - -- Proxmox Support Team Wed, 28 Aug 2019 16:43:11 +0200 - -ifupdown2 (1.2.8-1+pve1) pve; urgency=medium - - * update to upstream 1.2.8-1 release - - -- Proxmox Support Team Wed, 28 Aug 2019 11:06:45 +0200 - -ifupdown2 (1.2.5-2+pve1) pve; urgency=medium - - * don't remove bridge if tap|veth|fw are connected - * ifup/ifdown vxlan interface on reload - * update to current upstream master - * add uplink-id option - - -- Proxmox Support Team Tue, 18 Jun 2019 10:22:34 +0200 - -ifupdown2 (1.2.5-1+pvetest1) unstable; urgency=medium - - * Update to 1.2.5-1 - - -- Proxmox Support Team Tue, 16 Apr 2019 10:00:00 +0200 - -ifupdown2 (1.2.2-1+pvetest1) unstable; urgency=medium - - * Update to 1.2.2 - - -- Proxmox Support Team Mon, 31 Dec 2018 09:00:00 +0200 - -ifupdown2 (1.2.0-1+pvetest1) unstable; urgency=medium - - * Update to 1.2.0 tag with some fixups from master-next - - -- Proxmox Support Team Tue, 03 Jul 2018 10:47:42 +0200 - -ifupdown2 (1.2.0-1~pvetest3) unstable; urgency=medium - - * allow specifying addresses on vlan aware bridges - - -- Proxmox Support Team Mon, 18 Jun 2018 10:05:00 +0200 - -ifupdown2 (1.2.0-1~pvetest2) unstable; urgency=medium - - * readd patch for vxlan/anycast support - - -- Proxmox Support Team Mon, 18 Jun 2018 09:56:51 +0200 - -ifupdown2 (1.2.0-1~pvetest1) unstable; urgency=medium - - * Initial 1.2.0 package - - -- Proxmox Support Team Fri, 15 Jun 2018 09:14:59 +0200 + -- Roopa Prabhu Thu, 20 Aug 2015 06:14:24 -0700 diff --git a/debian/compat b/debian/compat index 48082f7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -12 +9 diff --git a/debian/control b/debian/control index d42be15..ed87b39 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: ifupdown2 Section: admin Priority: optional -Maintainer: Proxmox Support Team -Build-Depends: debhelper (>=12), +Maintainer: Julien Fortin +Build-Depends: debhelper (>= 9.20160709), dh-python, python3, python3-all, python3-setuptools, python3-docutils -Standards-Version: 4.5.1 +Standards-Version: 4.5.0.2 Homepage: https://github.com/cumulusnetworks/ifupdown2 X-Python-Version: >= 3.7 @@ -17,8 +17,7 @@ Architecture: all Provides: ifupdown Conflicts: ifupdown Replaces: ifupdown -Breaks: libpve-common-perl (<< 6.0-14) -Depends: ${python3:Depends}, ${misc:Depends}, iproute2 +Depends: ${python3:Depends}, ${misc:Depends}, iproute2, python3-six, python3-setuptools, python3-systemd Suggests: isc-dhcp-client, bridge-utils, ethtool, python3-gvgen, python3-mako Description: Network Interface Management tool similar to ifupdown ifupdown2 is ifupdown re-written in Python. It replaces ifupdown and provides diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5bf25af --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ifupdown2 +Upstream-Contact: Julien Fortin +Source: https://github.com/cumulusnetworks/ifupdown2 + +Files: * +Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc. +License: GPL-2 + +Files: debian/* +Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc. +License: GPL-2 + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/ifup@.service b/debian/ifup@.service new file mode 100644 index 0000000..da1891b --- /dev/null +++ b/debian/ifup@.service @@ -0,0 +1,17 @@ +[Unit] +Description=ifup for %I +After=local-fs.target network-pre.target networking.service systemd-sysctl.service +Before=network.target shutdown.target network-online.target +Conflicts=shutdown.target +BindsTo=sys-subsystem-net-devices-%i.device +After=sys-subsystem-net-devices-%i.device +DefaultDependencies=no +IgnoreOnIsolate=yes + +[Service] +# avoid stopping on shutdown via stopping system-ifup.slice +Slice=system.slice +ExecStart=/sbin/ifup --allow=hotplug %I +ExecStop=/sbin/ifdown %I +RemainAfterExit=true +TimeoutStartSec=2min diff --git a/debian/ifupdown2.dirs b/debian/ifupdown2.dirs new file mode 100644 index 0000000..edc63b0 --- /dev/null +++ b/debian/ifupdown2.dirs @@ -0,0 +1,4 @@ +etc/network/interfaces.d/ +etc/network/ifupdown2/policy.d/ +var/lib/ifupdown2/hooks/ +var/lib/ifupdown2/policy.d/ diff --git a/debian/ifupdown2.docs b/debian/ifupdown2.docs new file mode 100644 index 0000000..5c86fa8 --- /dev/null +++ b/debian/ifupdown2.docs @@ -0,0 +1 @@ +docs/README.rst diff --git a/debian/ifupdown2.examples b/debian/ifupdown2.examples new file mode 100644 index 0000000..684a743 --- /dev/null +++ b/debian/ifupdown2.examples @@ -0,0 +1 @@ +docs/examples/* diff --git a/debian/ifupdown2.install b/debian/ifupdown2.install index d320ae2..0ecf4b9 100644 --- a/debian/ifupdown2.install +++ b/debian/ifupdown2.install @@ -1,3 +1,2 @@ etc/network/ifupdown2/addons.conf /etc/network/ifupdown2/ etc/network/ifupdown2/ifupdown2.conf /etc/network/ifupdown2/ -debian/proxmox-bridge-mac-from-port.json /var/lib/ifupdown2/policy.d/ diff --git a/debian/ifupdown2.links b/debian/ifupdown2.links new file mode 100644 index 0000000..246d559 --- /dev/null +++ b/debian/ifupdown2.links @@ -0,0 +1,5 @@ +usr/share/ifupdown2/__main__.py usr/share/ifupdown2/ifupdown2 +usr/share/ifupdown2/ifupdown2 sbin/ifup +usr/share/ifupdown2/ifupdown2 sbin/ifdown +usr/share/ifupdown2/ifupdown2 sbin/ifquery +usr/share/ifupdown2/ifupdown2 sbin/ifreload diff --git a/debian/ifupdown2.lintian-overrides b/debian/ifupdown2.lintian-overrides new file mode 100644 index 0000000..b090749 --- /dev/null +++ b/debian/ifupdown2.lintian-overrides @@ -0,0 +1 @@ +ifupdown2: systemd-service-file-refers-to-unusual-wantedby-target diff --git a/debian/ifupdown2.manpages b/debian/ifupdown2.manpages new file mode 100644 index 0000000..7431730 --- /dev/null +++ b/debian/ifupdown2.manpages @@ -0,0 +1,6 @@ +man/ifup.8 +man/ifdown.8 +man/ifquery.8 +man/ifreload.8 +man/ifupdown-addons-interfaces.5 +man/interfaces.5 diff --git a/debian/ifupdown2.networking.service b/debian/ifupdown2.networking.service new file mode 100644 index 0000000..cdb3065 --- /dev/null +++ b/debian/ifupdown2.networking.service @@ -0,0 +1,22 @@ +[Unit] +Description=Network initialization +Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8) +DefaultDependencies=no +After=local-fs.target network-pre.target +Before=shutdown.target network.target network-online.target +Conflicts=shutdown.target +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service + +[Service] +Type=oneshot +RemainAfterExit=yes +SyslogIdentifier=networking +TimeoutStopSec=30s +EnvironmentFile=/etc/default/networking +ExecStart=/usr/share/ifupdown2/sbin/start-networking start +ExecStop=/usr/share/ifupdown2/sbin/start-networking stop +ExecReload=/usr/share/ifupdown2/sbin/start-networking reload + +[Install] +WantedBy=basic.target network.target shutdown.target diff --git a/debian/ifupdown2.postinst b/debian/ifupdown2.postinst new file mode 100644 index 0000000..3689256 --- /dev/null +++ b/debian/ifupdown2.postinst @@ -0,0 +1,109 @@ +#!/bin/sh +set -e + +MYNAME="${0##*/}" + +report() { echo "${MYNAME}: $*" ; } +report_warn() { report "Warning: $*" >&2 ; } +report_err() { report "Error: $*" >&2 ; } + +fix_dhclient_file_with_space() +{ + # because of a typo an older ifupdown2 version was creating lease file + # with trailing space. In case we still have users with such files we + # need to strip that trailing whitespace. + for filename in `find /var/lib/dhcp/ -name "dhclient.*.leases "` + do + if [ -f "$filename " ]; + then + interface_name=`echo $filename | cut -d'.' -f2,3,4,5` + mv "$filename " /var/lib/dhcp/dhclient6.$interface_name + fi + done +} + +process_etc_network_interfaces() +{ + # Generic stuff done on all configurations + if [ -f /etc/network/interfaces ] ; then + if ! grep -q -E "^[[:space:]]*iface[[:space:]]+l[o0]([[:space:]]+inet([[:space:]]+loopback)?)?[[:space:]]*$" /etc/network/interfaces ; then + report_warn "No 'iface lo' definition found in /etc/network/interfaces" + fi + + if ! grep -q "^[[:space:]]*\(allow-\|\)auto[[:space:]]\+\(.*[[:space:]]\+\|\)lo0\?\([[:space:]]\+\|$\)" /etc/network/interfaces ; then + report_warn "No 'auto lo' statement found in /etc/network/interfaces" + fi + else # ! -f /etc/network/interfaces + if [ -z "$2" ]; then + echo "Creating /etc/network/interfaces." + echo "# interfaces(5) file used by ifup(8) and ifdown(8)" > /etc/network/interfaces + echo "auto lo" >> /etc/network/interfaces + echo "iface lo inet loopback" >> /etc/network/interfaces + else + report_warn "/etc/network/interfaces does not exist" + fi + fi +} + +process_udev() +{ + # override default udev bridge and hotplug rules because they interfere with + # networking init script + udev_user_rulesdir=/etc/udev/rules.d/ + udev_sys_rulesdir=/lib/udev/rules.d/ + if [ -e $udev_user_rulesdir ]; then + udev_ifupdown2_overrides="80-networking.rules + 60-bridge-network-interface.rules" + for u in ${udev_ifupdown2_overrides} + do + if [ -e ${udev_sys_rulesdir}/$u -a ! -e ${udev_user_rulesdir}/$u ]; then + (cd ${udev_user_rulesdir} && ln -sf /dev/null $u) + fi + done + fi +} + +# restore file if we diverted it on install/upgrade +_postinst_remove_diverts() +{ + diversions=$(LC_ALL=C.UTF-8 dpkg-divert --list | grep "^diversion of $1 .* by ifupdown2$" | wc -l 2> /dev/null) + if [ $diversions -gt 0 ]; + then + dpkg-divert --remove --package ifupdown2 --rename $1 + fi +} + +postinst_remove_diverts() +{ + for filename in ifup ifdown ifquery ifreload + do + _postinst_remove_diverts "/sbin/$filename" + _postinst_remove_diverts "/usr/share/bash-completion/completions/$filename" + _postinst_remove_diverts "/etc/bash_completion.d/$filename" + _postinst_remove_diverts "/usr/share/man/man8/$filename.8.gz" + done + _postinst_remove_diverts "/usr/share/man/man5/interfaces.5.gz" +} + +case "$1" in + configure) + fix_dhclient_file_with_space + process_etc_network_interfaces + process_udev + chmod +x /usr/share/ifupdown2/__main__.py + postinst_remove_diverts + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# + +exit 0 diff --git a/debian/ifupdown2.postrm b/debian/ifupdown2.postrm new file mode 100644 index 0000000..5d90b21 --- /dev/null +++ b/debian/ifupdown2.postrm @@ -0,0 +1,46 @@ +#!/bin/sh +set -e + +MYNAME="${0##*/}" + +report() { echo "${MYNAME}: $*" ; } +report_warn() { report "Warning: $*" >&2 ; } +report_err() { report "Error: $*" >&2 ; } + +process_state_file() +{ + rm -f /run/network/ifstatenew +} + +process_udev() +{ + if [ -e /etc/udev/rules.d/80-networking.rules ]; then + udevlink=$(readlink /etc/udev/rules.d/80-networking.rules 2>/dev/null || true) + [ -n "$udevlink" -a "$udevlink" = "/dev/null" ] && rm -f /etc/udev/rules.d/80-networking.rules + fi + + if [ -e /etc/udev/rules.d/60-bridge-network-interface.rules ]; then + udevlink=$(readlink /etc/udev/rules.d/60-bridge-network-interface.rules 2>/dev/null || true) + [ -n "$udevlink" -a "$udevlink" = "/dev/null" ] && rm -f /etc/udev/rules.d/60-bridge-network-interface.rules + fi +} + +case "$1" in + purge|remove|abort-install|disappear) + process_state_file + process_udev + ;; + + upgrade|failed-upgrade|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ea6f434 --- /dev/null +++ b/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 +export PYBUILD_NAME=ifupdown2 +export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/ --install-scripts=/usr/share/ + +%: + dh $@ --with=python3 --with systemd --buildsystem=pybuild + +override_dh_installman: + ./ifupdown2/man/genmanpages.sh ./ifupdown2/man ./man + dh_installman + +override_dh_install: + dh_install + mkdir -p debian/ifupdown2/lib/systemd/system/ + install --mode=644 debian/ifup@.service debian/ifupdown2/lib/systemd/system/ + + +override_dh_systemd_start: + dh_systemd_start --name=networking --no-start + +override_dh_systemd_enable: + dh_systemd_enable --name=networking + +override_dh_compress: + dh_compress -X.py diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9e7c0da --- /dev/null +++ b/debian/watch @@ -0,0 +1 @@ +version=3