main/abuild: upgrade to 3.5.0_rc2

3 files changed, 3 insertions, 126 deletions

diff --git a/main/abuild/0001-Revert-abuild-make-built-package-reproducible.patch b/main/abuild/0001-Revert-abuild-make-built-package-reproducible.patch
deleted file mode 100644
index dd262541b9..0000000000
--- a/main/abuild/0001-Revert-abuild-make-built-package-reproducible.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 51d9e3bcb9fe99a67059e08d7b6fb6ca6a2b75c2 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 7 Nov 2019 20:41:27 +0000
-Subject: [PATCH] Revert "abuild: make built package reproducible"
-
-The introduction of the --pax-options seems to confuse apk and resulted
-in `BAD archive' errors.
-
-This reverts commit f04a2ee34b28a38c4349ef1f94686a07afce730f.
----
- abuild.in | 14 +++-----------
- 1 file changed, 3 insertions(+), 11 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index ad9f92b..91f9e1d 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1565,11 +1565,7 @@ create_apks() {
- 		# normalize timestamps
- 		find . -exec touch -h -d "@$SOURCE_DATE_EPOCH" {} +
- 
--		tar --xattrs \
--			--format=posix \
--			--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime,delete=mtime \
--			--mtime="@${SOURCE_DATE_EPOCH}" \
--			-f - -c "$@" | abuild-tar --hash | $gzip -n -9 >"$dir"/data.tar.gz
-+		tar --xattrs -f - -c "$@" | abuild-tar --hash | $gzip -9 >"$dir"/data.tar.gz
- 
- 		msg "Create checksum..."
- 		# append the hash for data.tar.gz
-@@ -1579,12 +1575,8 @@ create_apks() {
- 
- 		# control.tar.gz
- 		cd "$dir"
--		tar \
--			--format=posix \
--			--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime,delete=mtime \
--			--mtime="@${SOURCE_DATE_EPOCH}" \
--			-f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
--			| $gzip -n -9 > control.tar.gz
-+		tar -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
-+			| $gzip -9 > control.tar.gz
- 		abuild-sign -q control.tar.gz || exit 1
- 
- 		msg "Create $apk"
--- 
-2.23.0
-
diff --git a/main/abuild/0001-abuild-Fix-abuild-rootbld.patch b/main/abuild/0001-abuild-Fix-abuild-rootbld.patch
deleted file mode 100644
index 18dd4bb36c..0000000000
--- a/main/abuild/0001-abuild-Fix-abuild-rootbld.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 8b1aedeb02..0043fdf2e5 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.5.0_rc1
+pkgver=3.5.0_rc2
 _ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -21,8 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
 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,6 +68,4 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="489198056857246adc7f61ca65e32d62717e872e11e284b83045f66a7b9b026cc6eb8d29215d94cee50a755f3320c1e8c51eca9a9763bd81da985b2f0713e4ee  abuild-3.5.0_rc1.tar.xz
-5778fa633dd55f7b40f4368f75c214aaa234c9240a14255b7d69ee86253b7d480d2458eb8c6d6bf5b6824cb7f785e6d64416efc9639485e65203c17abdbccc8c  0001-Revert-abuild-make-built-package-reproducible.patch
-a5ca8c1ee2f745f5cef36368c6b221f89cbf936e5e84f2fbf794a7aaa80ad6154a6ab74ff3f7a82c1e8703d5957a964ec408c01fb1b17245fa8c7d2e3aec619c  0001-abuild-Fix-abuild-rootbld.patch"
+sha512sums="7c317d75f8fa64ac2a0674873edc937bcd8fb3d322e5cdf10874fe5ec87fec0ebe3a1d29d50e919376b10135d252659372ffb62e08418158146734fd13f46602  abuild-3.5.0_rc2.tar.xz"