From 0595d723ab1ab695052c2fe765602a525d72cbdb Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Mon, 23 Oct 2017 20:40:32 +0900
Subject: [PATCH] Protect against inconsistent use of / separators in APT paths

As a matter of fact, our own fallback would not even have worked :-(
The `readlink` invocations clean up duplicated and trailing slashes.
---
 scripts-slim/tweak-apt-config | 4 ++--
 scripts/docker-apt-clean      | 6 ++++--
 scripts/remove-apt-lists      | 4 +++-
 scripts/tweak-apt-config      | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/scripts-slim/tweak-apt-config b/scripts-slim/tweak-apt-config
index d69d544..0a9fef9 100644
--- a/scripts-slim/tweak-apt-config
+++ b/scripts-slim/tweak-apt-config
@@ -5,14 +5,14 @@
 # License: GPL-3.0+
 
 DIR=/
-ETC=etc/apt
+ETC=etc/apt/
 PARTS=apt.conf.d
 
 eval $(apt-config shell DIR Dir)
 eval $(apt-config shell ETC Dir::Etc)
 eval $(apt-config shell PARTS Dir::Etc::Parts)
 
-cfg=$DIR$ETC$PARTS
+cfg=$(readlink -f /$DIR/$ETC/$PARTS)
 
 cat > $cfg/docker-recommends <<EOF
 APT::Install-Recommends "false";
diff --git a/scripts/docker-apt-clean b/scripts/docker-apt-clean
index af86fd1..eccb71a 100644
--- a/scripts/docker-apt-clean
+++ b/scripts/docker-apt-clean
@@ -14,5 +14,7 @@ CACHE=var/cache/apt/
 eval $(apt-config shell DIR Dir)
 eval $(apt-config shell CACHE Dir::Cache)
 
-find $DIR$CACHE -type f -name '*.deb' -delete
-find $DIR$CACHE -type f -name '*.bin' -delete
+cache=$(readlink -f /$DIR/$CACHE)
+
+find $cache -type f -name '*.deb' -delete
+find $cache -type f -name '*.bin' -delete
diff --git a/scripts/remove-apt-lists b/scripts/remove-apt-lists
index 6e576f8..6c7c935 100644
--- a/scripts/remove-apt-lists
+++ b/scripts/remove-apt-lists
@@ -14,4 +14,6 @@ STATE=var/lib/apt/
 eval $(apt-config shell DIR Dir)
 eval $(apt-config shell STATE Dir::State)
 
-find $DIR$STATE -type f -name '*_dists_*' -delete
+state=$(readlink -f /$DIR/$STATE)
+
+find $state -type f -name '*_dists_*' -delete
diff --git a/scripts/tweak-apt-config b/scripts/tweak-apt-config
index 3d9e948..93359d9 100644
--- a/scripts/tweak-apt-config
+++ b/scripts/tweak-apt-config
@@ -5,14 +5,14 @@
 # License: GPL-3.0+
 
 DIR=/
-ETC=etc/apt
+ETC=etc/apt/
 PARTS=apt.conf.d
 
 eval $(apt-config shell DIR Dir)
 eval $(apt-config shell ETC Dir::Etc)
 eval $(apt-config shell PARTS Dir::Etc::Parts)
 
-cfg=$DIR$ETC$PARTS
+cfg=$(readlink -f /$DIR/$ETC/$PARTS)
 
 cmd=$(dirname $0)/docker-apt-clean
 cat > $cfg/docker-clean <<EOF