main/abuild: upgrade to 2.26.0

2 files changed, 5 insertions, 178 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 74fa932e43..aede231179 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=2.25.0_rc1
+pkgver=2.26.0
 _ver=${pkgver%_git*}
-pkgrel=3
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -20,7 +20,6 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems"
 options="suid"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
-	git.patch
 	"
 
 _builddir="$srcdir/$pkgname-$_ver"
@@ -65,9 +64,6 @@ gems() {
 	mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
 }
 
-md5sums="6fd1f7b99247618cbf0ca22b7c6cec1b  abuild-2.25.0_rc1.tar.xz
-2e38fe9b42bc5703e3975354f83d284e  git.patch"
-sha256sums="2addf0e0a518d85669f5a6cbe593ea7d57232d8573acd1a9e322b68e5a14614d  abuild-2.25.0_rc1.tar.xz
-a4e2fb1e2f2d9cea2d0bcc20e807a2ee449f52d8d16a1c2940bf386fc9e633cf  git.patch"
-sha512sums="6dca86b68f57aaa4df0a1401098d2264d33c44380a0186ae3b03784e8f648ac17317d7ce7d3586db45d3d36ca65454fc53e032bd7b58f22f356c937038a991e5  abuild-2.25.0_rc1.tar.xz
-e1163cb00b894b648913431651bb9c1d92697769b77e4748a733e1cfedd399d3212e4c580ed9e9b576c5842b8350c5e521a940adeb14c4bbebb9f93d1405b3a8  git.patch"
+md5sums="063e1862758f43b16c30f296fc2cb1de  abuild-2.26.0.tar.xz"
+sha256sums="8b5be97371f9f8bb3c50779db842affe884caffea954b1524e3d66164c983095  abuild-2.26.0.tar.xz"
+sha512sums="f482552f26a3f980093ee57bb4411770b1af70e18e270898030cf23b368bf6fc5dbaaaeb8ed7b72ffcdc279da04d5ba0d5b5ace06909b5f4df28b8fb3bdaa916  abuild-2.26.0.tar.xz"
diff --git a/main/abuild/git.patch b/main/abuild/git.patch
deleted file mode 100644
index 5a43e4b4fa..0000000000
--- a/main/abuild/git.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/.gitignore b/.gitignore
-index 9018782..ac669f6 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,6 +1,7 @@
- *.tar.bz2
- *.o
- abuild
-+abuild-fetch
- abuild-keygen
- abuild-sign
- abuild-sudo
-diff --git a/abuild.in b/abuild.in
-index 0dd8f9a..1f330b1 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -886,13 +886,14 @@ prepare_trace_rpaths() {
- 
- # search for broken symlinks so we later can pull in proper depends
- prepare_symlinks() {
-+	local target
- 	local dir="${subpkgdir:-$pkgdir}"
- 	options_has "!tracedeps" && return 0
- 	cd "$dir" || return 1
- 	find -type l | while read symlink; do
--		if ! [ -e "$symlink" ]; then
--			echo "$symlink $(readlink $symlink)" \
--				>> "$controldir"/.symlinks
-+		target=$(readlink "$symlink")
-+		if ! [ -e "$dir$(normalize_target_path "$target" "$symlink")" ]; then
-+			echo "$symlink $target" >> "$controldir"/.symlinks
- 		fi
- 	done
- }
-@@ -1076,7 +1077,8 @@ trace_apk_deps() {
- 
- 	echo "# automatically detected:" >> "$dir"/.PKGINFO
- 	if [ -f "$dir"/.provides-so ]; then
--		sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' "$dir"/.provides-so \
-+		sed 's/^\(.*\) \([0-9].*\)/provides = so:\1=\2/' \
-+			"$dir"/.provides-so | sort -u \
- 			>> "$dir"/.PKGINFO
- 	fi
- 	if [ -f "$dir"/.provides-pc ]; then
-@@ -1190,11 +1192,16 @@ scan_shared_objects() {
- 	done > "$controldir"/.needs-so
- }
- 
--# normalize a path string
--normalize_path() {
-+# normalize a symlink target path (1st arg)
-+# Converts a relative path to absolute with respect to the symlink
-+# path (2nd arg).
-+normalize_target_path() {
-+	local path=$1
-+	[ "${path:0:1}" = / ] || path=$(dirname "$2")/$path
-+
- 	local oifs="$IFS" pathstr= i=
- 	IFS='/'
--	set -- $1
-+	set -- $path
- 	for i; do
- 		case "$i" in
- 		"."|"") continue;;
-@@ -1217,10 +1224,7 @@ scan_symlink_targets() {
- 		fi
- 
- 		while read symlink target; do
--			if [ "${target#/}" = "$target" ]; then
--				target="${symlink%/*}/$target"
--			fi
--			targetpath="$datadir"/$(normalize_path "$target")
-+			targetpath=$datadir$(normalize_target_path "$target" "$symlink")
- 			if [ -e "$targetpath" ] || [ -L "$targetpath" ]; then
- 				echo "$name=$pkgver-r$pkgrel" \
- 					>> "$d"/.symlinks-needs
-@@ -1721,14 +1725,12 @@ builddeps() {
- 			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
- 			subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
- 		done
--		hostdeps="$makedepends_host"
--		for i in $depends; do
-+		for i in $depends $makedepends_host; do
- 			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
- 			subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
- 		done
- 	else
--		builddeps="$makedepends"
--		for i in $BUILD_BASE $depends; do
-+		for i in $BUILD_BASE $depends $makedepends; do
- 			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
- 			subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
- 		done
-@@ -1739,15 +1741,21 @@ builddeps() {
- 
- 	# find which deps are missing
- 	for i in $builddeps; do
--		if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
--			error "Conflicting package installed: ${i#\!}"
-+		if [ "${i#\!}" != "$i" ]; then
-+			if $APK info --quiet --installed "${i#\!}"; then
-+				error "Conflicting package installed: ${i#\!}"
-+				return 1
-+			fi
- 		elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
- 			missing="$missing $i"
- 		fi
- 	done
- 	for i in $hostdeps; do
--		if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
--			error "Conflicting package installed: ${i#\!}"
-+		if [ "${i#\!}" != "$i" ]; then
-+			if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
-+				error "Conflicting package installed: ${i#\!}"
-+				return 1
-+			fi
- 		elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
- 			missing="$missing $i"
- 		fi
-@@ -1962,9 +1970,8 @@ post_add() {
- }
- 
- deps() {
--	local builddeps i
--	builddeps="$makedepends"
--	for i in $depends; do
-+	local builddeps= i
-+	for i in $depends $makedepends; do
- 		[ "$pkgname" = "${i%%[<>=]*}" ] && continue
- 		subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
- 	done
-diff --git a/functions.sh.in b/functions.sh.in
-index e9b7280..c128e8d 100644
---- a/functions.sh.in
-+++ b/functions.sh.in
-@@ -6,7 +6,8 @@ program=${0##*/}
- hostspec_to_arch() {
- 	case "$1" in
- 	arm*-*-*-*eabi)		echo "armel" ;;
--	arm*-*-*-*eabihf)	echo "armhf" ;;
-+	armv6*-*-*-*eabihf)	echo "armhf" ;;
-+	armv7*-*-*-*eabihf)	echo "armv7" ;;
- 	i[0-9]86-*-*-*)		echo "x86" ;;
- 	x86_64-*-*-*)		echo "x86_64" ;;
- 	*)			echo "unknown" ;;
-diff --git a/newapkbuild.in b/newapkbuild.in
-index 5ba51fb..a47dcae 100644
---- a/newapkbuild.in
-+++ b/newapkbuild.in
-@@ -45,7 +45,6 @@ build_autotools() {
- 		--prefix=/usr \\
- 		--sysconfdir=/etc \\
- 		--mandir=/usr/share/man \\
--		--infodir=/usr/share/info \\
- 		--localstatedir=/var \\
- 		|| return 1
- 	make || return 1
-@@ -70,10 +69,8 @@ build_cmake() {
- 		-DCMAKE_INSTALL_LIBDIR=lib \\
- 		-DBUILD_SHARED_LIBS=True \\
- 		-DCMAKE_BUILD_TYPE=Release \\
--		-DCMAKE_CXX_COMPILER="\${CXX:-g++}" \\
--		-DCMAKE_C_COMPILER="\${CC:-gcc}" \\
- 		-DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\
--		-DCMAKE_CXX_FLAGS="\$CFLAGS" \\
-+		-DCMAKE_C_FLAGS="\$CFLAGS" \\
- 		${CMAKE_CROSSOPTS} \\
- 		|| return 1
- 	make || return 1