diff --git a/main/abuild/0002-repro.patch b/main/abuild/0002-repro.patch new file mode 100644 index 00000000..5ff22013 --- /dev/null +++ b/main/abuild/0002-repro.patch @@ -0,0 +1,53 @@ +From b514a4e56d4d17da53bbe5a2d203f616f9a9f371 Mon Sep 17 00:00:00 2001 +From: kpcyrd +Date: Mon, 2 Dec 2019 18:09:56 +0100 +Subject: [PATCH] abuild: set fixed atime and ctime in tar + +--- + abuild.in | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 5654d8f..644dea8 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1579,7 +1579,11 @@ create_apks() { + # normalize timestamps + find . -exec touch -h -d "@$SOURCE_DATE_EPOCH" {} + + +- tar --xattrs -f - -c "$@" | abuild-tar --hash | $gzip -9 >"$dir"/data.tar.gz ++ tar --xattrs \ ++ --format=posix \ ++ --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \ ++ --mtime="@${SOURCE_DATE_EPOCH}" \ ++ -f - -c "$@" | abuild-tar --hash | $gzip -n -9 >"$dir"/data.tar.gz + + msg "Create checksum..." + # append the hash for data.tar.gz +@@ -1589,8 +1593,12 @@ create_apks() { + + # control.tar.gz + cd "$dir" +- tar -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \ +- | $gzip -9 > control.tar.gz ++ tar \ ++ --format=posix \ ++ --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \ ++ --mtime="@${SOURCE_DATE_EPOCH}" \ ++ -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \ ++ | $gzip -n -9 > control.tar.gz + abuild-sign -q control.tar.gz || exit 1 + + msg "Create $apk" +@@ -1724,7 +1732,7 @@ default_doc() { + fi + done + +- [ $islink -eq 0 ] && $gzip -9 "$name" ++ [ $islink -eq 0 ] && $gzip -n -9 "$name" + done + + rm -f "$subpkgdir/usr/share/info/dir" +-- +2.22.0 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index c8b9a30a..8e91c401 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -22,6 +22,7 @@ options="suid !check" pkggroups="abuild" source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-fix-applying-patches-from-https.patch + 0002-repro.patch " builddir="$srcdir/$pkgname-$_ver" @@ -70,4 +71,5 @@ _rootbld() { } sha512sums="7c317d75f8fa64ac2a0674873edc937bcd8fb3d322e5cdf10874fe5ec87fec0ebe3a1d29d50e919376b10135d252659372ffb62e08418158146734fd13f46602 abuild-3.5.0_rc2.tar.xz -7b565481a85a7094a9f61f39ee44ba3c1f3d5bfeed7a5279c57c14447e94f65b613d56d26d197639ab280745e48c51ff7915fd0570a570d29dd7e2490b298dc7 0001-abuild-fix-applying-patches-from-https.patch" +7b565481a85a7094a9f61f39ee44ba3c1f3d5bfeed7a5279c57c14447e94f65b613d56d26d197639ab280745e48c51ff7915fd0570a570d29dd7e2490b298dc7 0001-abuild-fix-applying-patches-from-https.patch +118ac512588ddee312d6ffa6a257e1c252471433cb97ec32f7d7bf839c4560d8ec9e36f7573109ba56eb7a02fc2262acdd3c785e1008935fac599d73e2fe9930 0002-repro.patch"