summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 14:03:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 14:03:27 +0000
commit194644b4588d36f0e63c133a2a469ea61ae3d2d7 (patch)
tree22ea3480feeb49547967c19c39990dc9f032c7b4 /debian/patches
parentMerging upstream version 1.5.1. (diff)
downloadmmdebstrap-194644b4588d36f0e63c133a2a469ea61ae3d2d7.tar.xz
mmdebstrap-194644b4588d36f0e63c133a2a469ea61ae3d2d7.zip
Adding debian version 1.5.1-1.debian/1.5.1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-Revert-attempt-diagnosing-skip-tar-in-mknod-failure-.patch61
-rw-r--r--debian/patches/installed_size.patch11
-rw-r--r--debian/patches/series2
3 files changed, 0 insertions, 74 deletions
diff --git a/debian/patches/0001-Revert-attempt-diagnosing-skip-tar-in-mknod-failure-.patch b/debian/patches/0001-Revert-attempt-diagnosing-skip-tar-in-mknod-failure-.patch
deleted file mode 100644
index 4b0b43c..0000000
--- a/debian/patches/0001-Revert-attempt-diagnosing-skip-tar-in-mknod-failure-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 84f80673f40a92b9b5d6c3b5274f25e755b7ff22 Mon Sep 17 00:00:00 2001
-From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
-Date: Wed, 15 May 2024 00:23:56 +0200
-Subject: [PATCH] Revert "attempt diagnosing skip-tar-in-mknod failure 'file
- changed as we read it' using auditd"
-
-This reverts commit 726fc38d1d9e7771e3fbacc218154bc08b364da9.
----
- coverage.txt | 2 +-
- make_mirror.sh | 1 -
- tests/skip-tar-in-mknod | 5 ++---
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/coverage.txt b/coverage.txt
-index dde5b33..c040b8b 100644
---- a/coverage.txt
-+++ b/coverage.txt
-@@ -433,4 +433,4 @@ Test: skip-output-mknod
- Modes: root unshare
-
- Test: skip-tar-in-mknod
--Modes: root
-+Modes: unshare
-diff --git a/make_mirror.sh b/make_mirror.sh
-index 3f8aae4..442b3ce 100755
---- a/make_mirror.sh
-+++ b/make_mirror.sh
-@@ -457,7 +457,6 @@ if [ "$HAVE_QEMU" = "yes" ]; then
- if [ ! -e ./mmdebstrap ]; then
- pkgs="$pkgs,mmdebstrap"
- fi
-- pkgs="$pkgs,auditd"
- arches=$HOSTARCH
- if [ "$RUN_MA_SAME_TESTS" = "yes" ]; then
- case "$HOSTARCH" in
-diff --git a/tests/skip-tar-in-mknod b/tests/skip-tar-in-mknod
-index cc18977..eb3027a 100644
---- a/tests/skip-tar-in-mknod
-+++ b/tests/skip-tar-in-mknod
-@@ -3,7 +3,7 @@ set -eu
- export LC_ALL=C.UTF-8
- export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
-
--#[ {{ MODE }} = "unshare" ]
-+[ {{ MODE }} = "unshare" ]
-
- trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
-
-@@ -22,8 +22,7 @@ fi
- $prefix {{ CMD }} --mode={{ MODE }} --variant=custom \
- --skip=update,setup,cleanup,tar-in/mknod \
- --setup-hook='tar-in ./cache/mmdebstrap-{{ DIST }}-apt.tar /' \
-- --setup-hook='/sbin/auditctl -w "$1" -p wxa -k mykey' \
-- '' /tmp/debian-chroot.tar || /sbin/ausearch --format text -k mykey
-+ '' /tmp/debian-chroot.tar
-
- cmp ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar \
- || diffoscope ./cache/mmdebstrap-{{ DIST }}-apt.tar /tmp/debian-chroot.tar
---
-2.39.2
-
diff --git a/debian/patches/installed_size.patch b/debian/patches/installed_size.patch
deleted file mode 100644
index 9a3b860..0000000
--- a/debian/patches/installed_size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mmdebstrap
-+++ b/mmdebstrap
-@@ -4453,7 +4453,7 @@ sub approx_disk_usage {
- find({ wanted => $scan_installed_size, no_chdir => 1 }, $directory);
-
- # because the above is only a heuristic we add 10% extra for good measure
-- return int($installed_size * 1.1);
-+ return int($installed_size * 1.2);
- }
-
- sub main() {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d31b9c3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-installed_size.patch
-0001-Revert-attempt-diagnosing-skip-tar-in-mknod-failure-.patch