From 85e8fe039f25ed58589fc30874986ee8ae8460e8 Mon Sep 17 00:00:00 2001
From: Nicholas Tsirakis <tsirakisn@ainfosec.com>
Date: Wed, 22 Sep 2021 16:21:56 -0400
Subject: [PATCH] [docker] Add quilt configuration files to container

Two files added to build user $HOME:
* .quiltrc
* oxt-patch.header

Apply patch header by running the following within
a quilt-series directory (applies to current patch):

`quilt header -r < ~/oxt-patch.header`

Note that -r replaces any header that existed before it.
You can use -e to edit the header in your $EDITOR.

Signed-off-by: Nicholas Tsirakis <tsirakisn@ainfosec.com>
---
 Dockerfiles/openxt-buster-oe64               |  4 ++
 Dockerfiles/openxt-oe64                      |  4 ++
 Dockerfiles/root/home/build/.quiltrc         | 21 +++++++++++
 Dockerfiles/root/home/build/oxt-patch.header | 39 ++++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 Dockerfiles/root/home/build/.quiltrc
 create mode 100644 Dockerfiles/root/home/build/oxt-patch.header

diff --git a/Dockerfiles/openxt-buster-oe64 b/Dockerfiles/openxt-buster-oe64
index bfeb2d3..2fc5c79 100644
--- a/Dockerfiles/openxt-buster-oe64
+++ b/Dockerfiles/openxt-buster-oe64
@@ -50,6 +50,10 @@ RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
 
 RUN useradd -Ums /bin/bash -l -p '""' -u $UID $UNAME
 
+# Add quilt config files
+ADD root/home/build/.quiltrc /home/build/.quiltrc
+ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
 ENV LANG en_US.utf8
diff --git a/Dockerfiles/openxt-oe64 b/Dockerfiles/openxt-oe64
index d27fe65..82109d4 100644
--- a/Dockerfiles/openxt-oe64
+++ b/Dockerfiles/openxt-oe64
@@ -47,6 +47,10 @@ RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
 
 RUN useradd -Ums /bin/bash -l -p '""' -G sudo -u $UID $UNAME
 
+# Add quilt config files
+ADD root/home/build/.quiltrc /home/build/.quiltrc
+ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
 ENV LANG en_US.utf8
diff --git a/Dockerfiles/root/home/build/.quiltrc b/Dockerfiles/root/home/build/.quiltrc
new file mode 100644
index 0000000..1a75e15
--- /dev/null
+++ b/Dockerfiles/root/home/build/.quiltrc
@@ -0,0 +1,21 @@
+# Options passed to GNU diff when generating patches
+QUILT_DIFF_OPTS="--show-c-function"
+ 
+# Options passed to GNU patch when applying patches.
+QUILT_PATCH_OPTS="--unified"
+ 
+# Do not include index lines
+QUILT_NO_DIFF_INDEX=1
+# Do not include timestamps
+QUILT_NO_DIFF_TIMESTAMPS=1
+ 
+# Options to pass to commands (QUILT_${COMMAND}_ARGS)
+# Generate a/ b/ patches to cut down on churn
+#QUILT_DIFF_ARGS="--no-timestamps --color=auto -p ab"
+#QUILT_REFRESH_ARGS="--no-timestamps --backup -p ab"
+QUILT_DIFF_ARGS="--color=auto -p ab"
+QUILT_REFRESH_ARGS="--backup -p ab"
+QUILT_PUSH_ARGS="--color=auto"
+QUILT_SERIES_ARGS="--color=auto"
+QUILT_PATCHES_ARGS="--color=auto"
+QUILT_NEW_ARGS="-p ab"
diff --git a/Dockerfiles/root/home/build/oxt-patch.header b/Dockerfiles/root/home/build/oxt-patch.header
new file mode 100644
index 0000000..75ef4a2
--- /dev/null
+++ b/Dockerfiles/root/home/build/oxt-patch.header
@@ -0,0 +1,39 @@
+################################################################################
+SHORT DESCRIPTION:
+################################################################################
+One or two lines...
+ 
+################################################################################
+LONG DESCRIPTION:
+################################################################################
+As many lines as it takes for describe the patch. If this patch is really just
+a port from somewhere else, you can just reference the original patches
+information.
+ 
+################################################################################
+CHANGELOG
+################################################################################
+Original: John Doe, john.doe@buck.com
+Ported: Jane Doe, jane.doe@fawn.com, 8/27/2015
+etc...
+ 
+################################################################################
+REMOVAL
+################################################################################
+If there are conditions where it can be removed, explain them here. If not then
+leave it blank.
+ 
+################################################################################
+UPSTREAM PLAN
+################################################################################
+If there is a plan to upstream it, explain it here. If there is none, leave it
+blank.
+ 
+################################################################################
+INTERNAL DEPENDENCIES
+################################################################################
+Does this patch have dependencies on other patches etc. If not, leave it blank.
+ 
+################################################################################
+PATCHES
+################################################################################