Package: release.debian.org Severity: normal Tags: bookworm User: release.debian....@packages.debian.org Usertags: pu X-Debbugs-Cc: u...@packages.debian.org Control: affects -1 + src:uif
Please accept a minor fix for the uif firewall script. With this change, uif now also supports VLAN ethX.Y interface names. [ Reason ] See above. [ Impact ] No VLAN support in uif. [ Tests ] Manually, esp. during development of Debian Edu Router. [ Risks ] Minimal. Only for uif users. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] + * debian/patches: + + Add 0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch. + Support VLAN interfaces in config's interfaces{} section. (Closes: + #1053962). [ Other info ] None.
diff -Nru uif-1.99.0/debian/changelog uif-1.99.0/debian/changelog --- uif-1.99.0/debian/changelog 2023-01-21 11:11:04.000000000 +0100 +++ uif-1.99.0/debian/changelog 2023-10-15 02:04:10.000000000 +0200 @@ -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 <sunwea...@debian.org> 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 01:00:00.000000000 +0100 +++ uif-1.99.0/debian/patches/0003_uif.pl-Support-VLAN-interfaces-allow-.-in-network-in.patch 2023-10-15 02:03:26.000000000 +0200 @@ -0,0 +1,27 @@ +From d32bd9305be7217eadfffdb1c24c0f8dcdfa9e66 Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> +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 <mike.gabr...@das-netzwerkteam.de> +--- + 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 11:11:04.000000000 +0100 +++ uif-1.99.0/debian/patches/series 2023-10-15 02:03:26.000000000 +0200 @@ -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