diff options
| -rw-r--r-- | main/abuild/0001-abuild-fix-issue-in-maintainer-check.patch | 73 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 81 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-fix-issue-in-maintainer-check.patch b/main/abuild/0001-abuild-fix-issue-in-maintainer-check.patch new file mode 100644 index 0000000000..f405758324 --- /dev/null +++ b/main/abuild/0001-abuild-fix-issue-in-maintainer-check.patch @@ -0,0 +1,73 @@ +From ac8b0e55cb2bd122624177a35de51eee24f8a9b2 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Wed, 16 Sep 2015 22:58:27 +0200 +Subject: [PATCH] abuild: fix issue in maintainer check + +seems the maintainer variable is not set anymore when building .PKGINFO +--- + abuild.in | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 557775e..fd6fb53 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -210,7 +210,7 @@ default_sanitycheck() { + [ -n "$pkggroup" ] && spell_error pkggroup pkggroups + [ -n "$subpackage" ] && spell_error subpackage subpackages + +- get_maintainer || die "Provide a valid RFC822 maintainer address" ++ check_maintainer || die "Provide a valid RFC822 maintainer address" + + makedepends_has 'g++' && warning "g++ should not be in makedepends" + return 0 +@@ -721,25 +721,24 @@ git_last_commit() { + git log --format=oneline -n 1 "$startdir" | awk '{print $1}' + } + +-# this will try to check for a valid rfc822 address +-check_rfc822() { +- local address="$1" +- case "$address" in +- *[A-Za-z0-9]*\ \<*@*.*\>) ;; +- *) return 1 ;; +- esac +-} +- + get_maintainer() { + if [ -z "$maintainer" ]; then + maintainer=$(awk -F': ' '/\# *Maintainer/ {print $2}' "$APKBUILD") + # remove surrounding whitespace + maintainer=$(echo "$maintainer" | xargs) +- if ! [ -z "$maintainer" ]; then +- check_rfc822 "$maintainer" || return 1 +- else +- warning "No maintainer" +- fi ++ fi ++} ++ ++check_maintainer() { ++ get_maintainer ++ if [ -z "$maintainer" ]; then ++ warning "No maintainer" ++ else ++ # try to check for a valid rfc822 address ++ case "$maintainer" in ++ *[A-Za-z0-9]*\ \<*@*.*\>) ;; ++ *) return 1 ;; ++ esac + fi + } + +@@ -805,6 +804,7 @@ EOF + fi + echo "commit = $last_commit" >> "$pkginfo" + ++ get_maintainer + if [ -n "$maintainer" ]; then + echo "maintainer = $maintainer" >> "$pkginfo" + fi +-- +2.5.2 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index bf311109a2..e3885808d0 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.24.0 _ver=${pkgver%_git*} -pkgrel=4 +pkgrel=5 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -22,6 +22,7 @@ pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-fix-fetch-lock-file-on-nfs.patch 0001-abuild-try-to-validate-maintainer-address.patch + 0001-abuild-fix-issue-in-maintainer-check.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -68,10 +69,13 @@ gems() { md5sums="7821eea872e86a768d881fecce95e934 abuild-2.24.0.tar.xz 3acc92254dbab1799f724394e1d49264 0001-abuild-fix-fetch-lock-file-on-nfs.patch -8b647dd06b617d70250bbb3680aa9f82 0001-abuild-try-to-validate-maintainer-address.patch" +8b647dd06b617d70250bbb3680aa9f82 0001-abuild-try-to-validate-maintainer-address.patch +430baf288b197ef4b5133ac8ba392ccf 0001-abuild-fix-issue-in-maintainer-check.patch" sha256sums="0e0c0c7579c3b8d6668fad9d93a42f3ea18da88679e1a12a178f2676c79e94d6 abuild-2.24.0.tar.xz 3f6d6f315c0531f900d7465abaf5f4bd0bbd59d884b2af363bc0105b0f2b3a95 0001-abuild-fix-fetch-lock-file-on-nfs.patch -fcbdae9a224ed4705614e6c5f220e304e405e92d0a33c5dacca0d82fcf386aec 0001-abuild-try-to-validate-maintainer-address.patch" +fcbdae9a224ed4705614e6c5f220e304e405e92d0a33c5dacca0d82fcf386aec 0001-abuild-try-to-validate-maintainer-address.patch +ba588472ccc0ab86e42fd2f6a0a923cd8aa400f051e8c7acbd23f4d19a3dd93f 0001-abuild-fix-issue-in-maintainer-check.patch" sha512sums="360d0164afed9c61576618d113d738327151c60f1bc1e6246fcf74f97db087ca2effb11a4ae045f1f288063d5311c6dddbe7721b3cbe65d11472b3d2b0f03ef6 abuild-2.24.0.tar.xz 620fbf17f48f2732b7e7fd10f4c02bedae6d0c5c7988cefc8e1f2f233efd49514d08b72a367203c977b11272397e713e7551029f85b0dfc79c55587551600ced 0001-abuild-fix-fetch-lock-file-on-nfs.patch -cf14d49d9ac2d4dadca9687c96ae2fc9ef43c7f86e31706c942cefa508b9c075506194e87b0189970e59261072e8cd523e0ced6d4d932936adb1c2c747b14663 0001-abuild-try-to-validate-maintainer-address.patch" +cf14d49d9ac2d4dadca9687c96ae2fc9ef43c7f86e31706c942cefa508b9c075506194e87b0189970e59261072e8cd523e0ced6d4d932936adb1c2c747b14663 0001-abuild-try-to-validate-maintainer-address.patch +d57fdf1c17b7b201b45bfe6f2362e212cea2a6e1ea586acc20cca301db8bc39c7bc204582d0f6827b715b6d299fc3495bc3530cd461639a3d21e93fda47d0ad9 0001-abuild-fix-issue-in-maintainer-check.patch" |