From 45e6bd201d7ebe10c7145a213f47397a9f8ac336 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Wed, 1 Sep 2021 00:48:20 +1200
Subject: [PATCH] Copy debian/ inside docker and patch as needed

---
 builder/build-deb-inside-docker                | 18 ++++++++++++++++--
 builder/dockerfile.debian_bullseye.deb.build   |  2 ++
 builder/dockerfile.debian_buster.deb.build     |  2 ++
 builder/dockerfile.kali_kali-rolling.deb.build |  2 ++
 ...buntu_bionic+libjpeg-turbo_latest.deb.build |  2 ++
 builder/dockerfile.ubuntu_bionic.deb.build     |  2 ++
 builder/dockerfile.ubuntu_focal.deb.build      |  2 ++
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/builder/build-deb-inside-docker b/builder/build-deb-inside-docker
index 9918cec..a74287c 100755
--- a/builder/build-deb-inside-docker
+++ b/builder/build-deb-inside-docker
@@ -2,7 +2,19 @@
 
 set -e
 
-cd "$(dirname "$0")/.."
+prepare_docker_copy_of_debian_dir_and_cd_to_id() {
+   cd "$(dirname "$0")/.."
+
+   local mounted_src_dir="$PWD"
+   local docker_src_dir="$HOME/src"
+
+   mkdir "$docker_src_dir"
+   cd "$docker_src_dir"
+   cp -a "$mounted_src_dir/debian/" .
+   ln -s "$mounted_src_dir/builder" .
+}
+
+prepare_docker_copy_of_debian_dir_and_cd_to_id
 
 os=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
 os_codename=$(lsb_release -cs)
@@ -10,7 +22,9 @@ os_dir="builder/build/${os_codename}"
 
 if [ "$BUILD_TAG" = "+libjpeg-turbo_latest" ]; then
    echo 'libjpeg 62 libjpeg-turbo (>= 2.1.1)' > debian/shlibs.local
-   trap 'rm -f debian/shlibs.local' EXIT
+
+   debian_revision="$(echo $BUILD_TAG | tr _ -)"
+   sed -i -e "1 s/)/$debian_revision)/p" debian/changelog
 fi
 
 dpkg-buildpackage -us -uc -b
diff --git a/builder/dockerfile.debian_bullseye.deb.build b/builder/dockerfile.debian_bullseye.deb.build
index 732c6a6..98d2281 100644
--- a/builder/dockerfile.debian_bullseye.deb.build
+++ b/builder/dockerfile.debian_bullseye.deb.build
@@ -9,4 +9,6 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
+RUN useradd -m docker -u 1000
+
 USER 1000
diff --git a/builder/dockerfile.debian_buster.deb.build b/builder/dockerfile.debian_buster.deb.build
index 9ca2b88..c9100be 100644
--- a/builder/dockerfile.debian_buster.deb.build
+++ b/builder/dockerfile.debian_buster.deb.build
@@ -9,4 +9,6 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
+RUN useradd -m docker -u 1000
+
 USER 1000
diff --git a/builder/dockerfile.kali_kali-rolling.deb.build b/builder/dockerfile.kali_kali-rolling.deb.build
index 240bd69..96b71cd 100644
--- a/builder/dockerfile.kali_kali-rolling.deb.build
+++ b/builder/dockerfile.kali_kali-rolling.deb.build
@@ -9,4 +9,6 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
+RUN useradd -m docker -u 1000
+
 USER 1000
diff --git a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
index 91104bb..ff0515c 100644
--- a/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
+++ b/builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build
@@ -13,4 +13,6 @@ RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
 ENV LD_LIBRARY_PATH="/opt/libjpeg-turbo/lib64/:$LD_LIBRARY_PATH"
 
+RUN useradd -m docker -u 1000
+
 USER 1000
diff --git a/builder/dockerfile.ubuntu_bionic.deb.build b/builder/dockerfile.ubuntu_bionic.deb.build
index ac48856..13a4e2b 100644
--- a/builder/dockerfile.ubuntu_bionic.deb.build
+++ b/builder/dockerfile.ubuntu_bionic.deb.build
@@ -7,4 +7,6 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
+RUN useradd -m docker -u 1000
+
 USER 1000
diff --git a/builder/dockerfile.ubuntu_focal.deb.build b/builder/dockerfile.ubuntu_focal.deb.build
index 619a93d..456ad7b 100644
--- a/builder/dockerfile.ubuntu_focal.deb.build
+++ b/builder/dockerfile.ubuntu_focal.deb.build
@@ -9,4 +9,6 @@ RUN apt-get update && \
 COPY ./debian/control /tmp
 RUN apt-get update && echo YYY | mk-build-deps --install --remove /tmp/control
 
+RUN useradd -m docker -u 1000
+
 USER 1000