November 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/1] Split prepare_buildenv() to libmakepkg scripts
by Que Quotion 27 Nov '18

27 Nov '18

From: Que Quotion <quequotion(a)gmail.com> As Eli Schwartz has pointed out: https://lists.archlinux.org/pipermail/pacman-dev/2018-May/022501.html It would be beneficial to makepkg to have this function ported to libmakepkg and split into individual scripts. Supersedes: https://patchwork.archlinux.org/patch/540/ Signed-off-by: Que Quotion <quequotion(a)gmail.com> --- scripts/Makefile.am | 6 ++ scripts/libmakepkg/buildenv.sh.in | 55 ++++++++++++++++++ scripts/libmakepkg/buildenv/buildflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/ccache.sh.in | 45 +++++++++++++++ scripts/libmakepkg/buildenv/distcc.sh.in | 47 +++++++++++++++ scripts/libmakepkg/buildenv/makeflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/meson.build | 20 +++++++ scripts/libmakepkg/meson.build | 1 + scripts/makepkg.sh.in | 60 +------------------- 9 files changed, 243 insertions(+), 59 deletions(-) create mode 100644 scripts/libmakepkg/buildenv.sh.in create mode 100644 scripts/libmakepkg/buildenv/buildflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/ccache.sh.in create mode 100644 scripts/libmakepkg/buildenv/distcc.sh.in create mode 100644 scripts/libmakepkg/buildenv/makeflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/meson.build diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c6b6220e..8e669f71 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ LIBRARY = \ libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ + buildenv \ integrity \ lint_config \ lint_package \ @@ -50,6 +51,11 @@ LIBMAKEPKGDIRS = \ util LIBMAKEPKG_IN = \ + libmakepkg/buildenv.sh \ + libmakepkg/buildenv/buildflags.sh \ + libmakepkg/buildenv/ccache.sh \ + libmakepkg/buildenv/distcc.sh \ + libmakepkg/buildenv/makeflags.sh \ libmakepkg/integrity.sh \ libmakepkg/integrity/generate_checksum.sh \ libmakepkg/integrity/generate_signature.sh \ diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in new file mode 100644 index 00000000..a14a3a9a --- /dev/null +++ b/scripts/libmakepkg/buildenv.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash +# +# buildenv.sh - functions for altering the build environment before +# compiliation +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return +LIBMAKEPKG_BUILDENV_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + + +declare -a build_options + +for lib in "$LIBRARY/buildenv/"*.sh; do + source "$lib" +done + +readonly -a build_options + +prepare_buildenv() { + msg "$(gettext "Preparing build environment...")" + + for func in ${build_options[@]}; do + $func + done + + if check_option "debug" "y"; then + DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + CFLAGS+=" $DEBUG_CFLAGS" + CXXFLAGS+=" $DEBUG_CXXFLAGS" + fi + + # ensure all necessary build variables are exported + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST +} diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in new file mode 100644 index 00000000..fb49a85c --- /dev/null +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# buildflags.sh - Clear user-specified buildflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('buildflags') + +buildflags() { + if check_option "buildflags" "n"; then + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/ccache.sh.in b/scripts/libmakepkg/buildenv/ccache.sh.in new file mode 100644 index 00000000..122033a9 --- /dev/null +++ b/scripts/libmakepkg/buildenv/ccache.sh.in @@ -0,0 +1,45 @@ +#!/usr/bin/bash +# +# ccache.sh - Cache compiliations and recycle them to save time on repititions +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_CCACHE_SH" ]] && return +LIBMAKEPKG_BUILDENV_CCACHE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('ccache') + +local ccache=0 + +ccache() { + if check_buildoption "ccache" "y"; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" + return 1 + fi + + if [ -d /usr/lib/ccache/bin ]; then + export PATH="/usr/lib/ccache/bin:$PATH" + ccache=1 + fi + fi +} diff --git a/scripts/libmakepkg/buildenv/distcc.sh.in b/scripts/libmakepkg/buildenv/distcc.sh.in new file mode 100644 index 00000000..f7580705 --- /dev/null +++ b/scripts/libmakepkg/buildenv/distcc.sh.in @@ -0,0 +1,47 @@ +#!/usr/bin/bash +# +# distcc.sh - Distribute compliation to reduce compilation time +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_DISTCC_SH" ]] && return +LIBMAKEPKG_BUILDENV_DISTCC_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('distcc') + +distcc() { + if check_buildoption "distcc" "y"; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + return 1 + fi + + if (( ccache )); then + export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + export CCACHE_BASEDIR="$srcdir" + elif [[ -d /usr/lib/distcc/bin ]]; then + export PATH="/usr/lib/distcc/bin:$PATH" + fi + + export DISTCC_HOSTS + fi +} diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in new file mode 100644 index 00000000..53ac1e4c --- /dev/null +++ b/scripts/libmakepkg/buildenv/makeflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# makeflags.sh - Clear user-specified makeflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('makeflags') + +makeflags() { + if check_option "makeflags" "n"; then + unset MAKEFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build new file mode 100644 index 00000000..e0d07287 --- /dev/null +++ b/scripts/libmakepkg/buildenv/meson.build @@ -0,0 +1,20 @@ +libmakepkg_module = 'buildenv' + +sources = [ + 'buildflags.sh.in', + 'ccache.sh.in', + 'distcc.sh.in', + 'makeflags.sh.in', +] + +foreach src : sources + output_dir = join_paths(get_option('datadir'), 'makepkg', libmakepkg_module) + + custom_target( + libmakepkg_module + '_' + src.underscorify(), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : src, + output : '@BASENAME@', + install : true, + install_dir : output_dir) +endforeach diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index 07475b4d..3a487f0d 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -1,4 +1,5 @@ libmakepkg_modules = [ + { 'name' : 'buildenv', 'has_subdir' : true }, { 'name' : 'integrity', 'has_subdir' : true }, { 'name' : 'lint_config', 'has_subdir' : true }, { 'name' : 'lint_package', 'has_subdir' : true }, diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3ac03d11..8ce006fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,11 +48,10 @@ declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -build_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') -readonly -a build_options splitpkg_overrides +readonly -a splitpkg_overrides known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') @@ -380,47 +379,6 @@ source_buildfile() { source_safe "$@" } -prepare_buildenv() { - # clear user-specified buildflags if requested - if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS - fi - - if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - CFLAGS+=" $DEBUG_CFLAGS" - CXXFLAGS+=" $DEBUG_CXXFLAGS" - fi - - # clear user-specified makeflags if requested - if check_option "makeflags" "n"; then - unset MAKEFLAGS - fi - - # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST - - local ccache=0 - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "ccache" "y" && [[ -d /usr/lib/ccache/bin ]]; then - export PATH="/usr/lib/ccache/bin:$PATH" - ccache=1 - fi - - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "distcc" "y"; then - if (( ccache )); then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" - export CCACHE_BASEDIR="$srcdir" - elif [[ -d /usr/lib/distcc/bin ]]; then - export PATH="/usr/lib/distcc/bin:$PATH" - fi - export DISTCC_HOSTS - fi -} - run_function_safe() { local restoretrap restoreshopt @@ -1029,22 +987,6 @@ check_software() { done fi - # distcc - compilation with distcc - if check_buildoption "distcc" "y"; then - if ! type -p distcc >/dev/null; then - error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 - fi - fi - - # ccache - compilation with ccache - if check_buildoption "ccache" "y"; then - if ! type -p ccache >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 - fi - fi - # strip - strip symbols from binaries/libraries if check_option "strip" "y"; then if ! type -p strip >/dev/null; then -- 2.19.1

3 23

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-67-g44cfc095
by Allan McRae 27 Nov '18

27 Nov '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 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (commit) via 61fe73804305a8bbb434cdc245944df5284f1964 (commit) via 3726693612a7ab34a1cd27916a6d65314299812c (commit) via 508b4e3ec0cb3e365942f4dc0626edda4789932b (commit) via 0bb04fa16a82db133dd010478c1256bc8500c5e7 (commit) via d81b5cc2a5193a344fc6f9cbf72d406d5597d85b (commit) via 1aaf95089a971730b1c7bcdf6fd98c0534459b01 (commit) via 926eb345c26690ca93b6483ac949612c9b53e9db (commit) via c41222837d76d550921a70dd95c509537031102c (commit) via 0dd14924424478564321fc681e3f344b53fb7b54 (commit) from de915c4f145d6e985c3c0fdf8fe121b5066d711c (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 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:13 2018 -0800 require actual siglevel for default ALPM_SIG_USE_DEFAULT does not refer to an actual siglevel, rather it indicates that the global default should be used in place of the operation-specific one. Setting this value for the global default itself makes no sense. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 61fe73804305a8bbb434cdc245944df5284f1964 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:12 2018 -0800 always allow explicit empty siglevel for sync dbs An empty siglevel does not do any signature verification which is exactly what we want when compiled without gpg support. This is already allowed in other parts of the codebase and required for the test suite to pass when compiled without gpg support. Fixes: FS#60880 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3726693612a7ab34a1cd27916a6d65314299812c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:11 2018 -0800 add specific error for missing gpg support "wrong or NULL argument passed" is a useless error for end users. Fixes FS#60880. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 508b4e3ec0cb3e365942f4dc0626edda4789932b Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:02 2018 +0900 Split prepare_buildenv() to libmakepkg This opens the door for third parties to provide libmakepkg extentions for the purpose of altering the build environment. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bb04fa16a82db133dd010478c1256bc8500c5e7 Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:00 2018 +0900 Split check_software() to libmakepkg This opens the door for third parties who provide extensions to libmakepkg to supply scripts that confirm the presence of their dependant executables. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d81b5cc2a5193a344fc6f9cbf72d406d5597d85b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 13 23:17:02 2018 -0500 scripts/meson: ensure wrapper scripts are executable commit 1aaf95089a971730b1c7bcdf6fd98c0534459b01 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 18:27:22 2018 -0500 makepkg: if "!buildflags" and "debug" coincide, unset the debug buildflags too If a user has a makepkg.conf policy to enable debug builds, but a PKGBUILD has disabled buildflags, we would unset the *FLAGS but then later append the debug *FLAGS anyway, which would result in some *FLAGS being used, against the wishes of the PKGBUILD author. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 926eb345c26690ca93b6483ac949612c9b53e9db Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 20:00:07 2018 -0400 buildsys: remove size_to_human This was only ever used by paccache, and paccache has since been moved to pacman-contrib. commit c41222837d76d550921a70dd95c509537031102c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 19:58:31 2018 -0400 meson: separate out wrapped from non-wrapped scripts makepkg-template is a perl script and doesn't get wrapped by our shell wrapper. It (wrongly) reads from the host machine rather than the build root, but this is working as implemented. commit 0dd14924424478564321fc681e3f344b53fb7b54 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 27 22:42:13 2018 +1000 Remove Doxyfile from EXTRA_DIST We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 - lib/libalpm/alpm.h | 4 +- lib/libalpm/be_sync.c | 4 +- lib/libalpm/error.c | 3 + lib/libalpm/handle.c | 11 +- scripts/Makefile.am | 21 +- .../{lint_pkgbuild.sh.in => buildenv.sh.in} | 25 ++- .../{tidy/docs.sh.in => buildenv/buildflags.sh.in} | 22 +-- scripts/libmakepkg/buildenv/compiler.sh.in | 55 ++++++ .../{tidy/docs.sh.in => buildenv/debugflags.sh.in} | 25 +-- .../{tidy/docs.sh.in => buildenv/makeflags.sh.in} | 22 +-- .../{lint_config => buildenv}/meson.build | 8 +- .../{lint_config.sh.in => executable.sh.in} | 25 ++- .../{tidy/docs.sh.in => executable/ccache.sh.in} | 24 +-- .../file_names.sh.in => executable/checksum.sh.in} | 32 +-- .../{tidy/docs.sh.in => executable/distcc.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/fakeroot.sh.in} | 24 +-- .../{integrity.sh.in => executable/gpg.sh.in} | 39 ++-- .../{tidy/docs.sh.in => executable/gzip.sh.in} | 24 +-- .../libmakepkg/{tidy => executable}/meson.build | 17 +- .../{tidy/docs.sh.in => executable/pacman.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/strip.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/sudo.sh.in} | 25 ++- scripts/libmakepkg/executable/vcs.sh.in | 109 +++++++++++ scripts/libmakepkg/meson.build | 2 + scripts/library/README | 4 - scripts/library/size_to_human.sh | 22 --- scripts/makepkg.sh.in | 216 +-------------------- scripts/meson.build | 42 ++-- scripts/po/POTFILES.in | 1 - 30 files changed, 419 insertions(+), 460 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild.sh.in => buildenv.sh.in} (64%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/buildflags.sh.in} (63%) create mode 100644 scripts/libmakepkg/buildenv/compiler.sh.in copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/debugflags.sh.in} (57%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/makeflags.sh.in} (63%) copy scripts/libmakepkg/{lint_config => buildenv}/meson.build (74%) copy scripts/libmakepkg/{lint_config.sh.in => executable.sh.in} (66%) mode change 100755 => 100644 copy scripts/libmakepkg/{tidy/docs.sh.in => executable/ccache.sh.in} (61%) copy scripts/libmakepkg/{lint_package/file_names.sh.in => executable/checksum.sh.in} (56%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/distcc.sh.in} (61%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/fakeroot.sh.in} (61%) copy scripts/libmakepkg/{integrity.sh.in => executable/gpg.sh.in} (53%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/gzip.sh.in} (62%) copy scripts/libmakepkg/{tidy => executable}/meson.build (65%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/pacman.sh.in} (60%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/strip.sh.in} (62%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/sudo.sh.in} (60%) create mode 100644 scripts/libmakepkg/executable/vcs.sh.in delete mode 100644 scripts/library/size_to_human.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove Doxyfile from EXTRA_DIST
by Allan McRae 27 Nov '18

27 Nov '18

We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 711921fd..4bb0f01b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -65,7 +65,6 @@ EXTRA_DIST = \ index.asciidoc \ submitting-patches.asciidoc \ translation-help.asciidoc \ - Doxyfile \ $(MANPAGES) \ $(DOXYGEN_MANS) -- 2.19.1

1 0

[pacman-dev] [PATCH 1/3] add specific error for missing gpg support
by Andrew Gregory 27 Nov '18

27 Nov '18

"wrong or NULL argument passed" is a useless error for end users. Fixes FS#60880. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/be_sync.c | 2 +- lib/libalpm/error.c | 3 +++ lib/libalpm/handle.c | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d3d198a..597e11bd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -118,7 +118,9 @@ typedef enum _alpm_errno_t { ALPM_ERR_LIBARCHIVE, ALPM_ERR_LIBCURL, ALPM_ERR_EXTERNAL_DOWNLOAD, - ALPM_ERR_GPGME + ALPM_ERR_GPGME, + /* Missing compile-time features */ + ALPM_ERR_MISSING_CAPABILITY_SIGNATURES } alpm_errno_t; /** Returns the current error code from the handle. */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5009a7da..6adf1cd9 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -788,7 +788,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, #ifndef HAVE_LIBGPGME if(level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, NULL); } #endif diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index b4fc99ae..95be9d7b 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -159,6 +159,9 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("gpgme error"); case ALPM_ERR_EXTERNAL_DOWNLOAD: return _("error invoking external downloader"); + /* Missing compile-time features */ + case ALPM_ERR_MISSING_CAPABILITY_SIGNATURES: + return _("compiled without signature support"); /* Unknown error! */ default: return _("unexpected error"); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2213ce53..be5666dc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -807,7 +807,7 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle, handle->siglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; @@ -827,7 +827,7 @@ int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, handle->localfilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; @@ -851,7 +851,7 @@ int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, handle->remotefilesiglevel = level; #else if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { - RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + RET_ERR(handle, ALPM_ERR_MISSING_CAPABILITY_SIGNATURES, -1); } #endif return 0; -- 2.19.1

2 3

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.1-8-g3a88fcb1
by Andrew Gregory 19 Nov '18

19 Nov '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, release/5.1.x has been updated via 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 (commit) via 2a7bdd3e3aabbf9fa3cc31379cadad909e6c1da3 (commit) via b39a62f57551a2e23ceaa37b3fbc71a2273545e6 (commit) via cad8fe2fbfc3a63554a2537ea7b5627a71453075 (commit) via 0dbb94538770d2ffce3709b5854d1e5e44cfc183 (commit) via 519685e4b1cff3df9bc389550fa6e19ee4ba8794 (commit) via 4fc7c1d41efcce7f85def270c0ce8edca1062fc4 (commit) via 5e81518ecb4ba9c8b7231e9b627f45d3abb19ce3 (commit) from 7e081d2adf8321f25165255fd21fab61d4055a53 (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 3a88fcb19199c5b5fa18162f5f9dc8990311dbd2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 12 19:16:53 2018 -0700 handle EINTR while polling scripts/hooks If poll() is interrupted by a signal, alpm was closing the socket it uses for listening to script/hook output. This would drop script output at the least and kill the script at the worst. Fixes FS#60396 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit ac959bb9c6ce549047a954109ae825158855e386) commit 2a7bdd3e3aabbf9fa3cc31379cadad909e6c1da3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 3 00:42:38 2018 -0700 reset signal handlers before running scripts/hooks Front-ends or libraries may set signals to be ignored, which gets inherited across fork and exec. This can cause scripts to malfunction if they expect the signal. To make matters worse, scripts written in bash can't reset signals that were ignored when bash was started. Fixes FS#56756 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 9886566abb375043740167ce5066f1a186c71176) commit b39a62f57551a2e23ceaa37b3fbc71a2273545e6 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Wed Oct 17 17:11:01 2018 +0200 alpm: Fix SIGINT handling re: aborting download Upon receiving SIGINT a flag is set to abort the (curl) download. However, since it was never reset/initialized, if a front-end doesn't actually exit on SIGINT, and later tries any operation that needs to perform a new download, said download would always get aborted right away due to the flag not having been reset. (cherry picked from commit ffde85aadfe0e08fb710102d0a547335e9d1a200) commit cad8fe2fbfc3a63554a2537ea7b5627a71453075 Author: Olivier Brunel <jjk(a)jjacky.com> Date: Tue Oct 9 18:29:05 2018 +0200 alpm: Do not raise SIGINT when filesize goes over limit Variable dload_interrupted is used both to abort a download because SIGINT was caught, and when a file limit is reached. But raising SIGINT is only meant to happen in the first case. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> (cherry picked from commit d96d0ffe7c88d9521a9e6cdd65939e9a20733cdf) commit 0dbb94538770d2ffce3709b5854d1e5e44cfc183 Author: Michael Straube <straubem(a)gmx.de> Date: Sun Jun 10 18:58:34 2018 +0200 libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST Add a case for curl error 'Could not resolve host'. An attempt to fix FS#48285. Signed-off-by: Michael Straube <straubem(a)gmx.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 9e960d9d5a735bbc7d418f2ad81d3f3e92d99968) commit 519685e4b1cff3df9bc389550fa6e19ee4ba8794 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 4 15:17:54 2018 -0400 libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 2bec380e108536f5e5f728ef66223ed3fabf5ab1) commit 4fc7c1d41efcce7f85def270c0ce8edca1062fc4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 10:08:37 2018 -0400 pacman: check versioned optdepends in -Qi operation Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5) commit 5e81518ecb4ba9c8b7231e9b627f45d3abb19ce3 Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Sep 10 22:41:07 2018 +0100 pacman-conf: add missing DisableDownloadTimeout Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> (cherry picked from commit 62eef5bbdb025d9557a1609760b42d7fbac16ad2) ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 10 ++++++++- lib/libalpm/util.c | 30 +++++++++++++++++++++++++- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- src/pacman/package.c | 2 +- src/pacman/pacman-conf.c | 3 +++ test/pacman/tests/TESTS | 2 ++ test/pacman/tests/scriptlet-signal-handling.py | 15 +++++++++++++ test/pacman/tests/scriptlet-signal-reset.py | 11 ++++++++++ 8 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/scriptlet-signal-handling.py create mode 100644 test/pacman/tests/scriptlet-signal-reset.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] common/ini: remove unnecessary alpm include
by Andrew Gregory 17 Nov '18

17 Nov '18

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/common/ini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 8e646528..30f1fac8 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -19,10 +19,9 @@ #include <errno.h> #include <limits.h> +#include <stdlib.h> #include <string.h> /* strdup */ -#include <alpm.h> - #include "ini.h" #include "util-common.h" -- 2.19.1

1 0

[pacman-dev] [PATCH] add missing tests to meson.build
by Andrew Gregory 17 Nov '18

17 Nov '18

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 90885015..3ad1fcd0 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -158,6 +158,8 @@ pacman_tests = [ 'should_fail': true }, { 'name': 'tests/scriptlet001.py' }, { 'name': 'tests/scriptlet002.py' }, + { 'name': 'tests/scriptlet-signal-handling.py' }, + { 'name': 'tests/scriptlet-signal-reset.py' }, { 'name': 'tests/sign001.py' }, { 'name': 'tests/sign002.py' }, { 'name': 'tests/skip-remove-with-glob-chars.py' }, -- 2.19.1

1 0

[pacman-dev] [PATCH] scripts/meson: ensure wrapper scripts are executable
by Dave Reisner 14 Nov '18

14 Nov '18

--- This is on top of my fixup branch scripts/meson.build | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/scripts/meson.build b/scripts/meson.build index aece7a22..344333be 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -52,21 +52,18 @@ foreach script : wrapped_scripts depend_files : library_files, build_by_default : true) + cdata = configuration_data() + cdata.set_quoted('BASH', BASH.path()) + cdata.set_quoted('BUILDDIR', meson.current_build_dir()) + cdata.set_quoted('REAL_PROGPATH', internal_script.full_path()) + # Create a wrapper script that bootstraps the real script within the build - # directory. - custom_target( - 'wrap_@0@'.format(script_shortname), + # directory. Use configure_file instead of a custom_target to ensure that + # permissions on the input script wrapper are preserved. + configure_file( input : join_paths(meson.source_root(), 'build-aux', 'script-wrapper.sh.in'), output : script_shortname, - build_by_default : true, - command : [ - SED, - '-e', 's,@BASH@,"@0@",'.format(BASH.path()), - '-e', 's,@BUILDDIR@,"@0@",'.format(meson.current_build_dir()), - '-e', 's,@REAL_PROGPATH@,"@0@",'.format(internal_script.full_path()), - '@INPUT@', - ], - capture : true) + configuration : cdata) # Install the real script meson.add_install_script(MESON_INSTALL_SCRIPT, -- 2.19.1

1 0

[pacman-dev] [PATCH 1/5] build-aux: rm annoying and useless file
by Eli Schwartz 14 Nov '18

14 Nov '18

tap-driver.sh is added to the build tree by autoreconf, and contains upstream modifications as such. This results in dirty working trees. It was originally added in commit 403c175dbc84a8198b92bbe76f66eade613cff48 which made the testsuite use automake, but as far as I can tell, never served any purpose. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- build-aux/tap-driver.sh | 652 ---------------------------------------- 1 file changed, 652 deletions(-) delete mode 100755 build-aux/tap-driver.sh diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh deleted file mode 100755 index 19aa531d..00000000 --- a/build-aux/tap-driver.sh +++ /dev/null @@ -1,652 +0,0 @@ -#! /bin/sh -# Copyright (C) 2011-2013 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -scriptversion=2011-12-27.17; # UTC - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -me=tap-driver.sh - -fatal () -{ - echo "$me: fatal: $*" >&2 - exit 1 -} - -usage_error () -{ - echo "$me: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat <<END -Usage: - tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--ignore-exit] - [--diagnostic-string=STRING] [--merge|--no-merge] - [--comments|--no-comments] [--] TEST-COMMAND -The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory. -END -} - -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). -test_name= # Used for reporting. -log_file= # Where to save the result and output of the test script. -trs_file= # Where to save the metadata of the test run. -expect_failure=0 -color_tests=0 -merge=0 -ignore_exit=0 -comments=0 -diag_string='#' -while test $# -gt 0; do - case $1 in - --help) print_usage; exit $?;; - --version) echo "$me $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) shift;; # No-op. - --merge) merge=1;; - --no-merge) merge=0;; - --ignore-exit) ignore_exit=1;; - --comments) comments=1;; - --no-comments) comments=0;; - --diagnostic-string) diag_string=$2; shift;; - --) shift; break;; - -*) usage_error "invalid option: '$1'";; - esac - shift -done - -test $# -gt 0 || usage_error "missing test command" - -case $expect_failure in - yes) expect_failure=1;; - *) expect_failure=0;; -esac - -if test $color_tests = yes; then - init_colors=' - color_map["red"]="[0;31m" # Red. - color_map["grn"]="[0;32m" # Green. - color_map["lgn"]="[1;32m" # Light green. - color_map["blu"]="[1;34m" # Blue. - color_map["mgn"]="[0;35m" # Magenta. - color_map["std"]="[m" # No color. - color_for_result["ERROR"] = "mgn" - color_for_result["PASS"] = "grn" - color_for_result["XPASS"] = "red" - color_for_result["FAIL"] = "red" - color_for_result["XFAIL"] = "lgn" - color_for_result["SKIP"] = "blu"' -else - init_colors='' -fi - -# :; is there to work around a bug in bash 3.2 (and earlier) which -# does not always set '$?' properly on redirection failure. -# See the Autoconf manual for more details. -:;{ - ( - # Ignore common signals (in this subshell only!), to avoid potential - # problems with Korn shells. Some Korn shells are known to propagate - # to themselves signals that have killed a child process they were - # waiting for; this is done at least for SIGINT (and usually only for - # it, in truth). Without the `trap' below, such a behaviour could - # cause a premature exit in the current subshell, e.g., in case the - # test command it runs gets terminated by a SIGINT. Thus, the awk - # script we are piping into would never seen the exit status it - # expects on its last input line (which is displayed below by the - # last `echo $?' statement), and would thus die reporting an internal - # error. - # For more information, see the Autoconf manual and the threads: - # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html> - # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-Februa…> - trap : 1 3 2 13 15 - if test $merge -gt 0; then - exec 2>&1 - else - exec 2>&3 - fi - "$@" - echo $? - ) | LC_ALL=C ${AM_TAP_AWK-awk} \ - -v me="$me" \ - -v test_script_name="$test_name" \ - -v log_file="$log_file" \ - -v trs_file="$trs_file" \ - -v expect_failure="$expect_failure" \ - -v merge="$merge" \ - -v ignore_exit="$ignore_exit" \ - -v comments="$comments" \ - -v diag_string="$diag_string" \ -' -# FIXME: the usages of "cat >&3" below could be optimized when using -# FIXME: GNU awk, and/on on systems that supports /dev/fd/. - -# Implementation note: in what follows, `result_obj` will be an -# associative array that (partly) simulates a TAP result object -# from the `TAP::Parser` perl module. - -## ----------- ## -## FUNCTIONS ## -## ----------- ## - -function fatal(msg) -{ - print me ": " msg | "cat >&2" - exit 1 -} - -function abort(where) -{ - fatal("internal error " where) -} - -# Convert a boolean to a "yes"/"no" string. -function yn(bool) -{ - return bool ? "yes" : "no"; -} - -function add_test_result(result) -{ - if (!test_results_index) - test_results_index = 0 - test_results_list[test_results_index] = result - test_results_index += 1 - test_results_seen[result] = 1; -} - -# Whether the test script should be re-run by "make recheck". -function must_recheck() -{ - for (k in test_results_seen) - if (k != "XFAIL" && k != "PASS" && k != "SKIP") - return 1 - return 0 -} - -# Whether the content of the log file associated to this test should -# be copied into the "global" test-suite.log. -function copy_in_global_log() -{ - for (k in test_results_seen) - if (k != "PASS") - return 1 - return 0 -} - -# FIXME: this can certainly be improved ... -function get_global_test_result() -{ - if ("ERROR" in test_results_seen) - return "ERROR" - if ("FAIL" in test_results_seen || "XPASS" in test_results_seen) - return "FAIL" - all_skipped = 1 - for (k in test_results_seen) - if (k != "SKIP") - all_skipped = 0 - if (all_skipped) - return "SKIP" - return "PASS"; -} - -function stringify_result_obj(result_obj) -{ - if (result_obj["is_unplanned"] || result_obj["number"] != testno) - return "ERROR" - - if (plan_seen == LATE_PLAN) - return "ERROR" - - if (result_obj["directive"] == "TODO") - return result_obj["is_ok"] ? "XPASS" : "XFAIL" - - if (result_obj["directive"] == "SKIP") - return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL; - - if (length(result_obj["directive"])) - abort("in function stringify_result_obj()") - - return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL -} - -function decorate_result(result) -{ - color_name = color_for_result[result] - if (color_name) - return color_map[color_name] "" result "" color_map["std"] - # If we are not using colorized output, or if we do not know how - # to colorize the given result, we should return it unchanged. - return result -} - -function report(result, details) -{ - if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/) - { - msg = ": " test_script_name - add_test_result(result) - } - else if (result == "#") - { - msg = " " test_script_name ":" - } - else - { - abort("in function report()") - } - if (length(details)) - msg = msg " " details - # Output on console might be colorized. - print decorate_result(result) msg - # Log the result in the log file too, to help debugging (this is - # especially true when said result is a TAP error or "Bail out!"). - print result msg | "cat >&3"; -} - -function testsuite_error(error_message) -{ - report("ERROR", "- " error_message) -} - -function handle_tap_result() -{ - details = result_obj["number"]; - if (length(result_obj["description"])) - details = details " " result_obj["description"] - - if (plan_seen == LATE_PLAN) - { - details = details " # AFTER LATE PLAN"; - } - else if (result_obj["is_unplanned"]) - { - details = details " # UNPLANNED"; - } - else if (result_obj["number"] != testno) - { - details = sprintf("%s # OUT-OF-ORDER (expecting %d)", - details, testno); - } - else if (result_obj["directive"]) - { - details = details " # " result_obj["directive"]; - if (length(result_obj["explanation"])) - details = details " " result_obj["explanation"] - } - - report(stringify_result_obj(result_obj), details) -} - -# `skip_reason` should be empty whenever planned > 0. -function handle_tap_plan(planned, skip_reason) -{ - planned += 0 # Avoid getting confused if, say, `planned` is "00" - if (length(skip_reason) && planned > 0) - abort("in function handle_tap_plan()") - if (plan_seen) - { - # Error, only one plan per stream is acceptable. - testsuite_error("multiple test plans") - return; - } - planned_tests = planned - # The TAP plan can come before or after *all* the TAP results; we speak - # respectively of an "early" or a "late" plan. If we see the plan line - # after at least one TAP result has been seen, assume we have a late - # plan; in this case, any further test result seen after the plan will - # be flagged as an error. - plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN) - # If testno > 0, we have an error ("too many tests run") that will be - # automatically dealt with later, so do not worry about it here. If - # $plan_seen is true, we have an error due to a repeated plan, and that - # has already been dealt with above. Otherwise, we have a valid "plan - # with SKIP" specification, and should report it as a particular kind - # of SKIP result. - if (planned == 0 && testno == 0) - { - if (length(skip_reason)) - skip_reason = "- " skip_reason; - report("SKIP", skip_reason); - } -} - -function extract_tap_comment(line) -{ - if (index(line, diag_string) == 1) - { - # Strip leading `diag_string` from `line`. - line = substr(line, length(diag_string) + 1) - # And strip any leading and trailing whitespace left. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - # Return what is left (if any). - return line; - } - return ""; -} - -# When this function is called, we know that line is a TAP result line, -# so that it matches the (perl) RE "^(not )?ok\b". -function setup_result_obj(line) -{ - # Get the result, and remove it from the line. - result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0) - sub("^(not )?ok[ \t]*", "", line) - - # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. - if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) - { - match(line, "^[0-9]+") - # The final `+ 0` is to normalize numbers with leading zeros. - result_obj["number"] = substr(line, 1, RLENGTH) + 0 - line = substr(line, RLENGTH + 1) - } - else - { - result_obj["number"] = testno - } - - if (plan_seen == LATE_PLAN) - # No further test results are acceptable after a "late" TAP plan - # has been seen. - result_obj["is_unplanned"] = 1 - else if (plan_seen && testno > planned_tests) - result_obj["is_unplanned"] = 1 - else - result_obj["is_unplanned"] = 0 - - # Strip trailing and leading whitespace. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - - # This will have to be corrected if we have a "TODO"/"SKIP" directive. - result_obj["description"] = line - result_obj["directive"] = "" - result_obj["explanation"] = "" - - if (index(line, "#") == 0) - return # No possible directive, nothing more to do. - - # Directives are case-insensitive. - rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*" - - # See whether we have the directive, and if yes, where. - pos = match(line, rx "$") - if (!pos) - pos = match(line, rx "[^a-zA-Z0-9_]") - - # If there was no TAP directive, we have nothing more to do. - if (!pos) - return - - # Let`s now see if the TAP directive has been escaped. For example: - # escaped: ok \# SKIP - # not escaped: ok \\# SKIP - # escaped: ok \\\\\# SKIP - # not escaped: ok \ # SKIP - if (substr(line, pos, 1) == "#") - { - bslash_count = 0 - for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--) - bslash_count += 1 - if (bslash_count % 2) - return # Directive was escaped. - } - - # Strip the directive and its explanation (if any) from the test - # description. - result_obj["description"] = substr(line, 1, pos - 1) - # Now remove the test description from the line, that has been dealt - # with already. - line = substr(line, pos) - # Strip the directive, and save its value (normalized to upper case). - sub("^[ \t]*#[ \t]*", "", line) - result_obj["directive"] = toupper(substr(line, 1, 4)) - line = substr(line, 5) - # Now get the explanation for the directive (if any), with leading - # and trailing whitespace removed. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - result_obj["explanation"] = line -} - -function get_test_exit_message(status) -{ - if (status == 0) - return "" - if (status !~ /^[1-9][0-9]*$/) - abort("getting exit status") - if (status < 127) - exit_details = "" - else if (status == 127) - exit_details = " (command not found?)" - else if (status >= 128 && status <= 255) - exit_details = sprintf(" (terminated by signal %d?)", status - 128) - else if (status > 256 && status <= 384) - # We used to report an "abnormal termination" here, but some Korn - # shells, when a child process die due to signal number n, can leave - # in $? an exit status of 256+n instead of the more standard 128+n. - # Apparently, both behaviours are allowed by POSIX (2008), so be - # prepared to handle them both. See also Austing Group report ID - # 0000051 <http://www.austingroupbugs.net/view.php?id=51> - exit_details = sprintf(" (terminated by signal %d?)", status - 256) - else - # Never seen in practice. - exit_details = " (abnormal termination)" - return sprintf("exited with status %d%s", status, exit_details) -} - -function write_test_results() -{ - print ":global-test-result: " get_global_test_result() > trs_file - print ":recheck: " yn(must_recheck()) > trs_file - print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file - for (i = 0; i < test_results_index; i += 1) - print ":test-result: " test_results_list[i] > trs_file - close(trs_file); -} - -BEGIN { - -## ------- ## -## SETUP ## -## ------- ## - -'"$init_colors"' - -# Properly initialized once the TAP plan is seen. -planned_tests = 0 - -COOKED_PASS = expect_failure ? "XPASS": "PASS"; -COOKED_FAIL = expect_failure ? "XFAIL": "FAIL"; - -# Enumeration-like constants to remember which kind of plan (if any) -# has been seen. It is important that NO_PLAN evaluates "false" as -# a boolean. -NO_PLAN = 0 -EARLY_PLAN = 1 -LATE_PLAN = 2 - -testno = 0 # Number of test results seen so far. -bailed_out = 0 # Whether a "Bail out!" directive has been seen. - -# Whether the TAP plan has been seen or not, and if yes, which kind -# it is ("early" is seen before any test result, "late" otherwise). -plan_seen = NO_PLAN - -## --------- ## -## PARSING ## -## --------- ## - -is_first_read = 1 - -while (1) - { - # Involutions required so that we are able to read the exit status - # from the last input line. - st = getline - if (st < 0) # I/O error. - fatal("I/O error while reading from input stream") - else if (st == 0) # End-of-input - { - if (is_first_read) - abort("in input loop: only one input line") - break - } - if (is_first_read) - { - is_first_read = 0 - nextline = $0 - continue - } - else - { - curline = nextline - nextline = $0 - $0 = curline - } - # Copy any input line verbatim into the log file. - print | "cat >&3" - # Parsing of TAP input should stop after a "Bail out!" directive. - if (bailed_out) - continue - - # TAP test result. - if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/) - { - testno += 1 - setup_result_obj($0) - handle_tap_result() - } - # TAP plan (normal or "SKIP" without explanation). - else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/) - { - # The next two lines will put the number of planned tests in $0. - sub("^1\\.\\.", "") - sub("[^0-9]*$", "") - handle_tap_plan($0, "") - continue - } - # TAP "SKIP" plan, with an explanation. - else if ($0 ~ /^1\.\.0+[ \t]*#/) - { - # The next lines will put the skip explanation in $0, stripping - # any leading and trailing whitespace. This is a little more - # tricky in truth, since we want to also strip a potential leading - # "SKIP" string from the message. - sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "") - sub("[ \t]*$", ""); - handle_tap_plan(0, $0) - } - # "Bail out!" magic. - # Older versions of prove and TAP::Harness (e.g., 3.17) did not - # recognize a "Bail out!" directive when preceded by leading - # whitespace, but more modern versions (e.g., 3.23) do. So we - # emulate the latter, "more modern" behaviour. - else if ($0 ~ /^[ \t]*Bail out!/) - { - bailed_out = 1 - # Get the bailout message (if any), with leading and trailing - # whitespace stripped. The message remains stored in `$0`. - sub("^[ \t]*Bail out![ \t]*", ""); - sub("[ \t]*$", ""); - # Format the error message for the - bailout_message = "Bail out!" - if (length($0)) - bailout_message = bailout_message " " $0 - testsuite_error(bailout_message) - } - # Maybe we have too look for dianogtic comments too. - else if (comments != 0) - { - comment = extract_tap_comment($0); - if (length(comment)) - report("#", comment); - } - } - -## -------- ## -## FINISH ## -## -------- ## - -# A "Bail out!" directive should cause us to ignore any following TAP -# error, as well as a non-zero exit status from the TAP producer. -if (!bailed_out) - { - if (!plan_seen) - { - testsuite_error("missing test plan") - } - else if (planned_tests != testno) - { - bad_amount = testno > planned_tests ? "many" : "few" - testsuite_error(sprintf("too %s tests run (expected %d, got %d)", - bad_amount, planned_tests, testno)) - } - if (!ignore_exit) - { - # Fetch exit status from the last line. - exit_message = get_test_exit_message(nextline) - if (exit_message) - testsuite_error(exit_message) - } - } - -write_test_results() - -exit 0 - -} # End of "BEGIN" block. -' - -# TODO: document that we consume the file descriptor 3 :-( -} 3>"$log_file" - -test $? -eq 0 || fatal "I/O or internal error" - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: -- 2.19.1

1 9

[pacman-dev] [PATCH] makepkg: if "!buildflags" and "debug" coincide, unset the debug buildflags too
by Eli Schwartz 14 Nov '18

14 Nov '18

If a user has a makepkg.conf policy to enable debug builds, but a PKGBUILD has disabled buildflags, we would unset the *FLAGS but then later append the debug *FLAGS anyway, which would result in some *FLAGS being used, against the wishes of the PKGBUILD author. Signed-off-by: Eli Schwartz <eschwartz(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 5705bd69..8b39ca9a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -383,7 +383,7 @@ source_buildfile() { prepare_buildenv() { # clear user-specified buildflags if requested if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS fi if check_option "debug" "y"; then -- 2.19.1

2 1