main/abuild: fix abuild rootbld

See https://gitlab.alpinelinux.org/alpine/abuild/issues/9978

2 files changed, 75 insertions, 2 deletions

diff --git a/main/abuild/0001-abuild-Fix-abuild-rootbld.patch b/main/abuild/0001-abuild-Fix-abuild-rootbld.patch
new file mode 100644
index 0000000000..18dd4bb36c
--- /dev/null
+++ b/main/abuild/0001-abuild-Fix-abuild-rootbld.patch
@@ -0,0 +1,71 @@
+From 918b7b19206927b416bcc13bcb80a8f7d2c78c41 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 13 Nov 2019 18:15:28 +0100
+Subject: [PATCH] abuild: Fix abuild rootbld
+
+Without this change abuild rootbld would fail with:
+
+        touch: invalid date '@'
+
+Because SOURCE_DATE_EPOCH wasn't set when abuild rootbld was used. This
+is a bug introduced in 71d9d5233b9db3be91510addcb28721545d93185. Instead
+of reverting the aforementioned commit move the SOURCE_DATE_EPOCH
+initialization to a custom function and also call it from the abuild
+rootbld function.
+
+Fixes #9978
+---
+ abuild.in | 26 +++++++++++++++++---------
+ 1 file changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/abuild.in b/abuild.in
+index 91f9e1d..29a87c6 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -104,6 +104,18 @@ want_check() {
+        return 0
+ }
+ 
++set_source_date() {
++       # set time stamp for reproducible builds
++       export ABUILD_LAST_COMMIT="$(git_last_commit)$(git_dirty)"
++       if [ -z "$SOURCE_DATE_EPOCH" ] && [ "${ABUILD_LAST_COMMIT%-dirty}" = "$ABUILD_LAST_COMMIT" ]; then
++               SOURCE_DATE_EPOCH=$(git_last_commit_epoch $ABUILD_LAST_COMMIT)
++       fi
++       if [ -z "$SOURCE_DATE_EPOCH" ]; then
++               SOURCE_DATE_EPOCH=$(date -u "+%s")
++       fi
++       export SOURCE_DATE_EPOCH
++}
++
+ default_cleanup_srcdir() {
+        if options_has "chmod-clean" && test -d "$srcdir"; then
+                chmod -R +w "$srcdir"
+@@ -1601,15 +1613,8 @@ build_abuildrepo() {
+                local _starttime=$(date --utc +%s)
+                msg "Building $repo/$pkgname $pkgver-r$pkgrel (using $program $program_version) started $(date -R)"
+ 
+-               # set time stamp for reproducible builds
+-               export ABUILD_LAST_COMMIT="$(git_last_commit)$(git_dirty)"
+-               if [ -z "$SOURCE_DATE_EPOCH" ] && [ "${ABUILD_LAST_COMMIT%-dirty}" = "$ABUILD_LAST_COMMIT" ]; then
+-                       SOURCE_DATE_EPOCH=$(git_last_commit_epoch $ABUILD_LAST_COMMIT)
+-               fi
+-               if [ -z "$SOURCE_DATE_EPOCH" ]; then
+-                       SOURCE_DATE_EPOCH=$(date -u "+%s")
+-               fi
+-               export SOURCE_DATE_EPOCH
++               # make sure SOURCE_DATE_EPOCH is set
++               set_source_date
+ 
+                for part in sanitycheck builddeps clean fetch unpack prepare mkusers build \
+                                $_check rootpkg; do
+@@ -2159,6 +2164,9 @@ rootbld() {
+        # check early if we have abuild key
+        abuild-sign --installed
+ 
++       # make sure SOURCE_DATE_EPOCH is set
++       set_source_date
++
+        # networking business
+        sanitycheck
+        clean
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index b8c000403e..8b1aedeb02 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=abuild
 pkgver=3.5.0_rc1
 _ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -22,6 +22,7 @@ options="suid !check"
 pkggroups="abuild"
 source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
         0001-Revert-abuild-make-built-package-reproducible.patch
+        0001-abuild-Fix-abuild-rootbld.patch
         "
 
 builddir="$srcdir/$pkgname-$_ver"
@@ -70,4 +71,5 @@ _rootbld() {
 }
 
 sha512sums="489198056857246adc7f61ca65e32d62717e872e11e284b83045f66a7b9b026cc6eb8d29215d94cee50a755f3320c1e8c51eca9a9763bd81da985b2f0713e4ee  abuild-3.5.0_rc1.tar.xz
-5778fa633dd55f7b40f4368f75c214aaa234c9240a14255b7d69ee86253b7d480d2458eb8c6d6bf5b6824cb7f785e6d64416efc9639485e65203c17abdbccc8c  0001-Revert-abuild-make-built-package-reproducible.patch"
+5778fa633dd55f7b40f4368f75c214aaa234c9240a14255b7d69ee86253b7d480d2458eb8c6d6bf5b6824cb7f785e6d64416efc9639485e65203c17abdbccc8c  0001-Revert-abuild-make-built-package-reproducible.patch
+a5ca8c1ee2f745f5cef36368c6b221f89cbf936e5e84f2fbf794a7aaa80ad6154a6ab74ff3f7a82c1e8703d5957a964ec408c01fb1b17245fa8c7d2e3aec619c  0001-abuild-Fix-abuild-rootbld.patch"