- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add pkgarch to .BUILDINFO
by Robin Broda 03 May '18

03 May '18

Architecture information is required for repro tooling This is a revised version of https://patchwork.archlinux.org/patch/475/ Signed-off-by: Robin Broda <robin(a)broda.me> --- doc/BUILDINFO.5.txt | 3 +++ scripts/makepkg.sh.in | 2 ++ 2 files changed, 5 insertions(+) diff --git a/doc/BUILDINFO.5.txt b/doc/BUILDINFO.5.txt index bac6d49f..a7e6b2e4 100644 --- a/doc/BUILDINFO.5.txt +++ b/doc/BUILDINFO.5.txt @@ -38,6 +38,9 @@ BUILDINFO file format. *pkgver*:: The version of the package including pkgrel and epoch. +*pkgarch*:: + The architecture of the package. + *pkgbuild_sha256sum*:: The sha256sum in hex format of the PKGBUILD used to build the package. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c9111078..17591c4b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -687,6 +687,8 @@ write_buildinfo() { local fullver=$(get_full_version) write_kv_pair "pkgver" "$fullver" + write_kv_pair "pkgarch" "$pkgarch" + local sum="$(sha256sum "${BUILDFILE}")" sum=${sum%% *} write_kv_pair "pkgbuild_sha256sum" $sum -- 2.17.0

1 0

[pacman-dev] [PATCH] libmakepkg: Add missing vim modelines
by Eli Schwartz 03 May '18

03 May '18

This conforms with the rest of the pacman codebase. The modelines appear to have been mistakenly dropped when libmakepkg was separated out into separate files from the original monolithic makepkg script. Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> --- scripts/libmakepkg/integrity.sh.in | 2 ++ scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 ++ scripts/libmakepkg/integrity/generate_signature.sh.in | 2 ++ scripts/libmakepkg/integrity/verify_checksum.sh.in | 2 ++ scripts/libmakepkg/integrity/verify_signature.sh.in | 2 ++ scripts/libmakepkg/lint_package.sh.in | 2 ++ scripts/libmakepkg/lint_package/build_references.sh.in | 2 ++ scripts/libmakepkg/lint_package/dotfiles.sh.in | 2 ++ scripts/libmakepkg/lint_package/file_names.sh.in | 2 ++ scripts/libmakepkg/lint_package/missing_backup.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/backup.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/install.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/options.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/package_function.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 ++ scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 ++ scripts/libmakepkg/source.sh.in | 2 ++ scripts/libmakepkg/source/bzr.sh.in | 2 ++ scripts/libmakepkg/source/file.sh.in | 2 ++ scripts/libmakepkg/source/git.sh.in | 2 ++ scripts/libmakepkg/source/hg.sh.in | 2 ++ scripts/libmakepkg/source/local.sh.in | 2 ++ scripts/libmakepkg/source/svn.sh.in | 2 ++ scripts/libmakepkg/srcinfo.sh.in | 2 ++ scripts/libmakepkg/tidy.sh.in | 2 ++ scripts/libmakepkg/tidy/docs.sh.in | 2 ++ scripts/libmakepkg/tidy/emptydirs.sh.in | 2 ++ scripts/libmakepkg/tidy/libtool.sh.in | 2 ++ scripts/libmakepkg/tidy/purge.sh.in | 2 ++ scripts/libmakepkg/tidy/staticlibs.sh.in | 2 ++ scripts/libmakepkg/tidy/strip.sh.in | 2 ++ scripts/libmakepkg/tidy/zipman.sh.in | 2 ++ scripts/libmakepkg/util.sh.in | 2 ++ scripts/libmakepkg/util/message.sh.in | 2 ++ scripts/libmakepkg/util/option.sh.in | 2 ++ scripts/libmakepkg/util/parseopts.sh.in | 2 ++ scripts/libmakepkg/util/pkgbuild.sh.in | 2 ++ scripts/libmakepkg/util/source.sh.in | 2 ++ scripts/libmakepkg/util/util.sh.in | 2 ++ 51 files changed, 102 insertions(+) diff --git a/scripts/libmakepkg/integrity.sh.in b/scripts/libmakepkg/integrity.sh.in index 3a77ef16..68177884 100644 --- a/scripts/libmakepkg/integrity.sh.in +++ b/scripts/libmakepkg/integrity.sh.in @@ -43,3 +43,5 @@ check_source_integrity() { check_pgpsigs "$@" fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index 902a989e..35dbb7cc 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -100,3 +100,5 @@ generate_checksums() { done done } + +# vim: set noet: diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in index 060ae344..732df131 100644 --- a/scripts/libmakepkg/integrity/generate_signature.sh.in +++ b/scripts/libmakepkg/integrity/generate_signature.sh.in @@ -47,3 +47,5 @@ create_signature() { warning "$(gettext "Failed to sign package file.")" fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/integrity/verify_checksum.sh.in b/scripts/libmakepkg/integrity/verify_checksum.sh.in index 1a11a082..b194b9fe 100644 --- a/scripts/libmakepkg/integrity/verify_checksum.sh.in +++ b/scripts/libmakepkg/integrity/verify_checksum.sh.in @@ -128,3 +128,5 @@ verify_integrity_sums() { return 1 fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index b5577523..2f02b337 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -267,3 +267,5 @@ source_has_signatures() { done return 1 } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_package.sh.in b/scripts/libmakepkg/lint_package.sh.in index ff0894ec..5043dc24 100644 --- a/scripts/libmakepkg/lint_package.sh.in +++ b/scripts/libmakepkg/lint_package.sh.in @@ -46,3 +46,5 @@ lint_package() { done return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_package/build_references.sh.in b/scripts/libmakepkg/lint_package/build_references.sh.in index 9183fce9..29347d2e 100644 --- a/scripts/libmakepkg/lint_package/build_references.sh.in +++ b/scripts/libmakepkg/lint_package/build_references.sh.in @@ -39,3 +39,5 @@ warn_build_references() { done return 0 } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_package/dotfiles.sh.in b/scripts/libmakepkg/lint_package/dotfiles.sh.in index 9842028c..cf6ef749 100644 --- a/scripts/libmakepkg/lint_package/dotfiles.sh.in +++ b/scripts/libmakepkg/lint_package/dotfiles.sh.in @@ -36,3 +36,5 @@ check_dotfiles() { done return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_package/file_names.sh.in b/scripts/libmakepkg/lint_package/file_names.sh.in index 0b8e7a03..657489bd 100644 --- a/scripts/libmakepkg/lint_package/file_names.sh.in +++ b/scripts/libmakepkg/lint_package/file_names.sh.in @@ -40,3 +40,5 @@ lint_file_names() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_package/missing_backup.sh.in b/scripts/libmakepkg/lint_package/missing_backup.sh.in index 934dd12f..bb2f3f3e 100644 --- a/scripts/libmakepkg/lint_package/missing_backup.sh.in +++ b/scripts/libmakepkg/lint_package/missing_backup.sh.in @@ -37,3 +37,5 @@ warn_missing_backup() { done return 0 } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild.sh.in b/scripts/libmakepkg/lint_pkgbuild.sh.in index d3a1a083..c126c662 100644 --- a/scripts/libmakepkg/lint_pkgbuild.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild.sh.in @@ -44,3 +44,5 @@ lint_pkgbuild() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in index ddc2f29e..79377f36 100644 --- a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in @@ -62,3 +62,5 @@ lint_arch() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/backup.sh.in b/scripts/libmakepkg/lint_pkgbuild/backup.sh.in index 5b37b4e9..9ead0a8d 100644 --- a/scripts/libmakepkg/lint_pkgbuild/backup.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/backup.sh.in @@ -49,3 +49,5 @@ lint_backup() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in index 264ea105..d7c5f1ca 100644 --- a/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/changelog.sh.in @@ -45,3 +45,5 @@ lint_changelog() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in b/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in index cc11d975..7c56b77b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/epoch.sh.in @@ -35,3 +35,5 @@ lint_epoch() { return 1 fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/install.sh.in b/scripts/libmakepkg/lint_pkgbuild/install.sh.in index 3e268923..1435ec95 100644 --- a/scripts/libmakepkg/lint_pkgbuild/install.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/install.sh.in @@ -44,3 +44,5 @@ lint_install() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in index f5fdbb90..7fc2d98e 100644 --- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in @@ -62,3 +62,5 @@ lint_optdepends() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/options.sh.in b/scripts/libmakepkg/lint_pkgbuild/options.sh.in index ffcd19e3..d5b0bd48 100644 --- a/scripts/libmakepkg/lint_pkgbuild/options.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/options.sh.in @@ -55,3 +55,5 @@ lint_options() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in index 14398217..f1c97279 100644 --- a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in @@ -49,3 +49,5 @@ lint_package_function() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in index 911e1128..e697d813 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in @@ -48,3 +48,5 @@ lint_pkgbase() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in index 8c09ad5b..64d76d92 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in @@ -42,3 +42,5 @@ lint_pkglist() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index b66eda68..bb749f37 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -60,3 +60,5 @@ lint_pkgname() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in index b5cdfcf1..8c7a9bdd 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in @@ -40,3 +40,5 @@ lint_pkgrel() { return 1 fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 0ec6584c..727f054c 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -49,3 +49,5 @@ lint_pkgver() { check_pkgver $pkgver } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in index f521d0f5..ab3cd9b0 100644 --- a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in @@ -60,3 +60,5 @@ lint_provides() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/source.sh.in b/scripts/libmakepkg/lint_pkgbuild/source.sh.in index 052b9d54..c9cbe9f3 100644 --- a/scripts/libmakepkg/lint_pkgbuild/source.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/source.sh.in @@ -37,3 +37,5 @@ lint_source() { return 1 fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/util.sh.in b/scripts/libmakepkg/lint_pkgbuild/util.sh.in index e8a35933..1eb1eb74 100644 --- a/scripts/libmakepkg/lint_pkgbuild/util.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/util.sh.in @@ -39,3 +39,5 @@ check_files_exist() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1e749638..78df84a5 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -105,3 +105,5 @@ lint_variable() { return $ret } + +# vim: set noet: diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index 234e35e4..42e70d67 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -111,3 +111,5 @@ extract_sources() { esac done } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/bzr.sh.in b/scripts/libmakepkg/source/bzr.sh.in index 97206714..69529f4b 100644 --- a/scripts/libmakepkg/source/bzr.sh.in +++ b/scripts/libmakepkg/source/bzr.sh.in @@ -104,3 +104,5 @@ extract_bzr() { popd &>/dev/null } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 1d85ea9b..5e724249 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -145,3 +145,5 @@ extract_file() { chown -R 0:0 "$srcdir" fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 6d7e0a67..8129a717 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -120,3 +120,5 @@ extract_git() { popd &>/dev/null } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in index 4e6ebad9..6a3e863d 100644 --- a/scripts/libmakepkg/source/hg.sh.in +++ b/scripts/libmakepkg/source/hg.sh.in @@ -102,3 +102,5 @@ extract_hg() { popd &>/dev/null } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/local.sh.in b/scripts/libmakepkg/source/local.sh.in index 8104141a..bfb93f8e 100644 --- a/scripts/libmakepkg/source/local.sh.in +++ b/scripts/libmakepkg/source/local.sh.in @@ -40,3 +40,5 @@ download_local() { exit 1 # $E_MISSING_FILE fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/source/svn.sh.in b/scripts/libmakepkg/source/svn.sh.in index 6cb78235..2fafadfe 100644 --- a/scripts/libmakepkg/source/svn.sh.in +++ b/scripts/libmakepkg/source/svn.sh.in @@ -91,3 +91,5 @@ extract_svn() { cp -au "$dir" "$srcdir" } + +# vim: set noet: diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in index 99f5628a..f627f88d 100644 --- a/scripts/libmakepkg/srcinfo.sh.in +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -125,3 +125,5 @@ write_srcinfo() { write_srcinfo_header write_srcinfo_content } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy.sh.in b/scripts/libmakepkg/tidy.sh.in index 856f2394..ce7d879d 100644 --- a/scripts/libmakepkg/tidy.sh.in +++ b/scripts/libmakepkg/tidy.sh.in @@ -50,3 +50,5 @@ tidy_install() { $func done } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/docs.sh.in b/scripts/libmakepkg/tidy/docs.sh.in index 0919f201..31617c81 100644 --- a/scripts/libmakepkg/tidy/docs.sh.in +++ b/scripts/libmakepkg/tidy/docs.sh.in @@ -35,3 +35,5 @@ tidy_docs() { rm -rf -- ${DOC_DIRS[@]} fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in index 2b16afdf..9acf7f0f 100644 --- a/scripts/libmakepkg/tidy/emptydirs.sh.in +++ b/scripts/libmakepkg/tidy/emptydirs.sh.in @@ -37,3 +37,5 @@ tidy_emptydirs() { find . -depth -type d -exec rmdir '{}' \; 2>/dev/null fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/libtool.sh.in b/scripts/libmakepkg/tidy/libtool.sh.in index b844c792..3690e7bc 100644 --- a/scripts/libmakepkg/tidy/libtool.sh.in +++ b/scripts/libmakepkg/tidy/libtool.sh.in @@ -36,3 +36,5 @@ tidy_libtool() { find . ! -type d -name "*.la" -exec rm -f -- '{}' + fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/purge.sh.in b/scripts/libmakepkg/tidy/purge.sh.in index 5d37ded5..9c32e34d 100644 --- a/scripts/libmakepkg/tidy/purge.sh.in +++ b/scripts/libmakepkg/tidy/purge.sh.in @@ -43,3 +43,5 @@ tidy_purge() { done fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/staticlibs.sh.in b/scripts/libmakepkg/tidy/staticlibs.sh.in index 643932dd..df0bb4ed 100644 --- a/scripts/libmakepkg/tidy/staticlibs.sh.in +++ b/scripts/libmakepkg/tidy/staticlibs.sh.in @@ -41,3 +41,5 @@ tidy_staticlibs() { done < <(find . ! -type d -name "*.a" -print0) fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 76562808..29218c4d 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -134,3 +134,5 @@ tidy_strip() { done fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/tidy/zipman.sh.in b/scripts/libmakepkg/tidy/zipman.sh.in index ff82d43c..ca30118a 100644 --- a/scripts/libmakepkg/tidy/zipman.sh.in +++ b/scripts/libmakepkg/tidy/zipman.sh.in @@ -59,3 +59,5 @@ tidy_zipman() { -exec @INODECMD@ '{}' + 2>/dev/null) fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/util.sh.in b/scripts/libmakepkg/util.sh.in index b7b56d34..7c8f9c98 100644 --- a/scripts/libmakepkg/util.sh.in +++ b/scripts/libmakepkg/util.sh.in @@ -26,3 +26,5 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} for lib in "$LIBRARY/util/"*.sh; do source "$lib" done + +# vim: set noet: diff --git a/scripts/libmakepkg/util/message.sh.in b/scripts/libmakepkg/util/message.sh.in index 33808de7..49ce025d 100644 --- a/scripts/libmakepkg/util/message.sh.in +++ b/scripts/libmakepkg/util/message.sh.in @@ -67,3 +67,5 @@ error() { local mesg=$1; shift printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } + +# vim: set noet: diff --git a/scripts/libmakepkg/util/option.sh.in b/scripts/libmakepkg/util/option.sh.in index 8cf0039b..2892cdfb 100644 --- a/scripts/libmakepkg/util/option.sh.in +++ b/scripts/libmakepkg/util/option.sh.in @@ -140,3 +140,5 @@ check_buildoption() { # not found return 127 } + +# vim: set noet: diff --git a/scripts/libmakepkg/util/parseopts.sh.in b/scripts/libmakepkg/util/parseopts.sh.in index a7638cf1..bd018cc8 100644 --- a/scripts/libmakepkg/util/parseopts.sh.in +++ b/scripts/libmakepkg/util/parseopts.sh.in @@ -171,3 +171,5 @@ parseopts() { return 0 } + +# vim: set noet: diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2a4bd3af..7f431394 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -218,3 +218,5 @@ get_integlist() { printf "%s\n" "${INTEGRITY_CHECK[@]}" fi } + +# vim: set noet: diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index 238d1f58..aeeca00a 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -169,3 +169,5 @@ get_downloadclient() { printf "%s\n" "$agent" } + +# vim: set noet: diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index d676249d..45070bea 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -83,3 +83,5 @@ cd_safe() { exit 1 fi } + +# vim: set noet: -- 2.11.0

4 8

[pacman-dev] [PATCH] libmakepkg: don't save/set/restore extglob in bash [[ tests
by Eli Schwartz 02 May '18

02 May '18

Since bash 4.1 extglobs can be used within [[ ... ]] regardless of whether the shopt is set. Our configure.ac requires bash 4.1.0 at a minimum for pacman scripts. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/util/util.sh.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index f9af5f32..c2f9c624 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -42,15 +42,10 @@ is_array() { local v=$1 local ret=1 - # this function requires extglob - save current options to restore later - local shellopts=$(shopt -p) - shopt -s extglob - if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then ret=0 fi - eval "$shellopts" return $ret } -- 2.17.0

1 0

[pacman-dev] [PATCH] remove unneeded break argument from option parsing
by Rafael Ascensão 01 May '18

01 May '18

Some scripts are using `break 2` to break out of the option parsing loop. Since a single `break` is sufficient in these cases, remove the extra argument. Signed-off-by: Rafael Ascensão <rafa.almas(a)gmail.com> --- Greetings, This is just a small patch meant to remove some unnecessary noise from the option parsing loop. The lines are not technically wrong but may cause some confusion or wonder why they exist in the first place. Thanks for spending your time on my first contribution to an official Arch Linux project! scripts/libmakepkg/source.sh.in | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index 02bb16f5..5d7df732 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -48,7 +48,7 @@ download_sources() { get_vcs=0 ;; *) - break 2 + break ;; esac shift diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eee8a56c..be80cc0e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1277,7 +1277,7 @@ while true; do -h|--help) usage; exit $E_OK ;; -V|--version) version; exit $E_OK ;; - --) OPT_IND=0; shift; break 2;; + --) OPT_IND=0; shift; break ;; esac shift done diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 9d447cbc..a529dadd 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -103,7 +103,7 @@ while true; do -h|--help) usage; exit 0 ;; --nocolor) USE_COLOR='n' ;; -V|--version) version; exit 0 ;; - -- ) shift; break 2 ;; + --) shift; break ;; esac shift done diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 060d8369..01e0bd5e 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -557,7 +557,7 @@ while (( $# )); do -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; - --) shift; break 2 ;; + --) shift; break ;; esac shift done diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 4500dd75..316d6395 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -202,7 +202,7 @@ while :; do shift ;; --) shift - break 2 ;; + break ;; esac shift done -- 2.17.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-257-g77986af9
by Allan McRae 29 Apr '18

29 Apr '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 77986af9b7ae9b2cc701a30bcc1cac51b6f1b5be (commit) via c3402ab44e71139402930da0809d2e4df67fb9aa (commit) via 4d1e27957ddb71d2f192018062ab350e318590a4 (commit) via 254a8e2e05f5ffffdaa5ae21d1c6b32375df9061 (commit) via 6018063ef6ee074309b78acfaa6c79e7cccb4f8e (commit) from ab7393c53edb3a399751aa41b5c8693157ae0aa3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 77986af9b7ae9b2cc701a30bcc1cac51b6f1b5be Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 23:14:13 2018 +1000 makepkg: Fix listing of uninstalled deps Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c3402ab44e71139402930da0809d2e4df67fb9aa Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 30 00:20:01 2018 +1000 add missing newline to error message Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d1e27957ddb71d2f192018062ab350e318590a4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 23:56:07 2018 +1000 Initial translation preparation for pacman-5.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 254a8e2e05f5ffffdaa5ae21d1c6b32375df9061 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 23:43:07 2018 +1000 Import updated translations from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6018063ef6ee074309b78acfaa6c79e7cccb4f8e Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 29 22:42:36 2018 +1000 Update POTFILES.in Add all files to the relevant POTFILES.in. This avoids missing translations added to old files. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/POTFILES.in | 7 +- lib/libalpm/po/ar.po | 366 +++++--- lib/libalpm/po/ast.po | 139 +-- lib/libalpm/po/bg.po | 152 ++-- lib/libalpm/po/br.po | 360 +++++--- lib/libalpm/po/ca.po | 392 ++++++--- lib/libalpm/po/cs.po | 361 +++++--- lib/libalpm/po/da.po | 361 +++++--- lib/libalpm/po/de.po | 363 +++++--- lib/libalpm/po/el.po | 362 +++++--- lib/libalpm/po/en_GB.po | 360 +++++--- lib/libalpm/po/eo.po | 361 +++++--- lib/libalpm/po/es.po | 386 ++++++--- lib/libalpm/po/es_419.po | 367 +++++--- lib/libalpm/po/eu.po | 135 +-- lib/libalpm/po/{eu.po => eu_ES.po} | 415 ++++++--- lib/libalpm/po/fi.po | 363 +++++--- lib/libalpm/po/fr.po | 491 +++++++---- lib/libalpm/po/gl.po | 360 +++++--- lib/libalpm/po/hr.po | 475 +++++++---- lib/libalpm/po/hu.po | 385 ++++++--- lib/libalpm/po/id.po | 364 +++++--- lib/libalpm/po/is.po | 360 +++++--- lib/libalpm/po/it.po | 360 +++++--- lib/libalpm/po/ja.po | 362 +++++--- lib/libalpm/po/ka.po | 360 +++++--- lib/libalpm/po/kk.po | 360 +++++--- lib/libalpm/po/ko.po | 363 +++++--- lib/libalpm/po/libalpm.pot | 356 +++++--- lib/libalpm/po/lt.po | 362 +++++--- lib/libalpm/po/nb.po | 385 ++++++--- lib/libalpm/po/nl.po | 360 +++++--- lib/libalpm/po/pl.po | 376 ++++++--- lib/libalpm/po/pt.po | 362 +++++--- lib/libalpm/po/pt_BR.po | 360 +++++--- lib/libalpm/po/ro.po | 360 +++++--- lib/libalpm/po/ru.po | 366 +++++--- lib/libalpm/po/sk.po | 363 +++++--- lib/libalpm/po/sl.po | 363 +++++--- lib/libalpm/po/sr.po | 360 +++++--- lib%2Flibalpm%2Fpo%2Fsr(a)latin.po | 362 +++++--- lib/libalpm/po/sv.po | 370 +++++--- lib/libalpm/po/tr.po | 365 +++++--- lib/libalpm/po/uk.po | 362 +++++--- lib/libalpm/po/ur.po | 133 +-- lib/libalpm/po/uz.po | 136 +-- lib/libalpm/po/vi.po | 133 +-- lib/libalpm/po/zh_CN.po | 373 ++++++--- lib/libalpm/po/zh_TW.po | 459 ++++++---- lib/libalpm/signing.c | 2 +- scripts/makepkg.sh.in | 2 +- scripts/po/LINGUAS | 1 + scripts/po/POTFILES.in | 16 + scripts/po/ar.po | 1091 ++++++++++++------------ scripts/po/ast.po | 374 ++++----- scripts/po/az_AZ.po | 1040 +++++++++++------------ scripts/po/bg.po | 687 +++++++-------- scripts/po/br.po | 1190 +++++++++++++------------- scripts/po/ca.po | 1344 ++++++++++++++--------------- scripts/po/cs.po | 1175 +++++++++++++------------- scripts/po/da.po | 1198 +++++++++++++------------- scripts/po/de.po | 1229 ++++++++++++++------------- scripts/po/el.po | 1191 +++++++++++++------------- scripts/po/en_GB.po | 1179 +++++++++++++------------- scripts/po/eo.po | 1183 +++++++++++++------------- scripts/po/es.po | 1452 ++++++++++++++++---------------- scripts/po/es_419.po | 1269 ++++++++++++++-------------- scripts/po/eu.po | 334 ++++---- scripts/po/{eu.po => eu_ES.po} | 1495 ++++++++++++++++++--------------- scripts/po/fi.po | 1273 ++++++++++++++-------------- scripts/po/fr.po | 1627 ++++++++++++++++++------------------ scripts/po/gl.po | 1211 ++++++++++++++------------- scripts/po/hr.po | 1265 ++++++++++++++-------------- scripts/po/hu.po | 1259 ++++++++++++++-------------- scripts/po/id.po | 1197 +++++++++++++------------- scripts/po/is.po | 1042 +++++++++++------------ scripts/po/it.po | 1201 +++++++++++++------------- scripts/po/ja.po | 1182 +++++++++++++------------- scripts/po/ka.po | 1040 +++++++++++------------ scripts/po/kk.po | 1140 +++++++++++++------------ scripts/po/ko.po | 1194 +++++++++++++------------- scripts/po/lt.po | 1192 +++++++++++++------------- scripts/po/nb.po | 1405 +++++++++++++++---------------- scripts/po/nl.po | 1187 +++++++++++++------------- scripts/po/pacman-scripts.pot | 1036 +++++++++++------------ scripts/po/pl.po | 1277 ++++++++++++++-------------- scripts/po/pt.po | 1229 ++++++++++++++------------- scripts/po/pt_BR.po | 1223 ++++++++++++++------------- scripts/po/ro.po | 1196 +++++++++++++------------- scripts/po/ru.po | 1222 ++++++++++++++------------- scripts/po/sk.po | 1204 +++++++++++++------------- scripts/po/sl.po | 1197 +++++++++++++------------- scripts/po/sr.po | 1184 +++++++++++++------------- scripts%2Fpo%2Fsr(a)latin.po | 1187 +++++++++++++------------- scripts/po/sv.po | 1188 +++++++++++++------------- scripts/po/tr.po | 1212 ++++++++++++++------------- scripts/po/uk.po | 1181 +++++++++++++------------- scripts/po/uz.po | 333 ++++---- scripts/po/zh_CN.po | 1177 +++++++++++++------------- scripts/po/zh_TW.po | 1331 ++++++++++++++--------------- src/pacman/po/LINGUAS | 1 + src/pacman/po/POTFILES.in | 9 + src/pacman/po/ar.po | 571 +++++++------ src/pacman/po/ast.po | 227 ++--- src/pacman/po/az_AZ.po | 572 +++++++------ src/pacman/po/bg.po | 298 +++---- src/pacman/po/br.po | 567 +++++++------ src/pacman/po/ca.po | 680 ++++++++------- src/pacman/po/cs.po | 566 +++++++------ src/pacman/po/da.po | 579 +++++++------ src/pacman/po/de.po | 593 +++++++------ src/pacman/po/el.po | 573 +++++++------ src/pacman/po/en_GB.po | 565 +++++++------ src/pacman/po/eo.po | 580 +++++++------ src/pacman/po/es.po | 666 ++++++++------- src/pacman/po/es_419.po | 649 ++++++++------ src/pacman/po/eu.po | 207 ++--- src/pacman/po/{eu.po => eu_ES.po} | 888 ++++++++++++-------- src/pacman/po/fa.po | 511 ++++++----- src/pacman/po/fi.po | 582 +++++++------ src/pacman/po/fr.po | 915 +++++++++++--------- src/pacman/po/gl.po | 582 +++++++------ src/pacman/po/hr.po | 766 ++++++++++------- src/pacman/po/hu.po | 675 ++++++++------- src/pacman/po/id.po | 567 +++++++------ src/pacman/po/is.po | 520 +++++++----- src/pacman/po/it.po | 605 ++++++++------ src/pacman/po/ja.po | 571 +++++++------ src/pacman/po/ka.po | 522 +++++++----- src/pacman/po/kk.po | 564 +++++++------ src/pacman/po/ko.po | 575 +++++++------ src/pacman/po/lt.po | 574 +++++++------ src/pacman/po/nb.po | 778 +++++++++-------- src/pacman/po/nl.po | 569 +++++++------ src/pacman/po/pacman.pot | 509 ++++++----- src/pacman/po/pl.po | 596 +++++++------ src/pacman/po/pt.po | 582 +++++++------ src/pacman/po/pt_BR.po | 584 +++++++------ src/pacman/po/ro.po | 570 +++++++------ src/pacman/po/ru.po | 585 +++++++------ src/pacman/po/sk.po | 571 +++++++------ src/pacman/po/sl.po | 561 +++++++------ src/pacman/po/sr.po | 569 +++++++------ src%2Fpacman%2Fpo%2Fsr(a)latin.po | 572 +++++++------ src/pacman/po/sv.po | 1101 +++++++++++++----------- src/pacman/po/th.po | 511 ++++++----- src/pacman/po/tr.po | 578 +++++++------ src/pacman/po/uk.po | 585 +++++++------ src/pacman/po/ur.po | 205 ++--- src/pacman/po/uz.po | 208 ++--- src/pacman/po/vi.po | 511 ++++++----- src/pacman/po/zh_CN.po | 616 ++++++++------ src/pacman/po/zh_TW.po | 772 +++++++++-------- 154 files changed, 55922 insertions(+), 44332 deletions(-) copy lib/libalpm/po/{eu.po => eu_ES.po} (70%) copy scripts/po/{eu.po => eu_ES.po} (62%) copy src/pacman/po/{eu.po => eu_ES.po} (68%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] add missing newline to error message
by Allan McRae 29 Apr '18

29 Apr '18

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index e5a294a1..3e37f2f4 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -992,7 +992,7 @@ static size_t length_check(size_t length, size_t position, size_t a, { if( a == 0 || length - position <= a) { _alpm_log(handle, ALPM_LOG_ERROR, - _("%s: signature format error"), identifier); + _("%s: signature format error\n"), identifier); return -1; } else { return 0; -- 2.17.0

1 0

[pacman-dev] [PATCH] makepkg: Fix listing of uninstalled deps
by Allan McRae 29 Apr '18

29 Apr '18

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bc2d0061..eee8a56c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -305,7 +305,7 @@ resolve_deps() { msg "$(gettext "Missing dependencies:")" local dep - for dep in $deplist; do + for dep in ${deplist[@]}; do msg2 "$dep" done -- 2.17.0

1 0

[pacman-dev] pacman-5.1 slushy freeze
by Allan McRae 29 Apr '18

29 Apr '18

Hi all, It is (well beyond) time we made a pacman release. So I am declaring a slushy freeze. What this means is that I will only consider revisions of already reviewed patches for inclusion. New patches (unless fixing a regression from 5.0) will be queued until after 5.1 is released. I will push updated strings to Transifex soon to allow the start of translation of new strings. But note that some minor changes may appear before the final freeze. Any patches not on the master branch but to be included in the 5.1 release need to be brought to my attention ASAP. I will update patchwork and check if I missed something, but it is better to remind me on the mailing list. Thanks, Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-252-gab7393c5
by Allan McRae 29 Apr '18

29 Apr '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via ab7393c53edb3a399751aa41b5c8693157ae0aa3 (commit) via 91b72cc386ca03241791748da5da2b150c724ace (commit) via bcaf1b84ff0f0709d35cd0adb1f13965d1101aeb (commit) from 27f64e378958204314a17b5c5416bd40f47603ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ab7393c53edb3a399751aa41b5c8693157ae0aa3 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 16 18:12:59 2018 -0400 libalpm.pc: migrate to Requires.private pkg-config has built-in dependency handling, but we currently insert the raw $LIBS into libalpm's own linker flags and fail to handle Cflags at all. For dependencies which support pkg-config, simply use that instead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 91b72cc386ca03241791748da5da2b150c724ace Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 3 17:48:14 2018 -0400 libmakepkg/lint_pkgbuild: lint depends/etc. as if they are pkgname depends, provides, conflicts, replaces, and other variables that are meant to contain package names, are now checked to ensure 1) the name component contains only characters that would equate to a valid pkgname. 2) the version component contains only characters that would equate to a valid pkgver. 3) comparison operator is a valid comparison operator (e.g. provides only allows exact = while optdepends doesn't allow anything) This also refactors pkgname into a shared utility function, wires up pkgbase optdepends and provides to use it, and gives pkgver a touchup to allow referencing where it was called from. Fixes FS#57833 and a bit of extra. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bcaf1b84ff0f0709d35cd0adb1f13965d1101aeb Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Mar 19 23:05:21 2018 -0400 libmakepkg/util/pkgbuild.sh: fix missing extglob We use an extended glob here, but were relying on having it globally set in makepkg. This causes it to fail when used in scripts. Since scripts using libmakepkg may not want extglob to be set, save and restore the environment while explicitly setting extglob only where we need it. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +++ lib/libalpm/libalpm.pc.in | 3 +- scripts/Makefile.am | 4 ++ .../{backup.sh.in => checkdepends.sh.in} | 37 ++++++++------- .../{backup.sh.in => conflicts.sh.in} | 37 ++++++++------- .../lint_pkgbuild/{backup.sh.in => depends.sh.in} | 37 ++++++++------- .../{backup.sh.in => makedepends.sh.in} | 37 ++++++++------- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 28 ++---------- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 19 ++------ scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 53 +++++++++++++--------- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 29 +++++------- scripts/libmakepkg/util/pkgbuild.sh.in | 33 ++++++++++++++ 13 files changed, 186 insertions(+), 147 deletions(-) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => checkdepends.sh.in} (52%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => conflicts.sh.in} (53%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => depends.sh.in} (54%) copy scripts/libmakepkg/lint_pkgbuild/{backup.sh.in => makedepends.sh.in} (52%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: lint depends/etc. as if they are pkgname
by Eli Schwartz 29 Apr '18

29 Apr '18

depends, provides, conflicts, replaces, and other variables that are meant to contain package names, are now checked to ensure 1) the name component contains only characters that would equate to a valid pkgname. 2) the version component contains only characters that would equate to a valid pkgver. 3) comparison operator is a valid comparison operator (e.g. provides only allows exact = while optdepends doesn't allow anything) This also refactors pkgname into a shared utility function, wires up pkgbase optdepends and provides to use it, and gives pkgver a touchup to allow referencing where it was called from. Fixes FS#57833 and a bit of extra. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 4 ++ .../{pkgbase.sh.in => checkdepends.sh.in} | 42 +++++++++-------- .../{pkgbase.sh.in => conflicts.sh.in} | 42 +++++++++-------- .../lint_pkgbuild/{pkgbase.sh.in => depends.sh.in} | 42 +++++++++-------- .../{pkgbase.sh.in => makedepends.sh.in} | 42 +++++++++-------- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 28 ++---------- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 19 ++------ scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 53 +++++++++++++--------- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 27 ++++------- scripts/libmakepkg/util/pkgbuild.sh.in | 27 +++++++++++ 11 files changed, 178 insertions(+), 158 deletions(-) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => checkdepends.sh.in} (50%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => conflicts.sh.in} (51%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => depends.sh.in} (53%) copy scripts/libmakepkg/lint_pkgbuild/{pkgbase.sh.in => makedepends.sh.in} (50%) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7fe169b3..17e54eff 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -69,8 +69,12 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_pkgbuild/arch.sh \ libmakepkg/lint_pkgbuild/backup.sh \ libmakepkg/lint_pkgbuild/changelog.sh \ + libmakepkg/lint_pkgbuild/checkdepends.sh \ + libmakepkg/lint_pkgbuild/conflicts.sh \ + libmakepkg/lint_pkgbuild/depends.sh \ libmakepkg/lint_pkgbuild/epoch.sh \ libmakepkg/lint_pkgbuild/install.sh \ + libmakepkg/lint_pkgbuild/makedepends.sh \ libmakepkg/lint_pkgbuild/optdepends.sh \ libmakepkg/lint_pkgbuild/options.sh \ libmakepkg/lint_pkgbuild/package_function.sh \ diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in similarity index 50% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in index b2f7af04..2f4aae1a 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# checkdepends.sh - Check the 'checkdepends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_CHECKDEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_checkdepends') -lint_pkgbase() { - local ret=0 +lint_checkdepends() { + local checkdepends_list checkdepend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes checkdepends checkdepends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for checkdepend in "${checkdepends_list[@]}"; do + name=${checkdepend%%@(<|>|=|>=|<=)*} + ver=${checkdepend#*@(<|>|=|>=|<=)} + lint_one_pkgname checkdepends "$name" || ret=1 + check_pkgver "$ver" checkdepends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in similarity index 51% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in index b2f7af04..19dfefd5 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# conflicts.sh - Check the 'conflicts' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_CONFLICTS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_conflicts') -lint_pkgbase() { - local ret=0 +lint_conflicts() { + local conflicts_list conflict name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes conflicts conflicts_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for conflict in "${conflicts_list[@]}"; do + name=${conflict%%@(<|>|=|>=|<=)*} + ver=${conflict#*@(<|>|=|>=|<=)} + lint_one_pkgname conflicts "$name" || ret=1 + check_pkgver "$ver" conflicts || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in similarity index 53% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/depends.sh.in index b2f7af04..9154dcca 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# depends.sh - Check the 'depends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_DEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_depends') -lint_pkgbase() { - local ret=0 +lint_depends() { + local depends_list depend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes depends depends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for depend in "${depends_list[@]}"; do + name=${depend%%@(<|>|=|>=|<=)*} + ver=${depend#*@(<|>|=|>=|<=)} + lint_one_pkgname depends "$name" || ret=1 + check_pkgver "$ver" depends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in similarity index 50% copy from scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in copy to scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in index b2f7af04..b461d673 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pkgbase.sh - Check the 'pkgbase' variable conforms to requirements. +# makedepends.sh - Check the 'makedepends' array conforms to requirements. # # Copyright (c) 2014-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # @@ -18,33 +18,37 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH" ]] && return -LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 +[[ -n "$LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_MAKEDEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" -lint_pkgbuild_functions+=('lint_pkgbase') +lint_pkgbuild_functions+=('lint_makedepends') -lint_pkgbase() { - local ret=0 +lint_makedepends() { + local makedepends_list makedepend name ver ret=0 - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi + get_pkgbuild_all_split_attributes makedepends makedepends_list + + # save our shell options and turn on extglob + local shellopts=$(shopt -p) + shopt -s extglob + + for makedepend in "${makedepends_list[@]}"; do + name=${makedepend%%@(<|>|=|>=|<=)*} + ver=${makedepend#*@(<|>|=|>=|<=)} + lint_one_pkgname makedepends "$name" || ret=1 + check_pkgver "$ver" makedepends || ret=1 + done + + eval "$shellopts" return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in index 7758334c..87e561cb 100644 --- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in @@ -33,31 +33,13 @@ lint_pkgbuild_functions+=('lint_optdepends') lint_optdepends() { local a list name optdepends_list ret=0 - optdepends_list=("${optdepends[@]}") - for a in "${arch[@]}"; do - array_build list "optdepends_$a" - optdepends_list+=("${list[@]}") - done - - for name in "${pkgname[@]}"; do - if extract_function_variable "package_$name" optdepends 1 list; then - optdepends_list+=("${list[@]}") - fi + local optdepends_list optdepend name ret=0 - for a in "${arch[@]}"; do - if extract_function_variable "package_$name" "optdepends_$a" 1 list; then - optdepends_list+=("${list[@]}") - fi - done - done + get_pkgbuild_all_split_attributes optdepends optdepends_list - for name in "${optdepends_list[@]}"; do - local pkg=${name%%:[[:space:]]*} - # the '-' character _must_ be first or last in the character range - if [[ $pkg != +([-[:alnum:]><=.+_:]) ]]; then - error "$(gettext "Invalid syntax for %s: '%s'")" "optdepend" "$name" - ret=1 - fi + for optdepend in "${optdepends_list[@]}"; do + name=${optdepend%%:[[:space:]]*} + lint_one_pkgname optdepends "$name" || ret=1 done return $ret diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in index b2f7af04..b012b226 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in @@ -23,6 +23,7 @@ LIBMAKEPKG_LINT_PKGBUILD_PKGBASE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" source "$LIBRARY/util/message.sh" @@ -30,21 +31,9 @@ lint_pkgbuild_functions+=('lint_pkgbase') lint_pkgbase() { - local ret=0 - - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - return 1 - fi - if [[ ${pkgbase:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgbase" - ret=1 - fi - if [[ $pkgbase = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgbase' "${i//[[:alnum:]+_.@-]}" - ret=1 + if [[ -z $pkgbase ]]; then + return 0 fi - return $ret + lint_one_pkgname "pkgbase" "$pkgbase" } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index 4024253e..d51c6313 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -29,34 +29,43 @@ source "$LIBRARY/util/message.sh" lint_pkgbuild_functions+=('lint_pkgname') +lint_one_pkgname() { + local type=$1 name=$2 ret=0 + + + if [[ -z $name ]]; then + error "$(gettext "%s is not allowed to be empty.")" "$type" + ret=1 + continue + fi + if [[ ${name:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "$type" + ret=1 + fi + if [[ ${name:0:1} = "." ]]; then + error "$(gettext "%s is not allowed to start with a dot.")" "$type" + ret=1 + fi + if [[ $name = *[^[:alnum:]+_.@-]* ]]; then + error "$(gettext "%s contains invalid characters: '%s'")" \ + "$type" "${name//[[:alnum:]+_.@-]}" + ret=1 + fi + + return $ret +} + lint_pkgname() { local ret=0 i if [[ -z ${pkgname[@]} ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" - return 1 + ret=1 + else + for i in "${pkgname[@]}"; do + lint_one_pkgname "pkgname" "$i" || ret=1 + done fi - for i in "${pkgname[@]}"; do - if [[ -z $i ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgname" - ret=1 - continue - fi - if [[ ${i:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" - ret=1 - fi - if [[ ${i:0:1} = "." ]]; then - error "$(gettext "%s is not allowed to start with a dot.")" "pkgname" - ret=1 - fi - if [[ $i = *[^[:alnum:]+_.@-]* ]]; then - error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgname' "${i//[[:alnum:]+_.@-]}" - ret=1 - fi - done - return $ret } diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index b9e2e439..c105212b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -30,13 +30,15 @@ lint_pkgbuild_functions+=('lint_pkgver') check_pkgver() { - if [[ -z $1 ]]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgver" + local ver=$1 type=$2 + + if [[ -z $ver ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgver${type:+ in $type}" return 1 fi - if [[ $1 = *[[:space:]/:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver" + if [[ $ver = *[[:space:]/:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver${type:+ in $type}" return 1 fi } diff --git a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in index c2407dc0..e9961c1c 100644 --- a/scripts/libmakepkg/lint_pkgbuild/provides.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/provides.sh.in @@ -23,6 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_PROVIDES_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/pkgname.sh" +source "$LIBRARY/lint_pkgbuild/pkgver.sh" source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" @@ -31,31 +33,20 @@ lint_pkgbuild_functions+=('lint_provides') lint_provides() { - local a list name provides_list ret=0 + local provides_list provide name ver ret=0 - provides_list=("${provides[@]}") - for a in "${arch[@]}"; do - array_build list "provides_$a" - provides_list+=("${list[@]}") - done - - for name in "${pkgname[@]}"; do - if extract_function_variable "package_$name" provides 1 list; then - provides_list+=("${list[@]}") - fi - - for a in "${arch[@]}"; do - if extract_function_variable "package_$name" "provides_$a" 1 list; then - provides_list+=("${list[@]}") - fi - done - done + get_pkgbuild_all_split_attributes provides provides_list for provide in "${provides_list[@]}"; do if [[ $provide == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 + continue fi + name=${provide%%=*} + ver=${provide#*=} + lint_one_pkgname provides "$name" || ret=1 + check_pkgver "$ver" provides || ret=1 done return $ret diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index d35c064b..2db46f1f 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -116,6 +116,33 @@ get_pkgbuild_attribute() { fi } +get_pkgbuild_all_split_attributes() { + local attrname=$1 outputvar=$2 all_list list + + if extract_global_variable "$attrname" 1 list; then + all_list+=("${list[@]}") + fi + for a in "${arch[@]}"; do + if extract_global_variable "${attrname}_$a" 1 list; then + all_list+=("${list[@]}") + fi + done + + for name in "${pkgname[@]}"; do + if extract_function_variable "package_$name" "$attrname" 1 list; then + all_list+=("${list[@]}") + fi + + for a in "${arch[@]}"; do + if extract_function_variable "package_$name" "${attrname}_$a" 1 list; then + all_list+=("${list[@]}") + fi + done + done + + [[ ${all_list[@]} ]] && array_build "$outputvar" all_list +} + ## # usage : get_full_version() # return : full version spec, including epoch (if necessary), pkgver, pkgrel -- 2.16.2

2 2