Version in base suite: 1.99.0-4.1 Base version: uif_1.99.0-4.1 Target version: uif_1.99.0-4.1+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/u/uif/uif_1.99.0-4.1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/u/uif/uif_1.99.0-4.1+deb12u1.dsc changelog | 9 +++ patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch | 27 ++++++++++ patches/series | 1 3 files changed, 37 insertions(+) diff -Nru uif-1.99.0/debian/changelog uif-1.99.0/debian/changelog --- uif-1.99.0/debian/changelog 2023-01-21 10:11:04.000000000 +0000 +++ uif-1.99.0/debian/changelog 2023-10-15 00:04:10.000000000 +0000 @@ -1,3 +1,12 @@ +uif (1.99.0-4.1+deb12u1) bookworm; urgency=medium + + * debian/patches: + + Add 0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch. + Support VLAN interfaces in config's interfaces{} section. (Closes: + #1053962). + + -- Mike Gabriel Sun, 15 Oct 2023 02:04:10 +0200 + uif (1.99.0-4.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru uif-1.99.0/debian/patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch uif-1.99.0/debian/patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch --- uif-1.99.0/debian/patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch 1970-01-01 00:00:00.000000000 +0000 +++ uif-1.99.0/debian/patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch 2023-10-15 00:03:26.000000000 +0000 @@ -0,0 +1,27 @@ +From d32bd9305be7217eadfffdb1c24c0f8dcdfa9e66 Mon Sep 17 00:00:00 2001 +From: Mike Gabriel +Date: Sat, 14 Oct 2023 23:54:28 +0200 +Subject: [PATCH] uif.pl: Support VLAN interfaces, allow '.' in network + interface names. + +Signed-off-by: Mike Gabriel +--- + uif.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/uif.pl b/uif.pl +index 2cc72b2..d45c61e 100755 +--- a/uif.pl ++++ b/uif.pl +@@ -530,7 +530,7 @@ sub validateData { + $$Interfaces{$key} = resolveHashentries($$Interfaces{$key}, $Interfaces); + } + foreach $key (keys (%$Interfaces)) { +- if (!($$Interfaces{$key} =~ /^[a-zA-Z0-9+ ]+(:\d+)?$/)) { ++ if (!($$Interfaces{$key} =~ /^[\.a-zA-Z0-9+ ]+(:\d+)?$/)) { + die "invalid character in interface definition: $$Interfaces{$key}\n"; + } + } +-- +2.39.2 + diff -Nru uif-1.99.0/debian/patches/series uif-1.99.0/debian/patches/series --- uif-1.99.0/debian/patches/series 2023-01-21 10:11:04.000000000 +0000 +++ uif-1.99.0/debian/patches/series 2023-10-15 00:03:26.000000000 +0000 @@ -1,3 +1,4 @@ 0001_uif.8-Drop-another-now-unused-.Ar-macro.patch 2001_stay-with-iptables-for-now.patch 0002_uif.conf.5-Fix-what-is-section-of-the-uif.conf.5-man.patch +0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch