main/abuild: upgrade to 3.0.0

4 files changed, 3 insertions, 135 deletions

diff --git a/main/abuild/0001-abuild-add-sanitycheck-for-secfixes-comment.patch b/main/abuild/0001-abuild-add-sanitycheck-for-secfixes-comment.patch
deleted file mode 100644
index 12c4aebe91..0000000000
--- a/main/abuild/0001-abuild-add-sanitycheck-for-secfixes-comment.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1efaa3996e7f722ad05d67982b5b3ea78441dd41 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 20 Jul 2017 07:56:11 +0000
-Subject: [PATCH] abuild: add sanitycheck for secfixes comment
-
-The secfixes comment will be parsed and added to alpine-secdb. add
-sanitycheck so we catch errors early.
----
- abuild.in | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/abuild.in b/abuild.in
-index 7cf87e2..53926fc 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -219,6 +219,7 @@ default_sanitycheck() {
- 	check_maintainer || die "Provide a valid RFC822 maintainer address"
- 
- 	check_depends_dev || warning "depends_dev found but no development subpackage found"
-+	check_secfixes_comment || return 1
- 
- 	makedepends_has 'g++' && ! options_has toolchain && warning "g++ should not be in makedepends"
- 	return 0
-@@ -816,6 +817,26 @@ check_maintainer() {
- 	fi
- }
- 
-+check_secfixes_comment() {
-+	local c=$(sed -E -n -e '/^# secfixes:/,/(^[^#]|^$)/p' $APKBUILD | grep '^#')
-+	local invalid=$(echo "$c" \
-+		| grep -v -E '(^# secfixes:|^#  +- [A-Z0-9-]+|^#   [0-9]+.*:$|^#$)')
-+	if [ -z "$invalid" ]; then
-+		return 0
-+	fi
-+
-+	# check if there are tabs
-+	if echo "$invalid" | grep -q $'\t'; then
-+		error "secfixes comment must not have tabs:"
-+		echo "$c" | grep $'\t' >&2
-+		return 1
-+	fi
-+
-+	error "secfixes comment is not valid:"
-+	echo "$invalid" >&2
-+	return 1
-+}
-+
- check_depends_dev() {
- 	if [ -z "$depends_dev" ]; then
- 		return 0
--- 
-2.13.2
-
diff --git a/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch b/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch
deleted file mode 100644
index 362ae60e48..0000000000
--- a/main/abuild/0001-abuild-exit-with-success-if-arch-is-disabled.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1d291c47cd4ace2f97671a464c148ad4a138fce8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 25 Jul 2017 07:06:06 +0000
-Subject: [PATCH] abuild: exit with success if arch is disabled
-
-the set -e made script exit early
----
- abuild.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index f935454..95e7a46 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -2247,8 +2247,7 @@ index() { update_abuildrepo_index; }
- 
- all() {
- 	if ! [ -n "$force" ]; then
--		check_arch
--		if [ $? -ne 0 ]; then
-+		if ! check_arch; then
- 			echo "Package not available for the target architecture ($CARCH). Aborting."
- 			return 0
- 		fi
--- 
-2.13.2
-
diff --git a/main/abuild/0001-abuild-sudo-prevent-forging-of-user-name.patch b/main/abuild/0001-abuild-sudo-prevent-forging-of-user-name.patch
deleted file mode 100644
index bb480634df..0000000000
--- a/main/abuild/0001-abuild-sudo-prevent-forging-of-user-name.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 829a501de758c5226b1aae27ecb0d95bc3b6db6b Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Mon, 17 Jul 2017 21:02:35 +0300
-Subject: [PATCH] abuild-sudo: prevent forging of user name
-
----
- abuild-sudo.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/abuild-sudo.c b/abuild-sudo.c
-index de8eb94..3afd887 100644
---- a/abuild-sudo.c
-+++ b/abuild-sudo.c
-@@ -77,22 +77,19 @@ int main(int argc, const char *argv[])
- 	if (grent == NULL)
- 		errx(1, "%s: Group not found", ABUILD_GROUP);
- 
--	char *name = getlogin();
--	if (name == NULL) {
--		pw = getpwuid(getuid());
--		if (pw)
--			name = pw->pw_name;
--	}
-+	char *name = NULL;
-+	pw = getpwuid(getuid());
-+	if (pw)
-+		name = pw->pw_name;
- 
- 	if (!is_in_group(grent->gr_gid)) {
- 		errx(1, "User %s is not a member of group %s\n",
- 			name ? name : "(unknown)", ABUILD_GROUP);
- 	}
--	if (name) {
--		setenv("USER", name, 1);
--	} else {
-+
-+	if (name == NULL)
- 		warnx("Could not find username for uid %d\n", getuid());
--	}
-+	setenv("USER", name ?: "", 1);
- 
- 	cmd = strrchr(argv[0], '/');
- 	if (cmd)
--- 
-2.9.4
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 95d7d96fa2..370a2933bc 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.0.0_rc4
+pkgver=3.0.0
 _ver=${pkgver%_git*}
-pkgrel=3
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -21,9 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
 options="suid !check"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
-	0001-abuild-add-sanitycheck-for-secfixes-comment.patch
-	0001-abuild-sudo-prevent-forging-of-user-name.patch
-	0001-abuild-exit-with-success-if-arch-is-disabled.patch
 	"
 builddir="$srcdir/$pkgname-$_ver"
 
@@ -70,7 +67,4 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="e3b3827b7c3ebdc5d8ab39b1fc514a3cc0ed75a6d5ebc86c9d986441a7a16c1a3aa11f9840c35aa7f000a593421fdc9804b3608d7247f0b4686ba48cc898846a  abuild-3.0.0_rc4.tar.xz
-94cdfba2c185e96d3a631b36f5b438fd95f90a73b06cbb4afa7864454e05b7c91f6e7a905d7ec73e39fdcf2ab050a7ca59129621dabb39bdc0e2bf2ba38871a0  0001-abuild-add-sanitycheck-for-secfixes-comment.patch
-3b69a3ee4b07d2e7567408d24f41af4076a2a2948ccf2cacf7b6f1f964edf425c8cf49536e2e42c0eac16681d92daea96c10c41a797459a9aba9845d20a841fb  0001-abuild-sudo-prevent-forging-of-user-name.patch
-d805b9883e2b52344981d016c3333add401b167076f8b932d3b4c2b46d3e003d260b203270879808f4429d763c65e2b03ea6a0439037de7f3746255dde988154  0001-abuild-exit-with-success-if-arch-is-disabled.patch"
+sha512sums="109c7a1b2b245ad1729419a00b690c2330d914043440a1d8936f6d72c2043a7ce16522339270f4b8a9875e3df703a49482bb884c54b5b57c046bede8e058ab6d  abuild-3.0.0.tar.xz"