- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] scripts: fix some inaccurate Makefile targets
by Eli Schwartz 04 Nov '18

04 Nov '18

Since commit b5d62d2c91a2caf5c18945921cdf12af6f36b2d4, all scripts depend on libmakepkg, not just makepkg itself. Additionally, repo-remove and repo-elephant don't care whether repo-add.sh.in is updated... but they do require the repo-add target to be up to date, so use that instead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c6b6220e..83d53a51 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -203,19 +203,19 @@ makepkg-template: \ $(AM_V_GEN)$(edit) $< > $@ $(AM_V_at)chmod +x,a-w $@ -pacman-db-upgrade: $(srcdir)/pacman-db-upgrade.sh.in +pacman-db-upgrade: $(srcdir)/pacman-db-upgrade.sh.in $(LIBMAKEPKG_IN) -pacman-key: $(srcdir)/pacman-key.sh.in +pacman-key: $(srcdir)/pacman-key.sh.in $(LIBMAKEPKG_IN) -pkgdelta: $(srcdir)/pkgdelta.sh.in +pkgdelta: $(srcdir)/pkgdelta.sh.in $(LIBMAKEPKG_IN) -repo-add: $(srcdir)/repo-add.sh.in +repo-add: $(srcdir)/repo-add.sh.in $(LIBMAKEPKG_IN) -repo-remove: $(srcdir)/repo-add.sh.in +repo-remove: repo-add $(AM_V_at)$(RM) repo-remove $(AM_V_at)$(LN_S) repo-add repo-remove -repo-elephant: $(srcdir)/repo-add.sh.in +repo-elephant: repo-add $(AM_V_at)$(RM) repo-elephant $(AM_V_at)$(LN_S) repo-add repo-elephant -- 2.19.1

1 0

[pacman-dev] [PATCH 1/2] meson: separate out wrapped from non-wrapped scripts
by Dave Reisner 04 Nov '18

04 Nov '18

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. --- wohoo first bug that affects one buildsys and not the other! scripts/meson.build | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/meson.build b/scripts/meson.build index 535eccba..50b0c34f 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -1,5 +1,4 @@ -scripts = [ - 'makepkg-template.pl.in', +wrapped_scripts = [ 'makepkg.sh.in', 'pacman-db-upgrade.sh.in', 'pacman-key.sh.in', @@ -7,6 +6,10 @@ scripts = [ 'repo-add.sh.in' ] +scripts = [ + 'makepkg-template.pl.in', +] + library_files = [ 'library/human_to_size.sh', 'library/size_to_human.sh', @@ -26,6 +29,19 @@ m4_edit = generator( foreach script : scripts script_shortname = script.split('.')[0] + custom_target( + script, + input : m4_edit.process(script), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], + output : script_shortname, + depend_files : library_files, + install : true, + install_dir : get_option('bindir')) +endforeach + +foreach script : wrapped_scripts + script_shortname = script.split('.')[0] + # Build the script, but don't install it. We want to keep it as a "private" # artifact that we reference from a wrapper script in order to bootstrap it # the build directory. -- 2.19.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-57-gde915c4f
by Allan McRae 03 Nov '18

03 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 de915c4f145d6e985c3c0fdf8fe121b5066d711c (commit) via 3dfec574a36b6aacc2004df3e122dae9d17a4b0d (commit) via 635a9c911c419932e4f27eeae349bb265011ca86 (commit) via d230ec6f17a2b64ed61936013234414c74e7c29f (commit) via 51db84750ece4de58923d4ce43cb0638ef150f5f (commit) via dab45f0808951afc2e3146211a1c6d7ebb8bd06d (commit) from b5d62d2c91a2caf5c18945921cdf12af6f36b2d4 (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 de915c4f145d6e985c3c0fdf8fe121b5066d711c Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 31 13:12:34 2018 -0400 repo-add: print the name of the database when extracting Currently this prints the following message: ==> Extracting database to a temporary location... ==> Extracting database to a temporary location... This redundancy is potentially confusing and may cause people to think something is wrong. Historically, this message came from a time when we only extracted one database, but repo-add was changed to always create the files database in commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a and whole code block with message intact was moved into a for loop and run (and printed) twice. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3dfec574a36b6aacc2004df3e122dae9d17a4b0d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Oct 31 13:12:33 2018 -0400 makepkg: fix .PKGINFO/.BUILDINFO files swallowing status printing The respective write_* functions are low-level and shouldn't be outputting statuses; move these to the logic flow where they are used. This ensures the functions can be used in the future wherever, and also solves an issue where, as fallout from the message.sh retrofitting in commit 882e707e40bbade0111cf3bdedbdac4d4b70453b, the statuses got redirected to the actual files. The resulting package was technically correct, except that it contained useless lines which pacman ignored, and repo-add also ignored but at the same time generated an error message: /usr/bin/repo-add: line 335: declare: `=-> Generating .PKGINFO file...': not a valid identifier Thirdparty package tools with stricter parsers may abort with errors, and "repose" is known to do so. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 635a9c911c419932e4f27eeae349bb265011ca86 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 21 13:28:41 2018 -0400 pacman-key: just accept one file to verify, and enforce detached sigs Simply pass options on to gpg the same way gpg uses them -- no looping through and checking lots of signatures. This prevents a situation where the signature file to be verified is manipulated to contain an embedded signature which is valid, but not a detached signature for the file you are actually trying to verify. gpg does not offer an option to verify many files at once by naming each signature/file pair, and there's no reason for us to do so either, since it would be quite tiresome to do so. In the event that there is no signature/file pair specified to pacman-key itself, - preserve gpg's behavior, *if* the matching file does not exist, by - assuming the signature is an embedded signature - deviate from gpg's behavior, by - offering a security warning about which one is happening - when there is an embedded signature *and* a matching detached file, assume the latter is desired Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d230ec6f17a2b64ed61936013234414c74e7c29f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 28 02:42:53 2018 -0400 meson: add a wrapper to bootstrap scripts from within build dir This doesn't do quite as good of a job of "hiding away" the real script as we did with autotools, but it satisfies the need for being able to run scripts which depend on libmakepkg with the local copy within the repo. We do, however, improve upon the autotools script by ensuring that the bash path used in configuring pacman is the interpreter used to run the underlying script. commit 51db84750ece4de58923d4ce43cb0638ef150f5f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 7 10:29:48 2018 -0400 Add meson.build files to build with meson Provide both build systems in parallel for now, to ensure that we work out all the differences between the two. Some time from now, we'll give up on autotools. Meson tends to be faster and probably easier to read/maintain. On my machine, the full meson configure+build+install takes a little under half as long as a similar autotools-based invocation. Building with meson is a two step process. First, configure the build: meson build Then, compile the project: ninja -C build There's some mild differences in functionality between meson and autotools. specifically: 1) No singular update-po target. meson only generates individual update-po targets for each textdomain (of which we have 3). To make this easier, there's a build-aux/update-po script which finds all update-po targets and runs them. 2) No 'make dist' equivalent. Just run 'git archive' to generate a suitable tarball for distribution. commit dab45f0808951afc2e3146211a1c6d7ebb8bd06d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 21 22:58:23 2018 -0400 Dynamically generate Doxyfile from input This isn't super interesting for the autotools side, but it's necessary in order to make things sane for other build systems which we might introduce in the future. ----------------------------------------------------------------------- Summary of changes: .ycm_extra_conf.py | 250 ++++++++++++++ build-aux/edit-script.sh.in | 33 ++ build-aux/meson-install-script.sh | 6 + build-aux/meson-make-symlink.sh | 12 + build-aux/script-wrapper.sh.in | 6 + build-aux/tap-driver.py | 296 ++++++++++++++++ build-aux/update-po | 39 +++ doc/.gitignore | 1 + doc/{Doxyfile => Doxyfile.in} | 2 +- doc/Makefile.am | 5 +- doc/meson.build | 138 ++++++++ doc/pacman-key.8.asciidoc | 8 +- lib/libalpm/meson.build | 33 ++ lib/libalpm/po/meson.build | 15 + meson.build | 488 +++++++++++++++++++++++++++ meson_options.txt | 61 ++++ scripts/libmakepkg/integrity/meson.build | 20 ++ scripts/libmakepkg/lint_config/meson.build | 18 + scripts/libmakepkg/lint_package/meson.build | 20 ++ scripts/libmakepkg/lint_pkgbuild/meson.build | 37 ++ scripts/libmakepkg/meson.build | 31 ++ scripts/libmakepkg/source/meson.build | 22 ++ scripts/libmakepkg/tidy/meson.build | 23 ++ scripts/libmakepkg/util/meson.build | 24 ++ scripts/makepkg.sh.in | 5 +- scripts/meson.build | 91 +++++ scripts/pacman-key.sh.in | 31 +- scripts/po/meson.build | 15 + scripts/repo-add.sh.in | 2 +- src/common/meson.build | 4 + src/pacman/meson.build | 23 ++ src/pacman/po/meson.build | 15 + src/util/meson.build | 3 + test/pacman/meson.build | 357 ++++++++++++++++++++ test/scripts/meson.build | 15 + test/util/meson.build | 6 + 36 files changed, 2136 insertions(+), 19 deletions(-) create mode 100644 .ycm_extra_conf.py create mode 100644 build-aux/edit-script.sh.in create mode 100644 build-aux/meson-install-script.sh create mode 100644 build-aux/meson-make-symlink.sh create mode 100755 build-aux/script-wrapper.sh.in create mode 100644 build-aux/tap-driver.py create mode 100755 build-aux/update-po rename doc/{Doxyfile => Doxyfile.in} (99%) create mode 100644 doc/meson.build create mode 100644 lib/libalpm/meson.build create mode 100644 lib/libalpm/po/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 scripts/libmakepkg/integrity/meson.build create mode 100644 scripts/libmakepkg/lint_config/meson.build create mode 100644 scripts/libmakepkg/lint_package/meson.build create mode 100644 scripts/libmakepkg/lint_pkgbuild/meson.build create mode 100644 scripts/libmakepkg/meson.build create mode 100644 scripts/libmakepkg/source/meson.build create mode 100644 scripts/libmakepkg/tidy/meson.build create mode 100644 scripts/libmakepkg/util/meson.build create mode 100644 scripts/meson.build create mode 100644 scripts/po/meson.build create mode 100644 src/common/meson.build create mode 100644 src/pacman/meson.build create mode 100644 src/pacman/po/meson.build create mode 100644 src/util/meson.build create mode 100644 test/pacman/meson.build create mode 100644 test/scripts/meson.build create mode 100644 test/util/meson.build hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add meson.build files to build with meson
by Dave Reisner 02 Nov '18

02 Nov '18

Provide both build systems in parallel for now, to ensure that we work out all the differences between the two. Some time from now, we'll give up on autotools. Meson tends to be faster and probably easier to read/maintain. On my machine, the full meson configure+build+install takes a little under half as long as a similar autotools-based invocation. Building with meson is a two step process. First, configure the build: meson build Then, compile the project: ninja -C build There's some mild differences in functionality between meson and autotools. specifically: 1) No singular update-po target. meson only generates individual update-po targets for each textdomain (of which we have 3). To make this easier, there's a build-aux/update-po script which finds all update-po targets and runs them. 2) No doxygen support. Doxygen seems to be terrible and requires that everything be built through the Doxyfile. Support for out-of-tree builds (enforced by meson) appears to be nonexistant. I'd suggest just running doxygen directly since we never package these files and just export them for the website. 3) No 'make dist' equivalent. Just run 'git archive' to generate a suitable tarball for distribution. --- Yes, this is huge. All 330 tests pass, and I've been building/using pacman from my 'meson' branch for a while now. Feedback wanted. .ycm_extra_conf.py | 250 ++++++++++ build-aux/edit-script.sh.in | 33 ++ build-aux/meson-make-symlink.sh | 12 + build-aux/tap-driver.py | 296 +++++++++++ build-aux/update-po | 39 ++ doc/meson.build | 118 +++++ lib/libalpm/meson.build | 33 ++ lib/libalpm/po/meson.build | 15 + meson.build | 487 +++++++++++++++++++ meson_options.txt | 58 +++ scripts/libmakepkg/integrity/meson.build | 20 + scripts/libmakepkg/lint_config/meson.build | 18 + scripts/libmakepkg/lint_package/meson.build | 20 + scripts/libmakepkg/lint_pkgbuild/meson.build | 37 ++ scripts/libmakepkg/meson.build | 31 ++ scripts/libmakepkg/source/meson.build | 22 + scripts/libmakepkg/tidy/meson.build | 23 + scripts/libmakepkg/util/meson.build | 24 + scripts/meson.build | 66 +++ scripts/po/meson.build | 15 + src/common/meson.build | 4 + src/pacman/meson.build | 23 + src/pacman/po/meson.build | 15 + src/util/meson.build | 3 + test/pacman/meson.build | 357 ++++++++++++++ test/scripts/meson.build | 12 + test/util/meson.build | 6 + 27 files changed, 2037 insertions(+) create mode 100644 .ycm_extra_conf.py create mode 100644 build-aux/edit-script.sh.in create mode 100644 build-aux/meson-make-symlink.sh create mode 100644 build-aux/tap-driver.py create mode 100755 build-aux/update-po create mode 100644 doc/meson.build create mode 100644 lib/libalpm/meson.build create mode 100644 lib/libalpm/po/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 scripts/libmakepkg/integrity/meson.build create mode 100644 scripts/libmakepkg/lint_config/meson.build create mode 100644 scripts/libmakepkg/lint_package/meson.build create mode 100644 scripts/libmakepkg/lint_pkgbuild/meson.build create mode 100644 scripts/libmakepkg/meson.build create mode 100644 scripts/libmakepkg/source/meson.build create mode 100644 scripts/libmakepkg/tidy/meson.build create mode 100644 scripts/libmakepkg/util/meson.build create mode 100644 scripts/meson.build create mode 100644 scripts/po/meson.build create mode 100644 src/common/meson.build create mode 100644 src/pacman/meson.build create mode 100644 src/pacman/po/meson.build create mode 100644 src/util/meson.build create mode 100644 test/pacman/meson.build create mode 100644 test/scripts/meson.build create mode 100644 test/util/meson.build diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py new file mode 100644 index 00000000..f297deef --- /dev/null +++ b/.ycm_extra_conf.py @@ -0,0 +1,250 @@ +#!/usr/bin/env python + +# SPDX-License-Identifier: Unlicense +# +# Based on the template file provided by the 'YCM-Generator' project authored by +# Reuben D'Netto. +# Jiahui Xie has re-reformatted and expanded the original script in accordance +# to the requirements of the PEP 8 style guide and 'systemd' project, +# respectively. +# +# The original license is preserved as it is. +# +# +# This is free and unencumbered software released into the public domain. +# +# Anyone is free to copy, modify, publish, use, compile, sell, or +# distribute this software, either in source code form or as a compiled +# binary, for any purpose, commercial or non-commercial, and by any +# means. +# +# In jurisdictions that recognize copyright laws, the author or authors +# of this software dedicate any and all copyright interest in the +# software to the public domain. We make this dedication for the benefit +# of the public at large and to the detriment of our heirs and +# successors. We intend this dedication to be an overt act of +# relinquishment in perpetuity of all present and future rights to this +# software under copyright law. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +# For more information, please refer to <http://unlicense.org/> + +""" +YouCompleteMe configuration file tailored to support the 'meson' build system +used by the 'systemd' project. +""" + +import glob +import os +import ycm_core + + +SOURCE_EXTENSIONS = (".C", ".cpp", ".cxx", ".cc", ".c", ".m", ".mm") +HEADER_EXTENSIONS = (".H", ".h", ".hxx", ".hpp", ".hh") + + +def DirectoryOfThisScript(): + """ + Return the absolute path of the parent directory containing this + script. + """ + return os.path.dirname(os.path.abspath(__file__)) + + +def GuessBuildDirectory(): + """ + Guess the build directory using the following heuristics: + + 1. Returns the current directory of this script plus 'build' + subdirectory in absolute path if this subdirectory exists. + + 2. Otherwise, probes whether there exists any directory + containing '.ninja_log' file two levels above the current directory; + returns this single directory only if there is one candidate. + """ + result = os.path.join(DirectoryOfThisScript(), "build") + + if os.path.exists(result): + return result + + result = glob.glob(os.path.join(DirectoryOfThisScript(), + "..", "..", "*", ".ninja_log")) + + if not result: + return "" + + if 1 != len(result): + return "" + + return os.path.split(result[0])[0] + + +def TraverseByDepth(root, include_extensions): + """ + Return a set of child directories of the 'root' containing file + extensions specified in 'include_extensions'. + + NOTE: + 1. The 'root' directory itself is excluded from the result set. + 2. No subdirectories would be excluded if 'include_extensions' is left + to 'None'. + 3. Each entry in 'include_extensions' must begin with string '.'. + """ + is_root = True + result = set() + # Perform a depth first top down traverse of the given directory tree. + for root_dir, subdirs, file_list in os.walk(root): + if not is_root: + # print("Relative Root: ", root_dir) + # print(subdirs) + if include_extensions: + get_ext = os.path.splitext + subdir_extensions = { + get_ext(f)[-1] for f in file_list if get_ext(f)[-1] + } + if subdir_extensions & include_extensions: + result.add(root_dir) + else: + result.add(root_dir) + else: + is_root = False + + return result + + +_project_src_dir = os.path.join(DirectoryOfThisScript(), "src") +_include_dirs_set = TraverseByDepth(_project_src_dir, frozenset({".h"})) +flags = [ + "-x", + "c" + # The following flags are partially redundant due to the existence of + # 'compile_commands.json'. + # '-Wall', + # '-Wextra', + # '-Wfloat-equal', + # '-Wpointer-arith', + # '-Wshadow', + # '-std=gnu99', +] + +for include_dir in _include_dirs_set: + flags.append("-I" + include_dir) + +# Set this to the absolute path to the folder (NOT the file!) containing the +# compile_commands.json file to use that instead of 'flags'. See here for +# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html +# +# You can get CMake to generate this file for you by adding: +# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 ) +# to your CMakeLists.txt file. +# +# Most projects will NOT need to set this to anything; you can just change the +# 'flags' list of compilation flags. Notice that YCM itself uses that approach. +compilation_database_folder = GuessBuildDirectory() + +if os.path.exists(compilation_database_folder): + database = ycm_core.CompilationDatabase(compilation_database_folder) +else: + database = None + + +def MakeRelativePathsInFlagsAbsolute(flags, working_directory): + """ + Iterate through 'flags' and replace the relative paths prefixed by + '-isystem', '-I', '-iquote', '--sysroot=' with absolute paths + start with 'working_directory'. + """ + if not working_directory: + return list(flags) + new_flags = [] + make_next_absolute = False + path_flags = ["-isystem", "-I", "-iquote", "--sysroot="] + for flag in flags: + new_flag = flag + + if make_next_absolute: + make_next_absolute = False + if not flag.startswith("/"): + new_flag = os.path.join(working_directory, flag) + + for path_flag in path_flags: + if flag == path_flag: + make_next_absolute = True + break + + if flag.startswith(path_flag): + path = flag[len(path_flag):] + new_flag = path_flag + os.path.join(working_directory, path) + break + + if new_flag: + new_flags.append(new_flag) + return new_flags + + +def IsHeaderFile(filename): + """ + Check whether 'filename' is considered as a header file. + """ + extension = os.path.splitext(filename)[1] + return extension in HEADER_EXTENSIONS + + +def GetCompilationInfoForFile(filename): + """ + Helper function to look up compilation info of 'filename' in the 'database'. + """ + # The compilation_commands.json file generated by CMake does not have + # entries for header files. So we do our best by asking the db for flags for + # a corresponding source file, if any. If one exists, the flags for that + # file should be good enough. + if not database: + return None + + if IsHeaderFile(filename): + basename = os.path.splitext(filename)[0] + for extension in SOURCE_EXTENSIONS: + replacement_file = basename + extension + if os.path.exists(replacement_file): + compilation_info = \ + database.GetCompilationInfoForFile(replacement_file) + if compilation_info.compiler_flags_: + return compilation_info + return None + return database.GetCompilationInfoForFile(filename) + + +def FlagsForFile(filename, **kwargs): + """ + Callback function to be invoked by YouCompleteMe in order to get the + information necessary to compile 'filename'. + + It returns a dictionary with a single element 'flags'. This element is a + list of compiler flags to pass to libclang for the file 'filename'. + """ + if database: + # Bear in mind that compilation_info.compiler_flags_ does NOT return a + # python list, but a "list-like" StringVec object + compilation_info = GetCompilationInfoForFile(filename) + if not compilation_info: + return None + + final_flags = MakeRelativePathsInFlagsAbsolute( + compilation_info.compiler_flags_, + compilation_info.compiler_working_dir_) + + else: + relative_to = DirectoryOfThisScript() + final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) + + return { + "flags": final_flags, + "do_cache": True + } diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in new file mode 100644 index 00000000..3e3a1b6a --- /dev/null +++ b/build-aux/edit-script.sh.in @@ -0,0 +1,33 @@ +#!@BASH@ + +input=$1 +output=$2 +mode=$3 + +"@SED@" \ + -e "s|@rootdir[@]|@ROOTDIR@|g" \ + -e "s|@localedir[@]|@LOCALEDIR@|g" \ + -e "s|@sysconfdir[@]|@sysconfdir@|g" \ + -e "s|@localstatedir[@]|@localstatedir@|g" \ + -e "s|@libmakepkgdir[@]|@LIBMAKEPKGDIR@|g" \ + -e "s|@pkgdatadir[@]|@PKGDATADIR@|g" \ + -e "s|@prefix[@]|@PREFIX@|g" \ + -e "1s|#!/bin/bash|#!@BASH@|g" \ + -e "s|@PACKAGE_VERSION[@]|@PACKAGE_VERSION@|g" \ + -e "s|@PACKAGE_NAME[@]|@PACKAGE_NAME@|g" \ + -e "s|@BUILDSCRIPT[@]|@BUILDSCRIPT@|g" \ + -e "s|@TEMPLATE_DIR[@]|@TEMPLATE_DIR@|g" \ + -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ + -e "s|@INODECMD[@]|@INODECMD@|g" \ + -e "s|@OWNERCMD[@]|@OWNERCMD@|g" \ + -e "s|@MODECMD[@]|@MODECMD@|g" \ + -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \ + -e "s|@SEDPATH[@]|@SEDPATH@|g" \ + -e "s|@DUFLAGS[@]|@DUFLAGS@|g" \ + -e "s|@DUPATH[@]|@DUPATH@|g" \ + -e "s|@configure_input[@]|Generated from ${output##*/}.sh.in; do not edit by hand.|g" \ + "$input" >"$output" + +if [[ $mode ]]; then + chmod "$mode" "$output" +fi diff --git a/build-aux/meson-make-symlink.sh b/build-aux/meson-make-symlink.sh new file mode 100644 index 00000000..501cd43d --- /dev/null +++ b/build-aux/meson-make-symlink.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -eu + +# this is needed mostly because $DESTDIR is provided as a variable, +# and we need to create the target directory... + +mkdir -vp "$(dirname "${DESTDIR:-}$2")" +if [ "$(dirname $1)" = . ]; then + ln -vfs -T "$1" "${DESTDIR:-}$2" +else + ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" +fi diff --git a/build-aux/tap-driver.py b/build-aux/tap-driver.py new file mode 100644 index 00000000..c231caec --- /dev/null +++ b/build-aux/tap-driver.py @@ -0,0 +1,296 @@ +#!/usr/bin/env python3 +# Adapted from tappy copyright (c) 2016, Matt Layman +# MIT license +# https://github.com/python-tap/tappy + +import io +import re +import subprocess +import sys + + +class Directive(object): + """A representation of a result line directive.""" + + skip_pattern = re.compile( + r"""^SKIP\S* + (?P<whitespace>\s*) # Optional whitespace. + (?P<reason>.*) # Slurp up the rest.""", + re.IGNORECASE | re.VERBOSE) + todo_pattern = re.compile( + r"""^TODO\b # The directive name + (?P<whitespace>\s*) # Immediately following must be whitespace. + (?P<reason>.*) # Slurp up the rest.""", + re.IGNORECASE | re.VERBOSE) + + def __init__(self, text): + """Initialize the directive by parsing the text. + The text is assumed to be everything after a '#\s*' on a result line. + """ + self._text = text + self._skip = False + self._todo = False + self._reason = None + + match = self.skip_pattern.match(text) + if match: + self._skip = True + self._reason = match.group('reason') + + match = self.todo_pattern.match(text) + if match: + if match.group('whitespace'): + self._todo = True + else: + # Catch the case where the directive has no descriptive text. + if match.group('reason') == '': + self._todo = True + self._reason = match.group('reason') + + @property + def text(self): + """Get the entire text.""" + return self._text + + @property + def skip(self): + """Check if the directive is a SKIP type.""" + return self._skip + + @property + def todo(self): + """Check if the directive is a TODO type.""" + return self._todo + + @property + def reason(self): + """Get the reason for the directive.""" + return self._reason + + +class Parser(object): + """A parser for TAP files and lines.""" + + # ok and not ok share most of the same characteristics. + result_base = r""" + \s* # Optional whitespace. + (?P<number>\d*) # Optional test number. + \s* # Optional whitespace. + (?P<description>[^#]*) # Optional description before #. + \#? # Optional directive marker. + \s* # Optional whitespace. + (?P<directive>.*) # Optional directive text. + """ + ok = re.compile(r'^ok' + result_base, re.VERBOSE) + not_ok = re.compile(r'^not\ ok' + result_base, re.VERBOSE) + plan = re.compile(r""" + ^1..(?P<expected>\d+) # Match the plan details. + [^#]* # Consume any non-hash character to confirm only + # directives appear with the plan details. + \#? # Optional directive marker. + \s* # Optional whitespace. + (?P<directive>.*) # Optional directive text. + """, re.VERBOSE) + diagnostic = re.compile(r'^#') + bail = re.compile(r""" + ^Bail\ out! + \s* # Optional whitespace. + (?P<reason>.*) # Optional reason. + """, re.VERBOSE) + version = re.compile(r'^TAP version (?P<version>\d+)$') + + TAP_MINIMUM_DECLARED_VERSION = 13 + + def parse(self, fh): + """Generate tap.line.Line objects, given a file-like object `fh`. + `fh` may be any object that implements both the iterator and + context management protocol (i.e. it can be used in both a + "with" statement and a "for...in" statement.) + Trailing whitespace and newline characters will be automatically + stripped from the input lines. + """ + with fh: + for line in fh: + yield self.parse_line(line.rstrip()) + + def parse_line(self, text): + """Parse a line into whatever TAP category it belongs.""" + match = self.ok.match(text) + if match: + return self._parse_result(True, match) + + match = self.not_ok.match(text) + if match: + return self._parse_result(False, match) + + if self.diagnostic.match(text): + return ('diagnostic', text) + + match = self.plan.match(text) + if match: + return self._parse_plan(match) + + match = self.bail.match(text) + if match: + return ('bail', match.group('reason')) + + match = self.version.match(text) + if match: + return self._parse_version(match) + + return ('unknown',) + + def _parse_plan(self, match): + """Parse a matching plan line.""" + expected_tests = int(match.group('expected')) + directive = Directive(match.group('directive')) + + # Only SKIP directives are allowed in the plan. + if directive.text and not directive.skip: + return ('unknown',) + + return ('plan', expected_tests, directive) + + def _parse_result(self, ok, match): + """Parse a matching result line into a result instance.""" + return ('result', ok, match.group('number'), + match.group('description').strip(), + Directive(match.group('directive'))) + + def _parse_version(self, match): + version = int(match.group('version')) + if version < self.TAP_MINIMUM_DECLARED_VERSION: + raise ValueError('It is an error to explicitly specify ' + 'any version lower than 13.') + return ('version', version) + + +class Rules(object): + + def __init__(self): + self._lines_seen = {'plan': [], 'test': 0, 'failed': 0, 'version': []} + self._errors = [] + + def check(self, final_line_count): + """Check the status of all provided data and update the suite.""" + if self._lines_seen['version']: + self._process_version_lines() + self._process_plan_lines(final_line_count) + + def check_errors(self): + if self._lines_seen['failed'] > 0: + self._add_error('Tests failed.') + if self._errors: + for error in self._errors: + print(error) + return 1 + return 0 + + def _process_version_lines(self): + """Process version line rules.""" + if len(self._lines_seen['version']) > 1: + self._add_error('Multiple version lines appeared.') + elif self._lines_seen['version'][0] != 1: + self._add_error('The version must be on the first line.') + + def _process_plan_lines(self, final_line_count): + """Process plan line rules.""" + if not self._lines_seen['plan']: + self._add_error('Missing a plan.') + return + + if len(self._lines_seen['plan']) > 1: + self._add_error('Only one plan line is permitted per file.') + return + + expected_tests, at_line = self._lines_seen['plan'][0] + if not self._plan_on_valid_line(at_line, final_line_count): + self._add_error( + 'A plan must appear at the beginning or end of the file.') + return + + if expected_tests != self._lines_seen['test']: + self._add_error( + 'Expected {expected_count} tests ' + 'but only {seen_count} ran.'.format( + expected_count=expected_tests, + seen_count=self._lines_seen['test'])) + + def _plan_on_valid_line(self, at_line, final_line_count): + """Check if a plan is on a valid line.""" + # Put the common cases first. + if at_line == 1 or at_line == final_line_count: + return True + + # The plan may only appear on line 2 if the version is at line 1. + after_version = ( + self._lines_seen['version'] and + self._lines_seen['version'][0] == 1 and + at_line == 2) + if after_version: + return True + + return False + + def handle_bail(self, reason): + """Handle a bail line.""" + self._add_error('Bailed: {reason}').format(reason=reason) + + def handle_skipping_plan(self): + """Handle a plan that contains a SKIP directive.""" + sys.exit(77) + + def saw_plan(self, expected_tests, at_line): + """Record when a plan line was seen.""" + self._lines_seen['plan'].append((expected_tests, at_line)) + + def saw_test(self, ok): + """Record when a test line was seen.""" + self._lines_seen['test'] += 1 + if not ok: + self._lines_seen['failed'] += 1 + + def saw_version_at(self, line_counter): + """Record when a version line was seen.""" + self._lines_seen['version'].append(line_counter) + + def _add_error(self, message): + self._errors += [message] + + +if __name__ == '__main__': + parser = Parser() + rules = Rules() + + try: + out = subprocess.check_output(sys.argv[1:], universal_newlines=True) + except subprocess.CalledProcessError as e: + sys.stdout.write(e.output) + raise e + + line_generator = parser.parse(io.StringIO(out)) + line_counter = 0 + for line in line_generator: + line_counter += 1 + + if line[0] == 'unknown': + continue + + if line[0] == 'result': + rules.saw_test(line[1]) + print('{okay} {num} {description} {directive}'.format( + okay=('' if line[1] else 'not ') + 'ok', num=line[2], + description=line[3], directive=line[4].text)) + elif line[0] == 'plan': + if line[2].skip: + rules.handle_skipping_plan() + rules.saw_plan(line[1], line_counter) + elif line[0] == 'bail': + rules.handle_bail(line[1]) + elif line[0] == 'version': + rules.saw_version_at(line_counter) + elif line[0] == 'diagnostic': + print(line[1]) + + rules.check(line_counter) + sys.exit(rules.check_errors()) diff --git a/build-aux/update-po b/build-aux/update-po new file mode 100755 index 00000000..ce1ad4be --- /dev/null +++ b/build-aux/update-po @@ -0,0 +1,39 @@ +#!/bin/bash + +find_build_directory() { + local build_dirs=(*/.ninja_log) + + if [[ ! -e ${build_dirs[0]} ]]; then + echo "error: No build directory found. Have you run 'meson build' yet?" >&2 + return 1 + elif (( ${#build_dirs[*]} > 1 )); then + echo "error: Multiple build directories found. Unable to proceed." >&2 + return 1 + fi + + printf '%s\n' "${build_dirs[0]%/*}" +} + + +filter_targets_by_name() { + if command -v jq &>/dev/null; then + jq --arg re "$1" -r 'map(.name)[] | select(match($re))' + else + json_pp | awk -v filter="$1" -F'[:"]' \ + '$2 == "name" && $(NF - 1) ~ filter { print $(NF - 1) }' + fi +} + +# Make things simple and require that we're in the build root rather than +# trying to chase down the location of this script and the relative build dir. +if [[ ! -d .git ]]; then + echo "This script must be run from the root of the repository" >&2 + exit 1 +fi + +build_dir=$(find_build_directory) || exit 1 + +mapfile -t targets < \ + <(meson introspect "$build_dir" --targets | filter_targets_by_name "-update-po$") + +ninja -C "$build_dir" "${targets[@]}" diff --git a/doc/meson.build b/doc/meson.build new file mode 100644 index 00000000..b1ffd793 --- /dev/null +++ b/doc/meson.build @@ -0,0 +1,118 @@ +manpages = [ + { 'name': 'alpm-hooks.5' }, + { 'name': 'pacman.8' }, + { 'name': 'makepkg.8' }, + { 'name': 'makepkg-template.1' }, + { 'name': 'repo-add.8' }, + { 'name': 'vercmp.8' }, + { 'name': 'pkgdelta.8' }, + { 'name': 'pacman-key.8' }, + { 'name': 'PKGBUILD.5', 'extra_depends' : [ 'PKGBUILD-example.txt' ] }, + { 'name': 'makepkg.conf.5' }, + { 'name': 'pacman.conf.5' }, + { 'name': 'libalpm.3' }, + { 'name': 'BUILDINFO.5' }, +] + +asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') + +asciidoc_opts = [ + '-f', asciidoc_conf, + '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), + '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), + '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), + '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR), + '-a', 'sysconfdir=@0@'.format(SYSCONFDIR), + '-a', 'datarootdir=@0@'.format(DATAROOTDIR), +] + +html_targets = [] +html_files = [] + +foreach page : manpages + manpage = page['name'] + htmlpage = '@0@.html'.format(manpage) + input = '@0@.asciidoc'.format(manpage) + + section = page['name'].split('.')[-1] + + mandirn = join_paths(MANDIR, 'man' + section) + + custom_target( + manpage, + command : [ + A2X, + '--no-xmllint', + '-d', 'manpage', + '-f', 'manpage', + '--xsltproc-opts', '-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0', + '-D', '@OUTDIR@', + '--asciidoc-opts', ' '.join(asciidoc_opts), + '@INPUT@', + ], + input : input, + output : [manpage], + depend_files : [ + asciidoc_conf, + ] + page.get('extra_depends', []), + install : true, + install_dir : mandirn, + ) + + html = custom_target( + htmlpage, + command : [ + ASCIIDOC, + ] + asciidoc_opts + [ + '-a', 'linkcss', + '-a', 'toc', + '-a', 'icons', + '-a', 'max-width=960px', + '-a', 'stylesheet=asciidoc-override.css', + '-o', '@OUTPUT@', + '@INPUT@', + ], + input : input, + output : [htmlpage], + depend_files : [ + asciidoc_conf, + 'asciidoc-override.css', + ] + page.get('extra_depends', []), + build_by_default : false, + install : false, + ) + html_targets += [html] + html_files += [htmlpage] +endforeach + +run_target('html', + command : ['/bin/true'], + depends : html_targets) + +custom_target( + 'website.tar.gz', + command : [ + 'bsdtar', 'czf', '@OUTPUT@', + '-C', meson.current_build_dir(), + ] + html_files + [ + '-C', meson.current_source_dir(), + 'submitting-patches.html', + 'translation-help.html', + 'HACKING.html', + 'index.html', + 'asciidoc-override.css', + '-C', '/etc/asciidoc/stylesheets/', + 'asciidoc.css', + '-C', '/etc/asciidoc/javascripts/', + 'asciidoc.js', + '-C', '/etc/asciidoc/', + 'images', + ], + output : ['website.tar.gz'], + build_by_default : false, + depends : html_targets, +) + +meson.add_install_script(MESON_MAKE_SYMLINK, + 'repo-add.8', + join_paths(MANDIR, 'man8/repo-remove.8')) diff --git a/lib/libalpm/meson.build b/lib/libalpm/meson.build new file mode 100644 index 00000000..84c3dde3 --- /dev/null +++ b/lib/libalpm/meson.build @@ -0,0 +1,33 @@ +libalpm_sources = files(''' + add.h add.c + alpm.h alpm.c + alpm_list.h alpm_list.c + backup.h backup.c + base64.h base64.c + be_local.c + be_package.c + be_sync.c + conflict.h conflict.c + db.h db.c + delta.h delta.c + deps.h deps.c + diskspace.h diskspace.c + dload.h dload.c + error.c + filelist.h filelist.c + graph.h graph.c + group.h group.c + handle.h handle.c + hook.h hook.c + libarchive-compat.h + log.h log.c + package.h package.c + pkghash.h pkghash.c + rawstr.c + remove.h remove.c + signing.c signing.h + sync.h sync.c + trans.h trans.c + util.h util.c + version.c +'''.split()) diff --git a/lib/libalpm/po/meson.build b/lib/libalpm/po/meson.build new file mode 100644 index 00000000..cec28a15 --- /dev/null +++ b/lib/libalpm/po/meson.build @@ -0,0 +1,15 @@ +i18n.gettext( + 'libalpm', + args : [ + '--directory=@0@'.format(meson.current_source_dir()), + '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', + '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--language', 'c', + + '--keyword=_', + '--flag=_:1:c-format', + + '--keyword=_n:1,2', + '--flag=_n:1:c-format', + '--flag=_n:2:c-format', + ]) diff --git a/meson.build b/meson.build new file mode 100644 index 00000000..3f9b2ae0 --- /dev/null +++ b/meson.build @@ -0,0 +1,487 @@ +project('pacman', + 'c', + version : '5.1.0', + license : 'GPLv2+', + default_options : [ + 'c_std=gnu99', + 'prefix=/usr', + 'sysconfdir=/etc', + 'localstatedir=/var', + ], + meson_version : '>= 0.47') + +libalpm_version = '11.0.1' + +cc = meson.get_compiler('c') + +# commandline options +PREFIX = get_option('prefix') +DATAROOTDIR = join_paths(PREFIX, get_option('datarootdir')) +SYSCONFDIR = join_paths(PREFIX, get_option('sysconfdir')) +LOCALSTATEDIR = join_paths(PREFIX, get_option('localstatedir')) +LOCALEDIR = join_paths(PREFIX, get_option('localedir')) +ROOTDIR = get_option('root-dir') +BINDIR = join_paths(PREFIX, get_option('bindir')) +MANDIR = join_paths(PREFIX, get_option('mandir')) +BUILDSCRIPT = get_option('buildscript') +LIBMAKEPKGDIR = join_paths(PREFIX, DATAROOTDIR, 'makepkg') +PKGDATADIR = join_paths(PREFIX, DATAROOTDIR, meson.project_name()) + +PYTHON = find_program('python') +M4 = find_program('m4') +SED = find_program('sed') +DU = find_program('du') +LDCONFIG = get_option('ldconfig') +MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') + +BASH = find_program('bash4', 'bash') +if BASH.found() + bash_version = run_command(BASH, '-c', 'IFS=.; echo "${BASH_VERSINFO[*]:0:3}"').stdout() + + have_bash = bash_version.version_compare('>= 4.4.0') +endif +if not have_bash + error('bash >= 4.4.0 is required for pacman scripts.') +endif + +bashcompletion = dependency('bash-completion', required : false) +if bashcompletion.found() + BASHCOMPDIR = bashcompletion.get_pkgconfig_variable('completionsdir') +else + BASHCOMPDIR = join_paths(DATAROOTDIR, 'bash-completion/completions') +endif + +if get_option('use-git-version') + PACKAGE_VERSION = run_command( + find_program('git'), + 'describe', + '--abbrev=4', + '--dirty').stdout().strip().strip('v') +else + PACKAGE_VERSION = meson.project_version() +endif + +conf = configuration_data() +conf.set('_GNU_SOURCE', true) +conf.set_quoted('PACKAGE', meson.project_name()) +conf.set_quoted('PACKAGE_VERSION', PACKAGE_VERSION) +conf.set_quoted('LOCALEDIR', LOCALEDIR) +conf.set_quoted('SCRIPTLET_SHELL', get_option('scriptlet-shell')) +conf.set_quoted('LDCONFIG', LDCONFIG) +conf.set_quoted('LIB_VERSION', meson.project_version()) +conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) +conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) +conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman')) +conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg')) +conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log')) +conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg')) +conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) +conf.set_quoted('ROOTDIR', ROOTDIR) + +if get_option('i18n') + if not cc.has_function('ngettext') + error('ngettext not found but NLS support requested') + endif + conf.set('ENABLE_NLS', 1) +endif + +# dependencies +libarchive = dependency('libarchive', + version : '>=3.0.0', + static : get_option('buildstatic')) + +libcurl = dependency('libcurl', + version : '>=7.32.0', + required : get_option('curl'), + static : get_option('buildstatic')) +conf.set('HAVE_LIBCURL', libcurl.found()) + +want_gpgme = get_option('gpgme') +gpgme_config = find_program('gpgme-config', required : want_gpgme) +if not want_gpgme.disabled() and gpgme_config.found() + gpgme_version = run_command(gpgme_config, '--version').stdout().strip() + + needed_gpgme_version = '>=1.3.0' + have = gpgme_version.version_compare(needed_gpgme_version) + if want_gpgme.enabled() and not have + error('gpgme @0@ is needed for GPG signature support'.format(needed_gpgme_version)) + endif + + gpgme_libs = [ + cc.find_library('gpgme', required : have, + dirs : [get_option('gpgme-libdir')]), + cc.find_library('gpg-error', required : have, + dirs : [get_option('gpgme-libdir')]), + cc.find_library('assuan', required : have, + dirs : [get_option('gpgme-libdir')]), + ] + + conf.set('HAVE_LIBGPGME', have) +else + gpgme_libs = [] + conf.set('HAVE_LIBGPGME', false) +endif + +want_crypto = get_option('crypto') +if want_crypto == 'openssl' + libcrypto = dependency('libcrypto', static : get_option('buildstatic')) + if not libcrypto.found() + error('openssl support requested but not found') + endif + crypto_provider = libcrypto + conf.set10('HAVE_LIBSSL', true) +elif want_crypto == 'nettle' + libnettle = dependency('nettle', static : get_option('buildstatic')) + if not libnettle.found() + error('nettle support requested but not found') + endif + crypto_provider = libnettle + conf.set10('HAVE_LIBNETTLE', true) +else + error('unhandled crypto value @0@'.format(want_crypto)) +endif + +foreach header : [ + 'mntent.h', + 'sys/mnttab.h', + 'sys/mount.h', + 'sys/param.h', + 'sys/statvfs.h', + 'sys/types.h', + 'sys/ucred.h', + 'termios.h', + ] + if cc.has_header(header) + conf.set('HAVE_' + header.underscorify().to_upper(), true) + endif +endforeach + +foreach sym : [ + 'dup2', + 'fork', + 'getcwd', + 'getmntent', + 'getmntinfo', + 'gettimeofday', + 'memmove', + 'memset', + 'mkdir', + 'realpath', + 'regcomp', + 'rmdir', + 'setenv', + 'setlocale', + 'strcasecmp', + 'strchr', + 'strcspn', + 'strdup', + 'strerror', + 'strndup', + 'strnlen', + 'strnlen', + 'strrchr', + 'strsep', + 'strsep', + 'strstr', + 'strtol', + 'swprintf', + 'tcflush', + 'tcflush', + 'uname', + 'wcwidth', + ] + have = cc.has_function(sym, args : '-D_GNU_SOURCE') + conf.set10('HAVE_' + sym.to_upper(), have) +endforeach + +foreach member : [ + ['struct stat', 'st_blksize', '''#include <sys/stat.h>'''], + ['struct statvfs', 'f_flag', '''#include <sys/statvfs.h>'''], + ['struct statfs', 'f_flags', '''#include <sys/param.h> + #include <sys/mount.h>'''], + ] + have = cc.has_member(member[0], member[1], prefix : member[2]) + conf.set('HAVE_' + '_'.join([member[0], member[1]]).underscorify().to_upper(), have) +endforeach + +if conf.has('HAVE_STRUCT_STATVFS_F_FLAG') + conf.set('FSSTATSTYPE', 'struct statvfs') +elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') + conf.set('FSSTATSTYPE', 'struct statfs') +endif + +if get_option('buildtype') == 'debug' + extra_cflags = [ + '-Wcast-align', + '-Wclobbered', + '-Wempty-body', + '-Wfloat-equal', + '-Wformat-nonliteral', + '-Wformat-security', + '-Wignored-qualifiers', + '-Winit-self', + '-Wlogical-op', + '-Wmissing-declarations', + '-Wmissing-field-initializers', + '-Wmissing-parameter-type', + '-Wmissing-prototypes', + '-Wold-style-declaration', + '-Woverride-init', + '-Wpointer-arith', + '-Wredundant-decls', + '-Wshadow', + '-Wsign-compare', + '-Wstrict-aliasing', + '-Wstrict-overflow=5', + '-Wstrict-prototypes', + '-Wtype-limits', + '-Wuninitialized', + '-Wunused-but-set-parameter', + '-Wunused-parameter', + '-Wwrite-strings', + ] + add_project_arguments(cc.get_supported_arguments(extra_cflags), language : 'c') + + conf.set('PACMAN_DEBUG', 1) +endif + +config_h = configure_file( + output : 'config.h', + configuration : conf) +add_project_arguments('-include', 'config.h', language : 'c') + +default_duflags = ' -sk --apparent-size' +default_sedinplaceflags = ' --follow-symlinks -i' +inodecmd = 'stat -c \'%i %n\'' +ownercmd = 'stat -c \'%u:%g\'' +modecmd = 'stat -c \'%a\'' +strip_binaries = '--strip-all' +strip_shared = '--strip-unneeded' +strip_static = '--strip-debug' + +os = host_machine.system() +if os.startswith('darwin') + inodecmd = '/usr/bin/stat -f \'%i %n\'' + ownercmd = '/usr/bin/stat -f \'%u:%g\'' + modecmd = '/usr/bin/stat -f \'%lp\'' + default_sedinplaceflags = ' -i \'\'' + default_duflags = ' -sk' + strip_binaries = '' + strip_shared = '-s' + strip_static = '-s' +elif os.contains('bsd') or os == 'dragonfly' + inodecmd = 'stat -f \'%i %n\'' + ownercmd = 'stat -f \'%u:%g\'' + modecmd = 'stat -f \'%lp\'' + default_sedinplaceflags = ' -i \'\'' + default_duflags = ' -sk' +endif + +duflags = get_option('duflags') +if duflags == 'autodetect' + duflags = default_duflags +endif + +sedinplaceflags = get_option('sedinplaceflags') +if sedinplaceflags == 'auto' + sedinplaceflags = default_sedinplaceflags +endif + +chost = run_command(cc, '-dumpmachine').stdout().strip() +carch = chost.split('-')[0] + +# annoyingly, we have to maintain two sets of configuration_data which is +# largely identical, but which distinguishes between quoting needs. +substs = configuration_data() +substs.set('SED', SED.path()) +substs.set('M4', M4.path()) +substs.set('CARCH', carch) +substs.set('CHOST', chost) +substs.set('PKGEXT', get_option('pkg-ext')) +substs.set('SRCEXT', get_option('src-ext')) +substs.set('ROOTDIR', ROOTDIR) +substs.set('LOCALEDIR', LOCALEDIR) +substs.set('sysconfdir', SYSCONFDIR) +substs.set('localstatedir', LOCALSTATEDIR) +substs.set('PKGDATADIR', PKGDATADIR) +substs.set('PREFIX', PREFIX) +substs.set('BASH', BASH.path()) +substs.set('PACKAGE_VERSION', PACKAGE_VERSION) +substs.set('PACKAGE_NAME', meson.project_name()) +substs.set('BUILDSCRIPT', BUILDSCRIPT) +substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir')) +substs.set('DEBUGSUFFIX', get_option('debug-suffix')) +substs.set('INODECMD', inodecmd) +substs.set('OWNERCMD', ownercmd) +substs.set('MODECMD', modecmd) +substs.set('SEDINPLACEFLAGS', sedinplaceflags) +substs.set('SEDPATH', SED.path()) +substs.set('DUFLAGS', duflags) +substs.set('DUPATH', DU.path()) +substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR) +substs.set('STRIP_BINARIES', strip_binaries) +substs.set('STRIP_SHARED', strip_shared) +substs.set('STRIP_STATIC', strip_static) + +subdir('lib/libalpm') +subdir('src/common') +subdir('src/pacman') +subdir('src/util') +subdir('scripts') + +# Internationalization +if get_option('i18n') + i18n = import('i18n') + subdir('lib/libalpm/po') + subdir('src/pacman/po') + subdir('scripts/po') +endif + +want_doc = get_option('doc') +ASCIIDOC = find_program('asciidoc', required : want_doc) +A2X = find_program('a2x', required : want_doc) +build_doc = A2X.found() and not want_doc.disabled() +if build_doc + subdir('doc') +endif + +libcommon = static_library( + 'common', + libcommon_sources, + install : false) + +includes = include_directories('src/common', 'lib/libalpm') + +libalpm = library( + 'alpm', + libalpm_sources, + version : libalpm_version, + include_directories : includes, + dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_with : [libcommon], + install : true) + +install_headers( + 'lib/libalpm/alpm.h', + 'lib/libalpm/alpm_list.h') + +# TODO: this is lacking libs.private +pkgconfig = import('pkgconfig') +pkgconfig.generate( + libalpm, + name : 'libalpm', + description : 'Arch Linux package management library', + version : libalpm_version, + url : 'http://www.archlinux.org/pacman/', + requires_private : [crypto_provider, libcurl, libarchive]) + +pacman_bin = executable( + 'pacman', + pacman_sources, + include_directories : includes, + link_with : [libalpm, libcommon], + dependencies : [libarchive], + install : true, +) + +executable( + 'pacman-conf', + pacman_conf_sources, + include_directories : includes, + link_with : [libalpm], + install : true, +) + +executable( + 'cleanupdelta', + cleanupdelta_sources, + include_directories : includes, + link_with : [libalpm], + install : true, +) + +executable( + 'testpkg', + testpkg_sources, + include_directories : includes, + link_with : [libalpm], + install : true, +) + +executable( + 'vercmp', + vercmp_sources, + include_directories : includes, + link_with : [libalpm], + install : true, +) + +configure_file( + input : 'etc/makepkg.conf.in', + output : 'makepkg.conf', + configuration : substs, + install_dir : SYSCONFDIR) + +configure_file( + input : 'etc/pacman.conf.in', + output : 'pacman.conf', + configuration : substs, + install_dir : SYSCONFDIR) + +install_data( + 'proto/PKGBUILD-split.proto', + 'proto/PKGBUILD-vcs.proto', + 'proto/PKGBUILD.proto', + 'proto/proto.install', + install_dir : join_paths(DATAROOTDIR, 'pacman')) + +TEST_ENV = environment() +TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.source_root(), 'scripts/library/')) +TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.build_root(), 'scripts/libmakepkg/')) +TEST_ENV.set('PMTEST_UTIL_DIR', meson.build_root() + '/') +TEST_ENV.set('PMTEST_SCRIPT_DIR', join_paths(meson.build_root(), 'scripts/')) + +subdir('test/pacman') +subdir('test/scripts') +subdir('test/util') + +message('\n '.join([ + '@0@ @1@'.format(meson.project_name(), meson.project_version()), + 'Build information:', + ' prefix : @0@'.format(PREFIX), + ' sysconfdir : @0@'.format(SYSCONFDIR), + ' conf file : @0@'.format(join_paths(SYSCONFDIR, 'pacman.conf')), + ' localstatedir : @0@'.format(LOCALSTATEDIR), + ' database dir : @0@'.format(join_paths(LOCALSTATEDIR, 'lib/pacman/')), + ' cache dir : @0@'.format(join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')), + ' compiler : @0@ @1@'.format(cc.get_id(), cc.version()), + '', + ' Architecture : @0@'.format(carch), + ' Host Type : @0@'.format(chost), + ' File inode command : @0@'.format(inodecmd), + ' File owner command : @0@'.format(ownercmd), + ' File mode command : @0@'.format(modecmd), + ' Directory size command : @0@ @1@'.format(DU.path(), duflags), + ' In-place sed command : @0@ @1@'.format(SED.path(), sedinplaceflags), + ' libalpm version : @0@'.format(libalpm_version), + ' pacman version : @0@'.format(PACKAGE_VERSION), + '', + 'Directory and file information:', + ' root working directory : @0@'.format(ROOTDIR), + ' package extension : @0@'.format(get_option('pkg-ext')), + ' source pkg extension : @0@'.format(get_option('src-ext')), + ' build script name : @0@'.format(BUILDSCRIPT), + ' template directory : @0@'.format(get_option('makepkg-template-dir')), + '', + 'Compilation options:', + ' i18n support : @0@'.format(get_option('i18n')), + ' Build docs : @0@'.format(build_doc), + ' debug build : @0@'.format(get_option('buildtype') == 'debug'), + ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), + ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), + ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and + conf.get('HAVE_LIBSSL') == 1), + ' Use nettle : @0@'.format(conf.has('HAVE_LIBNETTLE') and + conf.get('HAVE_LIBNETTLE') == 1), + '', +])) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000..9e6e527e --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,58 @@ +# build behavior +option('use-git-version', type : 'boolean', value : false, + description : 'take version information from git') +option('buildstatic', type : 'boolean', value : false, + description : 'if true, build staticly linked binaries') + +# directories and filenames +option('root-dir', type : 'string', value : '/', + description : 'set the location of the root operating directory') + +option('pkg-ext', type : 'string', value : '.pkg.tar.gz', + description : 'set the file extension used by packages') + +option('src-ext', type : 'string', value : '.src.tar.gz', + description : 'set the file extension used by source packages') + +option('scriptlet-shell', type : 'string', value : '/bin/sh', + description : 'The full path of the shell used to run install scriptlets') + +option('ldconfig', type : 'string', value : '/sbin/ldconfig', + description : 'set the full path to ldconfig') + +option('buildscript', type : 'string', value : 'PKGBUILD', + description : 'set the build script name used by makepkg') + +option('datarootdir', type : 'string', value : 'share', + description : 'FIXME') + +option('makepkg-template-dir', type : 'string', value : '/usr/share/makepkg-template', + description : 'template dir used by makepkg-template') + +option('debug-suffix', type : 'string', value : 'debug', + description : 'suffix for split debugging symbol packages used by makepkg') + +# dependencies, features +option('doc', type : 'feature', value : 'auto', + description : 'generate docs and manpages') + +option('curl', type : 'feature', value : 'auto', + description : 'use curl to download files') + +option('crypto', type : 'combo', choices : ['openssl', 'nettle'], + description : 'select crypto implementation') + +option('gpgme', type : 'feature', value : 'auto', + description : 'use GPGME for PGP signature verification') +option('gpgme-libdir', type : 'string', value : '/usr/lib', + description : 'search directory for gpgme libraries.') + +option('i18n', type : 'boolean', value : true, + description : 'enable localization of pacman, libalpm and scripts') + +# tools +option('duflags', type : 'string', value : 'autodetect', + description : 'flags to pass to du to measure file size') + +option('sedinplaceflags', type : 'string', value : 'auto', + description : 'flags to pass to sed to edit a file in-place') diff --git a/scripts/libmakepkg/integrity/meson.build b/scripts/libmakepkg/integrity/meson.build new file mode 100644 index 00000000..9aa9061c --- /dev/null +++ b/scripts/libmakepkg/integrity/meson.build @@ -0,0 +1,20 @@ +libmakepkg_module = 'integrity' + +sources = [ + 'generate_checksum.sh.in', + 'generate_signature.sh.in', + 'verify_checksum.sh.in', + 'verify_signature.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/lint_config/meson.build b/scripts/libmakepkg/lint_config/meson.build new file mode 100644 index 00000000..884d63d7 --- /dev/null +++ b/scripts/libmakepkg/lint_config/meson.build @@ -0,0 +1,18 @@ +libmakepkg_module = 'lint_config' + +sources = [ + 'paths.sh.in', + 'variable.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/lint_package/meson.build b/scripts/libmakepkg/lint_package/meson.build new file mode 100644 index 00000000..8eb1aaf7 --- /dev/null +++ b/scripts/libmakepkg/lint_package/meson.build @@ -0,0 +1,20 @@ +libmakepkg_module = 'lint_package' + +sources = [ + 'build_references.sh.in', + 'dotfiles.sh.in', + 'file_names.sh.in', + 'missing_backup.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/lint_pkgbuild/meson.build b/scripts/libmakepkg/lint_pkgbuild/meson.build new file mode 100644 index 00000000..9067c9d6 --- /dev/null +++ b/scripts/libmakepkg/lint_pkgbuild/meson.build @@ -0,0 +1,37 @@ +libmakepkg_module = 'lint_pkgbuild' + +sources = [ + 'arch.sh.in', + 'backup.sh.in', + 'changelog.sh.in', + 'checkdepends.sh.in', + 'conflicts.sh.in', + 'depends.sh.in', + 'epoch.sh.in', + 'install.sh.in', + 'makedepends.sh.in', + 'optdepends.sh.in', + 'options.sh.in', + 'package_function.sh.in', + 'pkgbase.sh.in', + 'pkglist.sh.in', + 'pkgname.sh.in', + 'pkgrel.sh.in', + 'pkgver.sh.in', + 'provides.sh.in', + 'source.sh.in', + 'util.sh.in', + 'variable.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 new file mode 100644 index 00000000..07475b4d --- /dev/null +++ b/scripts/libmakepkg/meson.build @@ -0,0 +1,31 @@ +libmakepkg_modules = [ + { 'name' : 'integrity', 'has_subdir' : true }, + { 'name' : 'lint_config', 'has_subdir' : true }, + { 'name' : 'lint_package', 'has_subdir' : true }, + { 'name' : 'lint_pkgbuild', 'has_subdir' : true }, + { 'name' : 'source', 'has_subdir' : true }, + { 'name' : 'srcinfo', }, + { 'name' : 'tidy', 'has_subdir' : true }, + { 'name' : 'util', 'has_subdir' : true }, +] + +mkdir_p = 'mkdir -p $DESTDIR/@0@' + +foreach module : libmakepkg_modules + custom_target( + 'libmakepkg_@0@'.format(module['name']), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : '@0@.sh.in'.format(module['name']), + output : '@BASENAME@', + install : true, + install_dir : join_paths(get_option('datadir'), 'makepkg')) + + if module.get('has_subdir', false) + subdir(module['name']) + path = join_paths(get_option('prefix'), + get_option('datadir'), + 'makepkg', + module['name']) + meson.add_install_script('sh', '-c', mkdir_p.format(path)) + endif +endforeach diff --git a/scripts/libmakepkg/source/meson.build b/scripts/libmakepkg/source/meson.build new file mode 100644 index 00000000..59326133 --- /dev/null +++ b/scripts/libmakepkg/source/meson.build @@ -0,0 +1,22 @@ +libmakepkg_module = 'source' + +sources = [ + 'bzr.sh.in', + 'file.sh.in', + 'git.sh.in', + 'hg.sh.in', + 'local.sh.in', + 'svn.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/tidy/meson.build b/scripts/libmakepkg/tidy/meson.build new file mode 100644 index 00000000..052ac7a2 --- /dev/null +++ b/scripts/libmakepkg/tidy/meson.build @@ -0,0 +1,23 @@ +libmakepkg_module = 'tidy' + +sources = [ + 'docs.sh.in', + 'emptydirs.sh.in', + 'libtool.sh.in', + 'purge.sh.in', + 'staticlibs.sh.in', + 'strip.sh.in', + 'zipman.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/util/meson.build b/scripts/libmakepkg/util/meson.build new file mode 100644 index 00000000..b0e829c4 --- /dev/null +++ b/scripts/libmakepkg/util/meson.build @@ -0,0 +1,24 @@ +libmakepkg_module = 'util' + +sources = [ + 'compress.sh.in', + 'error.sh.in', + 'message.sh.in', + 'option.sh.in', + 'parseopts.sh.in', + 'pkgbuild.sh.in', + 'source.sh.in', + 'util.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/meson.build b/scripts/meson.build new file mode 100644 index 00000000..1fe3fb78 --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,66 @@ +scripts = [ + 'makepkg-template.pl.in', + 'makepkg.sh.in', + 'pacman-db-upgrade.sh.in', + 'pacman-key.sh.in', + 'pkgdelta.sh.in', + 'repo-add.sh.in' +] + +library_files = [ + 'library/human_to_size.sh', + 'library/size_to_human.sh', +] + +SCRIPT_EDITOR = find_program(configure_file( + input : join_paths(meson.source_root(), 'build-aux/edit-script.sh.in'), + output : 'edit-script.sh', + configuration : substs)) + +m4_edit = generator( + M4, + arguments : ['-P', '-I', meson.current_source_dir(), '@INPUT@'], + output : '@PLAINNAME@', + capture : true) + +foreach script : scripts + custom_target( + script, + input : m4_edit.process(script), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], + output : script.split('.')[0], + depend_files : library_files, + install : true, + install_dir : get_option('bindir')) +endforeach + +foreach symlink : ['repo-remove', 'repo-elephant'] + meson.add_install_script(MESON_MAKE_SYMLINK, + 'repo-add', + join_paths(BINDIR, symlink)) +endforeach + +subdir('libmakepkg') + +custom_target( + 'bash_completion', + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : 'completion/bash_completion.in', + output : 'pacman', + install : true, + install_dir : BASHCOMPDIR) + +foreach symlink : ['pacman-key', 'makepkg'] + meson.add_install_script(MESON_MAKE_SYMLINK, + 'pacman', + join_paths(BASHCOMPDIR, symlink)) +endforeach + +zsh_completion_dir = join_paths(DATAROOTDIR, 'zsh/site-functions') +custom_target( + 'zsh_completion', + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : 'completion/zsh_completion.in', + output : '_pacman', + install : true, + install_dir : zsh_completion_dir) diff --git a/scripts/po/meson.build b/scripts/po/meson.build new file mode 100644 index 00000000..d8b8c51c --- /dev/null +++ b/scripts/po/meson.build @@ -0,0 +1,15 @@ +i18n.gettext( + 'pacman-scripts', + args : [ + '--directory=@0@'.format(meson.current_source_dir()), + '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', + '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--language', 'shell', + + '--keyword=_', + '--flag=_:1:c-format', + + '--keyword=_n:1,2', + '--flag=_n:1:c-format', + '--flag=_n:2:c-format', + ]) diff --git a/src/common/meson.build b/src/common/meson.build new file mode 100644 index 00000000..1443be3b --- /dev/null +++ b/src/common/meson.build @@ -0,0 +1,4 @@ +libcommon_sources = files(''' + ini.c ini.h + util-common.c util-common.h +'''.split()) diff --git a/src/pacman/meson.build b/src/pacman/meson.build new file mode 100644 index 00000000..6926f676 --- /dev/null +++ b/src/pacman/meson.build @@ -0,0 +1,23 @@ +pacman_sources = files(''' + check.h check.c + conf.h conf.c + database.c + deptest.c + files.c + package.h package.c + pacman.h pacman.c + query.c + remove.c + sighandler.h sighandler.c + sync.c + callback.h callback.c + upgrade.c + util.h util.c +'''.split()) + +pacman_conf_sources = files(''' + pacman-conf.c + util.h util.c + callback.h callback.c + conf.h conf.c +'''.split()) diff --git a/src/pacman/po/meson.build b/src/pacman/po/meson.build new file mode 100644 index 00000000..eb45fa1c --- /dev/null +++ b/src/pacman/po/meson.build @@ -0,0 +1,15 @@ +i18n.gettext( + 'pacman', + args : [ + '--directory=@0@'.format(meson.current_source_dir()), + '--msgid-bugs-address=http://bugs.archlinux.org/index.php?project=3', + '--copyright-holder="Pacman Development Team <pacman-dev(a)archlinux.org>"', + '--language', 'c', + + '--keyword=_', + '--flag=_:1:c-format', + + '--keyword=_n:1,2', + '--flag=_n:1:c-format', + '--flag=_n:2:c-format', + ]) diff --git a/src/util/meson.build b/src/util/meson.build new file mode 100644 index 00000000..cc219670 --- /dev/null +++ b/src/util/meson.build @@ -0,0 +1,3 @@ +cleanupdelta_sources = files('cleanupdelta.c') +testpkg_sources = files('testpkg.c') +vercmp_sources = files('vercmp.c') diff --git a/test/pacman/meson.build b/test/pacman/meson.build new file mode 100644 index 00000000..dbdb429e --- /dev/null +++ b/test/pacman/meson.build @@ -0,0 +1,357 @@ +pacman_tests = [ + { 'name': 'tests/backup001.py' }, + { 'name': 'tests/clean001.py' }, + { 'name': 'tests/clean002.py' }, + { 'name': 'tests/clean003.py' }, + { 'name': 'tests/clean004.py' }, + { 'name': 'tests/clean005.py' }, + { 'name': 'tests/config001.py' }, + { 'name': 'tests/config002.py' }, + { 'name': 'tests/database001.py' }, + { 'name': 'tests/database002.py' }, + { 'name': 'tests/database010.py' }, + { 'name': 'tests/database011.py' }, + { 'name': 'tests/database012.py' }, + { 'name': 'tests/dbonly-extracted-files.py' }, + { 'name': 'tests/depconflict100.py' }, + { 'name': 'tests/depconflict110.py' }, + { 'name': 'tests/depconflict111.py' }, + { 'name': 'tests/depconflict120.py' }, + { 'name': 'tests/dependency-cycle-fixed-by-upgrade.py' }, + { 'name': 'tests/deprange001.py', + 'should_fail': true }, + { 'name': 'tests/deptest001.py' }, + { 'name': 'tests/dummy001.py' }, + { 'name': 'tests/epoch001.py' }, + { 'name': 'tests/epoch002.py' }, + { 'name': 'tests/epoch003.py' }, + { 'name': 'tests/epoch004.py' }, + { 'name': 'tests/epoch005.py' }, + { 'name': 'tests/epoch010.py' }, + { 'name': 'tests/epoch011.py' }, + { 'name': 'tests/epoch012.py' }, + { 'name': 'tests/file-conflict-with-installed-pkg.py' }, + { 'name': 'tests/fileconflict001.py' }, + { 'name': 'tests/fileconflict002.py' }, + { 'name': 'tests/fileconflict003.py' }, + { 'name': 'tests/fileconflict004.py' }, + { 'name': 'tests/fileconflict005.py' }, + { 'name': 'tests/fileconflict006.py' }, + { 'name': 'tests/fileconflict007.py' }, + { 'name': 'tests/fileconflict008.py' }, + { 'name': 'tests/fileconflict009.py' }, + { 'name': 'tests/fileconflict010.py' }, + { 'name': 'tests/fileconflict011.py' }, + { 'name': 'tests/fileconflict012.py' }, + { 'name': 'tests/fileconflict013.py' }, + { 'name': 'tests/fileconflict015.py' }, + { 'name': 'tests/fileconflict016.py' }, + { 'name': 'tests/fileconflict017.py' }, + { 'name': 'tests/fileconflict020.py' }, + { 'name': 'tests/fileconflict021.py' }, + { 'name': 'tests/fileconflict022.py' }, + { 'name': 'tests/fileconflict023.py' }, + { 'name': 'tests/fileconflict024.py' }, + { 'name': 'tests/fileconflict025.py' }, + { 'name': 'tests/fileconflict030.py' }, + { 'name': 'tests/fileconflict031.py' }, + { 'name': 'tests/fileconflict032.py' }, + { 'name': 'tests/hook-abortonfail.py' }, + { 'name': 'tests/hook-description-reused.py' }, + { 'name': 'tests/hook-exec-reused.py' }, + { 'name': 'tests/hook-exec-with-arguments.py' }, + { 'name': 'tests/hook-file-change-packages.py' }, + { 'name': 'tests/hook-file-remove-trigger-match.py' }, + { 'name': 'tests/hook-file-upgrade-nomatch.py' }, + { 'name': 'tests/hook-invalid-trigger.py' }, + { 'name': 'tests/hook-pkg-install-trigger-match.py' }, + { 'name': 'tests/hook-pkg-postinstall-trigger-match.py' }, + { 'name': 'tests/hook-pkg-remove-trigger-match.py' }, + { 'name': 'tests/hook-pkg-upgrade-trigger-match.py' }, + { 'name': 'tests/hook-target-list.py' }, + { 'name': 'tests/hook-type-reused.py' }, + { 'name': 'tests/hook-upgrade-trigger-no-match.py' }, + { 'name': 'tests/hook-when-reused.py' }, + { 'name': 'tests/ignore001.py' }, + { 'name': 'tests/ignore002.py' }, + { 'name': 'tests/ignore003.py' }, + { 'name': 'tests/ignore004.py' }, + { 'name': 'tests/ignore005.py' }, + { 'name': 'tests/ignore006.py' }, + { 'name': 'tests/ignore007.py' }, + { 'name': 'tests/ignore008.py' }, + { 'name': 'tests/ldconfig001.py' }, + { 'name': 'tests/ldconfig002.py' }, + { 'name': 'tests/ldconfig003.py' }, + { 'name': 'tests/mode001.py' }, + { 'name': 'tests/mode002.py' }, + { 'name': 'tests/mode003.py' }, + { 'name': 'tests/noupgrade-inverted.py' }, + { 'name': 'tests/overwrite-files-match-negated.py' }, + { 'name': 'tests/overwrite-files-match.py' }, + { 'name': 'tests/overwrite-files-nonmatch.py' }, + { 'name': 'tests/pacman001.py' }, + { 'name': 'tests/pacman002.py' }, + { 'name': 'tests/pacman003.py' }, + { 'name': 'tests/pacman004.py' }, + { 'name': 'tests/pacman005.py' }, + { 'name': 'tests/provision001.py' }, + { 'name': 'tests/provision002.py' }, + { 'name': 'tests/provision003.py' }, + { 'name': 'tests/provision004.py' }, + { 'name': 'tests/provision010.py' }, + { 'name': 'tests/provision011.py' }, + { 'name': 'tests/provision012.py' }, + { 'name': 'tests/provision020.py' }, + { 'name': 'tests/provision021.py' }, + { 'name': 'tests/provision022.py' }, + { 'name': 'tests/query001.py' }, + { 'name': 'tests/query002.py' }, + { 'name': 'tests/query003.py' }, + { 'name': 'tests/query004.py' }, + { 'name': 'tests/query005.py' }, + { 'name': 'tests/query006.py', + # expect failure on 32 bit machines + 'should_fail': cc.sizeof('ssize_t') < 8 }, + { 'name': 'tests/query007.py' }, + { 'name': 'tests/query010.py' }, + { 'name': 'tests/query011.py' }, + { 'name': 'tests/query012.py' }, + { 'name': 'tests/querycheck001.py' }, + { 'name': 'tests/querycheck002.py' }, + { 'name': 'tests/querycheck_fast_file_type.py' }, + { 'name': 'tests/reason001.py' }, + { 'name': 'tests/remove-assumeinstalled.py' }, + { 'name': 'tests/remove-directory-replaced-with-symlink.py' }, + { 'name': 'tests/remove-optdepend-of-installed-package.py' }, + { 'name': 'tests/remove-recursive-cycle.py' }, + { 'name': 'tests/remove001.py' }, + { 'name': 'tests/remove002.py' }, + { 'name': 'tests/remove010.py' }, + { 'name': 'tests/remove011.py' }, + { 'name': 'tests/remove012.py' }, + { 'name': 'tests/remove020.py' }, + { 'name': 'tests/remove021.py' }, + { 'name': 'tests/remove030.py' }, + { 'name': 'tests/remove031.py' }, + { 'name': 'tests/remove040.py' }, + { 'name': 'tests/remove041.py' }, + { 'name': 'tests/remove042.py' }, + { 'name': 'tests/remove043.py' }, + { 'name': 'tests/remove044.py' }, + { 'name': 'tests/remove045.py' }, + { 'name': 'tests/remove047.py' }, + { 'name': 'tests/remove049.py' }, + { 'name': 'tests/remove050.py' }, + { 'name': 'tests/remove051.py' }, + { 'name': 'tests/remove052.py' }, + { 'name': 'tests/remove060.py' }, + { 'name': 'tests/remove070.py' }, + { 'name': 'tests/remove071.py' }, + { 'name': 'tests/replace100.py' }, + { 'name': 'tests/replace101.py' }, + { 'name': 'tests/replace102.py' }, + { 'name': 'tests/replace103.py' }, + { 'name': 'tests/replace104.py' }, + { 'name': 'tests/replace110.py', + 'should_fail': true }, + { 'name': 'tests/scriptlet001.py' }, + { 'name': 'tests/scriptlet002.py' }, + { 'name': 'tests/sign001.py' }, + { 'name': 'tests/sign002.py' }, + { 'name': 'tests/skip-remove-with-glob-chars.py' }, + { 'name': 'tests/smoke001.py' }, + { 'name': 'tests/smoke002.py' }, + { 'name': 'tests/smoke003.py' }, + { 'name': 'tests/smoke004.py' }, + { 'name': 'tests/symlink-replace-with-dir.py' }, + { 'name': 'tests/symlink001.py' }, + { 'name': 'tests/symlink002.py' }, + { 'name': 'tests/symlink010.py' }, + { 'name': 'tests/symlink011.py' }, + { 'name': 'tests/symlink012.py' }, + { 'name': 'tests/symlink020.py' }, + { 'name': 'tests/symlink021.py' }, + { 'name': 'tests/sync-install-assumeinstalled.py' }, + { 'name': 'tests/sync-nodepversion01.py' }, + { 'name': 'tests/sync-nodepversion02.py' }, + { 'name': 'tests/sync-nodepversion03.py' }, + { 'name': 'tests/sync-nodepversion04.py' }, + { 'name': 'tests/sync-nodepversion05.py' }, + { 'name': 'tests/sync-nodepversion06.py' }, + { 'name': 'tests/sync-sysupgrade-print-replaced-packages.py' }, + { 'name': 'tests/sync-update-assumeinstalled.py' }, + { 'name': 'tests/sync-update-package-removing-required-provides.py', + 'should_fail': true }, + { 'name': 'tests/sync001.py' }, + { 'name': 'tests/sync002.py' }, + { 'name': 'tests/sync003.py' }, + { 'name': 'tests/sync009.py' }, + { 'name': 'tests/sync010.py' }, + { 'name': 'tests/sync011.py' }, + { 'name': 'tests/sync012.py' }, + { 'name': 'tests/sync020.py' }, + { 'name': 'tests/sync021.py' }, + { 'name': 'tests/sync022.py' }, + { 'name': 'tests/sync023.py' }, + { 'name': 'tests/sync024.py' }, + { 'name': 'tests/sync030.py' }, + { 'name': 'tests/sync031.py' }, + { 'name': 'tests/sync040.py' }, + { 'name': 'tests/sync041.py' }, + { 'name': 'tests/sync042.py' }, + { 'name': 'tests/sync043.py' }, + { 'name': 'tests/sync044.py' }, + { 'name': 'tests/sync045.py' }, + { 'name': 'tests/sync046.py' }, + { 'name': 'tests/sync050.py' }, + { 'name': 'tests/sync051.py' }, + { 'name': 'tests/sync052.py' }, + { 'name': 'tests/sync100.py' }, + { 'name': 'tests/sync1000.py' }, + { 'name': 'tests/sync1003.py' }, + { 'name': 'tests/sync1004.py' }, + { 'name': 'tests/sync1008.py' }, + { 'name': 'tests/sync101.py' }, + { 'name': 'tests/sync102.py' }, + { 'name': 'tests/sync103.py' }, + { 'name': 'tests/sync104.py' }, + { 'name': 'tests/sync110.py' }, + { 'name': 'tests/sync1100.py' }, + { 'name': 'tests/sync1101.py' }, + { 'name': 'tests/sync1102.py' }, + { 'name': 'tests/sync1103.py' }, + { 'name': 'tests/sync1104.py' }, + { 'name': 'tests/sync1105.py' }, + { 'name': 'tests/sync120.py' }, + { 'name': 'tests/sync130.py' }, + { 'name': 'tests/sync131.py' }, + { 'name': 'tests/sync132.py' }, + { 'name': 'tests/sync133.py' }, + { 'name': 'tests/sync134.py' }, + { 'name': 'tests/sync135.py' }, + { 'name': 'tests/sync136.py' }, + { 'name': 'tests/sync137.py' }, + { 'name': 'tests/sync138.py' }, + { 'name': 'tests/sync139.py' }, + { 'name': 'tests/sync140.py' }, + { 'name': 'tests/sync141.py' }, + { 'name': 'tests/sync150.py' }, + { 'name': 'tests/sync200.py' }, + { 'name': 'tests/sync300.py' }, + { 'name': 'tests/sync306.py' }, + { 'name': 'tests/sync400.py' }, + { 'name': 'tests/sync401.py' }, + { 'name': 'tests/sync402.py' }, + { 'name': 'tests/sync403.py', + 'should_fail': true }, + { 'name': 'tests/sync404.py' }, + { 'name': 'tests/sync405.py' }, + { 'name': 'tests/sync406.py', + 'should_fail': true }, + { 'name': 'tests/sync407.py' }, + { 'name': 'tests/sync500.py' }, + { 'name': 'tests/sync501.py' }, + { 'name': 'tests/sync502.py' }, + { 'name': 'tests/sync503.py' }, + { 'name': 'tests/sync600.py' }, + { 'name': 'tests/sync700.py' }, + { 'name': 'tests/sync701.py' }, + { 'name': 'tests/sync702.py' }, + { 'name': 'tests/sync890.py' }, + { 'name': 'tests/sync891.py' }, + { 'name': 'tests/sync892.py' }, + { 'name': 'tests/sync893.py' }, + { 'name': 'tests/sync895.py' }, + { 'name': 'tests/sync896.py' }, + { 'name': 'tests/sync897.py' }, + { 'name': 'tests/sync898.py' }, + { 'name': 'tests/sync899.py' }, + { 'name': 'tests/sync900.py' }, + { 'name': 'tests/sync901.py' }, + { 'name': 'tests/sync990.py' }, + { 'name': 'tests/sync992.py' }, + { 'name': 'tests/sync993.py' }, + { 'name': 'tests/sync999.py' }, + { 'name': 'tests/trans001.py' }, + { 'name': 'tests/type001.py' }, + { 'name': 'tests/unresolvable001.py' }, + { 'name': 'tests/upgrade001.py' }, + { 'name': 'tests/upgrade002.py' }, + { 'name': 'tests/upgrade003.py' }, + { 'name': 'tests/upgrade004.py' }, + { 'name': 'tests/upgrade005.py' }, + { 'name': 'tests/upgrade006.py' }, + { 'name': 'tests/upgrade010.py' }, + { 'name': 'tests/upgrade011.py' }, + { 'name': 'tests/upgrade013.py' }, + { 'name': 'tests/upgrade020.py' }, + { 'name': 'tests/upgrade021.py' }, + { 'name': 'tests/upgrade022.py' }, + { 'name': 'tests/upgrade023.py' }, + { 'name': 'tests/upgrade024.py' }, + { 'name': 'tests/upgrade025.py' }, + { 'name': 'tests/upgrade026.py' }, + { 'name': 'tests/upgrade027.py' }, + { 'name': 'tests/upgrade028.py' }, + { 'name': 'tests/upgrade029.py' }, + { 'name': 'tests/upgrade030.py' }, + { 'name': 'tests/upgrade031.py' }, + { 'name': 'tests/upgrade032.py' }, + { 'name': 'tests/upgrade040.py' }, + { 'name': 'tests/upgrade041.py' }, + { 'name': 'tests/upgrade042.py' }, + { 'name': 'tests/upgrade043.py' }, + { 'name': 'tests/upgrade045.py' }, + { 'name': 'tests/upgrade050.py' }, + { 'name': 'tests/upgrade051.py' }, + { 'name': 'tests/upgrade052.py' }, + { 'name': 'tests/upgrade053.py' }, + { 'name': 'tests/upgrade054.py' }, + { 'name': 'tests/upgrade055.py' }, + { 'name': 'tests/upgrade056.py' }, + { 'name': 'tests/upgrade057.py' }, + { 'name': 'tests/upgrade058.py' }, + { 'name': 'tests/upgrade059.py' }, + { 'name': 'tests/upgrade060.py' }, + { 'name': 'tests/upgrade061.py' }, + { 'name': 'tests/upgrade070.py' }, + { 'name': 'tests/upgrade071.py' }, + { 'name': 'tests/upgrade072.py' }, + { 'name': 'tests/upgrade073.py' }, + { 'name': 'tests/upgrade074.py' }, + { 'name': 'tests/upgrade075.py' }, + { 'name': 'tests/upgrade076.py' }, + { 'name': 'tests/upgrade077.py' }, + { 'name': 'tests/upgrade078.py', + 'should_fail': true }, + { 'name': 'tests/upgrade080.py' }, + { 'name': 'tests/upgrade081.py' }, + { 'name': 'tests/upgrade082.py' }, + { 'name': 'tests/upgrade083.py' }, + { 'name': 'tests/upgrade084.py' }, + { 'name': 'tests/upgrade090.py' }, + { 'name': 'tests/upgrade100.py' }, + { 'name': 'tests/xfercommand001.py' }, +] + +foreach testobj : pacman_tests + input = testobj.get('name') + test_name = input.split('/')[1] + should_fail = testobj.get('should_fail', false) + + test( + test_name, + PYTHON, + args : [ + join_paths(meson.source_root(), 'build-aux/tap-driver.py'), + join_paths(meson.current_source_dir(), 'pactest.py'), + '--scriptlet-shell', get_option('scriptlet-shell'), + '--bindir', meson.build_root(), + '--ldconfig', LDCONFIG, + '--verbose', + join_paths(meson.current_source_dir(), input) + ], + depends : [pacman_bin], + should_fail : should_fail) +endforeach diff --git a/test/scripts/meson.build b/test/scripts/meson.build new file mode 100644 index 00000000..6d6194dd --- /dev/null +++ b/test/scripts/meson.build @@ -0,0 +1,12 @@ +tests = [ + 'parseopts_test.sh', + 'makepkg-template_test.sh', + 'human_to_size_test.sh', +] + +foreach tst : tests + test(tst, + BASH, + env : TEST_ENV, + args : [join_paths(meson.current_source_dir(), tst)]) +endforeach diff --git a/test/util/meson.build b/test/util/meson.build new file mode 100644 index 00000000..07b29e5c --- /dev/null +++ b/test/util/meson.build @@ -0,0 +1,6 @@ +test('vercmptest', + BASH, + env : TEST_ENV, + args : [ + join_paths(meson.current_source_dir(), 'vercmptest.sh') + ]) -- 2.19.1

5 17

[pacman-dev] [PATCH 1/2] makepkg: fix .PKGINFO/.BUILDINFO files swallowing status printing
by Eli Schwartz 31 Oct '18

31 Oct '18

The respective write_* functions are low-level and shouldn't be outputting statuses; move these to the logic flow where they are used. This ensures the functions can be used in the future wherever, and also solves an issue where, as fallout from the message.sh retrofitting in commit 882e707e40bbade0111cf3bdedbdac4d4b70453b, the statuses got redirected to the actual files. The resulting package was technically correct, except that it contained useless lines which pacman ignored, and repo-add also ignored but at the same time generated an error message: /usr/bin/repo-add: line 335: declare: `=-> Generating .PKGINFO file...': not a valid identifier Thirdparty package tools with stricter parsers may abort with errors, and "repose" is known to do so. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 87253883..3ac03d11 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -634,7 +634,6 @@ write_pkginfo() { merge_arch_attrs - msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" @@ -672,8 +671,6 @@ write_pkginfo() { } write_buildinfo() { - msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" - write_kv_pair "format" "1" write_kv_pair "pkgname" "$pkgname" @@ -728,7 +725,9 @@ create_package() { msg "$(gettext "Creating package \"%s\"...")" "$pkgname" pkgarch=$(get_pkg_arch) + msg2 "$(gettext "Generating %s file...")" ".PKGINFO" write_pkginfo > .PKGINFO + msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" write_buildinfo > .BUILDINFO # check for changelog/install files -- 2.19.1

1 1

[pacman-dev] [PATCH] meson: add a wrapper to bootstrap scripts from within build dir
by Dave Reisner 29 Oct '18

29 Oct '18

This doesn't do quite as good of a job of "hiding away" the real script as we did with autotools, but it satisfies the need for being able to run scripts which depend on libmakepkg with the local copy within the repo. We do, however, improve upon the autotools script by ensuring that the bash path used in configuring pacman is the interpreter used to run the underlying script. --- Naturally, this applies on top of my previous meson patch. build-aux/meson-install-script.sh | 6 ++++++ build-aux/script-wrapper.sh.in | 6 ++++++ meson.build | 1 + scripts/meson.build | 33 +++++++++++++++++++++++++++---- 4 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 build-aux/meson-install-script.sh create mode 100755 build-aux/script-wrapper.sh.in diff --git a/build-aux/meson-install-script.sh b/build-aux/meson-install-script.sh new file mode 100644 index 00000000..f5a42fca --- /dev/null +++ b/build-aux/meson-install-script.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +built_script=$1 +dest_path=$2 + +install -Dm755 "$built_script" "$DESTDIR/$dest_path" diff --git a/build-aux/script-wrapper.sh.in b/build-aux/script-wrapper.sh.in new file mode 100755 index 00000000..f87ae6f0 --- /dev/null +++ b/build-aux/script-wrapper.sh.in @@ -0,0 +1,6 @@ +#!/bin/bash + +# This script serves as a trampoline for running scripts which depend on +# libmakepkg with the libmakepkg within the build tree. + +LIBRARY=@BUILDDIR@/libmakepkg exec @BASH@ -$- @REAL_PROGPATH@ "$@" diff --git a/meson.build b/meson.build index d81c86b7..1ec63a56 100644 --- a/meson.build +++ b/meson.build @@ -33,6 +33,7 @@ SED = find_program('sed') DU = find_program('du') LDCONFIG = get_option('ldconfig') MESON_MAKE_SYMLINK = join_paths(meson.source_root(), 'build-aux/meson-make-symlink.sh') +MESON_INSTALL_SCRIPT = join_paths(meson.source_root(), 'build-aux/meson-install-script.sh') BASH = find_program('bash4', 'bash') if BASH.found() diff --git a/scripts/meson.build b/scripts/meson.build index 1fe3fb78..535eccba 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -24,14 +24,39 @@ m4_edit = generator( capture : true) foreach script : scripts - custom_target( + script_shortname = script.split('.')[0] + + # Build the script, but don't install it. We want to keep it as a "private" + # artifact that we reference from a wrapper script in order to bootstrap it + # the build directory. + internal_script = custom_target( script, input : m4_edit.process(script), command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], - output : script.split('.')[0], + output : script, depend_files : library_files, - install : true, - install_dir : get_option('bindir')) + build_by_default : true) + + # Create a wrapper script that bootstraps the real script within the build + # directory. + custom_target( + 'wrap_@0@'.format(script_shortname), + 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) + + # Install the real script + meson.add_install_script(MESON_INSTALL_SCRIPT, + internal_script.full_path(), + join_paths(BINDIR, script_shortname)) endforeach foreach symlink : ['repo-remove', 'repo-elephant'] -- 2.19.1

1 0

[pacman-dev] [PATCH] pacman-key: just accept one file to verify, and enforce detached sigs
by Eli Schwartz 21 Oct '18

21 Oct '18

Simply pass options on to gpg the same way gpg uses them -- no looping through and checking lots of signatures. This prevents a situation where the signature file to be verified is manipulated to contain a complete signature which is valid, but not a detached signature for the file you are actually trying to verify. gpg does not offer an option to verify many files at once by naming each signature/file pair, and there's no reason for us to do so either, since it would be quite tiresome to do so. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/pacman-key.sh.in | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 0f1630a9..0573e92f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -486,18 +486,19 @@ refresh_keys() { } verify_sig() { - local ret=0 - for sig; do - msg "Checking %s..." "$sig" - if grep -q 'BEGIN PGP SIGNATURE' "$sig"; then - error "$(gettext "Cannot use armored signatures for packages: %s")" "$sig" - return 1 - fi - if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE).*$'; then - error "$(gettext "The signature identified by %s could not be verified.")" "$sig" - ret=1 - fi - done + local ret=0 sig=$1 file=$2 + if [[ -z $file ]]; then + file=${sig%.*} + fi + msg "Checking %s..." "$sig" + if grep -q 'BEGIN PGP SIGNATURE' "$sig"; then + error "$(gettext "Cannot use armored signatures for packages: %s")" "$sig" + exit 1 + fi + if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" "$file" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE).*$'; then + error "$(gettext "The signature identified by %s could not be verified.")" "$sig" + ret=1 + fi exit $ret } -- 2.17.0

2 3

[pacman-dev] [PATCH] libmakepkg: fix linting arrays of empty strings
by morganamilo 21 Oct '18

21 Oct '18

[[ ${array[@]} ]] will resolve to false if array only contains empty strings. This means that values such as "depends=('')" can be inserted into a pkgbuild and bypass the linting. This causes makepkg to successfully build the package while pacman refuses to install it because of the unmet dependency on ''. Instead check the length of the array. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index c6f8a82d..b29229a3 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -60,7 +60,7 @@ extract_global_variable() { if (( isarray )); then array_build ref "$attr" - [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" + (( ${#ref[@]} )) && array_build "$outputvar" "$attr" else [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi @@ -144,7 +144,7 @@ get_pkgbuild_all_split_attributes() { done done - [[ ${all_list[@]} ]] && array_build "$outputvar" all_list + (( ${#all_list[@]} )) && array_build "$outputvar" all_list } ## -- 2.19.1

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-51-gb5d62d2c
by Allan McRae 21 Oct '18

21 Oct '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 b5d62d2c91a2caf5c18945921cdf12af6f36b2d4 (commit) via 3561c872ca0980c76442fcbf3985cc92a8f572f7 (commit) via 882e707e40bbade0111cf3bdedbdac4d4b70453b (commit) via b5191ea140386dd9b73e4509ffa9a6d347c1b5fa (commit) via e12d03217430500be269392463876440210f7916 (commit) via ea877c596bc380acd608468e4e38186ac0252197 (commit) via c887d2cf00d7c2238edd1d317b8c887e774b6d3f (commit) via ac959bb9c6ce549047a954109ae825158855e386 (commit) via 9886566abb375043740167ce5066f1a186c71176 (commit) via 2c91d08e62dd13979192df4a0b2ca76bde87cfd0 (commit) via 79a528735ee198ac880b65d946cfde9181872b44 (commit) via 02255fd97e831854d1f29e6fac687a4a508f44fa (commit) via 8c9046e6042fd23bf6a1bb204062fc644c322689 (commit) via afb9c0140fd6949ede64cc1a304e9349772fca04 (commit) via ffde85aadfe0e08fb710102d0a547335e9d1a200 (commit) via d96d0ffe7c88d9521a9e6cdd65939e9a20733cdf (commit) from 7afe51171fe063bf3031cc68fc8c7ac914a01de2 (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 b5d62d2c91a2caf5c18945921cdf12af6f36b2d4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 28 13:19:43 2018 -0400 Port scripts to use libmakepkg's messaging code. Remove all remnants of library/{output_format,term_colors}.sh Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3561c872ca0980c76442fcbf3985cc92a8f572f7 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 28 13:19:42 2018 -0400 message.sh: add modifications from output_format.sh In the spirit of making libmakepkg more useful as a library, and, critically, *using* that library for additional pacman scripts, we should include all of output_format.sh and term_colors.sh directly in libmakepkg and hopefully stop having to embed additional copies in e.g. repo-add via m4 macros. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 882e707e40bbade0111cf3bdedbdac4d4b70453b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 28 13:19:41 2018 -0400 makepkg: send messages to stdout rather than stderr This behavior is confusing, since it means absolutely everything goes to stderr and makepkg itself is a quiet program that produces no expected output??? The only situation where messages should go to stderr rather than stdout, is with --geninteg which is meant to return the checksums on stdout (but we don't want to totally get rid of status messages when redirecting the results elsewhere, or, worse, redirect status messages to a PKGBUILD). For this specific case, redirect message output to stderr in the --geninteg callers directly. Implements FS#17173 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b5191ea140386dd9b73e4509ffa9a6d347c1b5fa Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Aug 21 10:15:12 2018 -0400 makepkg: use builtin globbing to print files in package - it comes with free collation when moving the LC_ALL declaration up a bit; this fixes a bug where the .FILES were not being properly sorted and their order depended on directory creation order, which broke reproducible builds in the wild. - it handles sorting null-delimited output everywhere, without sort -z; this lets us get rid of sed hacks - it is faster than invoking multiple find subprocesses - dotfiles can be automatically printed *and the C locale sorts them first* with a single ** glob Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e12d03217430500be269392463876440210f7916 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 13 21:20:56 2018 -0400 makepkg: use bash 4.4 to localize `set` without explicitly saving/restoring Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ea877c596bc380acd608468e4e38186ac0252197 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Sep 7 11:58:53 2018 -0400 bash-completion: disable completions for pacman --search operations We don't need exact package name completions for something that expects a regular expression *search*, which is what we currently do. If you want a package name completion for a search, you don't need the search. This change is consistent with the current state of zsh completions. Fixes FS#59965 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c887d2cf00d7c2238edd1d317b8c887e774b6d3f Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Sep 7 11:58:52 2018 -0400 bash-completion: don't complete filenames when they're not wanted Filename completion should only be generated for makepkg, when using the options -p or --config... which means we should offer option completions by default. Filename completion for pacman, should not be generated when using -Qu, or -F without -o. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ac959bb9c6ce549047a954109ae825158855e386 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> commit 9886566abb375043740167ce5066f1a186c71176 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> commit 2c91d08e62dd13979192df4a0b2ca76bde87cfd0 Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Oct 16 18:49:23 2018 +0100 libmakepkg: fix linting arrays of empty strings [[ ${array[@]} ]] will resolve to false if array only contains empty strings. This means that values such as "depends=('')" can be inserted into a pkgbuild and bypass the linting. This causes makepkg to successfully build the package while pacman refuses to install it because of the unmet dependency on ''. Instead check the length of the array. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 79a528735ee198ac880b65d946cfde9181872b44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 20 20:52:34 2018 -0400 Drop vestiges of SIZECMD SIZECMD was replaced in 1af766987f with a POSIX solution, and this token is no longer used/needed. commit 02255fd97e831854d1f29e6fac687a4a508f44fa Author: morganamilo <morganamilo(a)gmail.com> Date: Wed Oct 17 16:40:47 2018 +0100 libalpm: process needed before group selection When --needed is used, up to date packages are now filtered out before showing the group select. Fixes FS#22870. Signed-off-by: morganamilo <morganamilo(a)gmail.com> commit 8c9046e6042fd23bf6a1bb204062fc644c322689 Author: morganamilo <morganamilo(a)gmail.com> Date: Sat Oct 20 14:58:52 2018 +0100 pacman: don't error when a group exists but all packages are ignored Currently when attempting to sync a group where all packages are ignored, either by ignorepkg, ignoregroup or --needed, pacman will error with "target not found". Instead, if a group has no packages check if the group exists before throwing an error. Signed-off-by: morganamilo <morganamilo(a)gmail.com> commit afb9c0140fd6949ede64cc1a304e9349772fca04 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 21:12:33 2018 -0400 Port pactest to python3 Use BytesIO instead of StringIO, and ensure that we unicode-encode data where needed. commit ffde85aadfe0e08fb710102d0a547335e9d1a200 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. commit d96d0ffe7c88d9521a9e6cdd65939e9a20733cdf 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> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- lib/libalpm/dload.c | 3 +- lib/libalpm/sync.c | 11 ++++++++ lib/libalpm/util.c | 30 +++++++++++++++++++- scripts/Makefile.am | 21 ++++---------- scripts/completion/bash_completion.in | 20 ++++++++++---- .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 14 ++++++++-- scripts/libmakepkg/util/pkgbuild.sh.in | 4 +-- scripts/library/README | 10 ------- scripts/library/output_format.sh | 32 ---------------------- scripts/library/term_colors.sh | 21 -------------- scripts/makepkg.sh.in | 15 ++++++---- scripts/pacman-db-upgrade.sh.in | 12 +++++--- scripts/pacman-key.sh.in | 12 +++++--- scripts/pkgdelta.sh.in | 12 +++++--- scripts/po/POTFILES.in | 2 -- scripts/repo-add.sh.in | 14 ++++++++-- src/pacman/sync.c | 18 ++++++++++++ test/pacman/pactest.py | 5 ++-- test/pacman/pmdb.py | 4 +-- test/pacman/pmpkg.py | 6 ++-- test/pacman/tests/TESTS | 2 ++ test/pacman/tests/scriptlet-signal-handling.py | 15 ++++++++++ test/pacman/tests/scriptlet-signal-reset.py | 11 ++++++++ test/pacman/util.py | 2 +- 26 files changed, 175 insertions(+), 125 deletions(-) delete mode 100644 scripts/library/output_format.sh delete mode 100644 scripts/library/term_colors.sh 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 1/2] bash-completion: don't complete filenames when they're not wanted
by Eli Schwartz 21 Oct '18

21 Oct '18

Filename completion should only be generated for makepkg, when using the options -p or --config... which means we should offer option completions by default. Filename completion for pacman, should not be generated when using -Qu, or -F without -o. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/completion/bash_completion.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index d99fba53..31b41f71 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -71,10 +71,13 @@ _pacman_key() { } _makepkg() { + compopt +o default local cur opts prev COMPREPLY=() _get_comp_words_by_ref cur prev - if [[ $cur = -* && ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vhp]) ]]; then + if [[ $prev = @(-p|--config) ]]; then + compopt -o default + elif [[ ! $prev =~ ^-(-(config|help|key|version)$|\w*[Vh]) ]]; then opts=('allsource asdeps check clean cleanbuild config force geninteg help holdver ignorearch install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare noprogressbar nosign @@ -101,6 +104,7 @@ _pacman_repo_list() { } _pacman() { + compopt -o default local common core cur database files prev query remove sync upgrade o COMPREPLY=() _get_comp_words_by_ref cur prev @@ -131,12 +135,14 @@ _pacman() { D|R) _pacman_pkg Qq;; F) - _arch_incomp 'l list' && _pacman_pkg Slq - ;; + { _arch_incomp 'l list' && _pacman_pkg Slq ; } || + _arch_incomp 'o owns' || + compopt +o default;; Q) { _arch_incomp 'g groups' && _pacman_pkg Qg sort; } || { _arch_incomp 'p file' && _pacman_file; } || - _arch_incomp 'o owns' || _arch_incomp 'u upgrades' || + { _arch_incomp 'u upgrades' && compopt +o default; } || + _arch_incomp 'o owns' || _pacman_pkg Qq;; S) { _arch_incomp 'g groups' && _pacman_pkg Sg; } || @@ -153,8 +159,8 @@ _pacman_file() { compopt -o filenames; _filedir 'pkg.tar*' } -complete -F _pacman -o default pacman -complete -F _makepkg -o default makepkg +complete -F _pacman pacman +complete -F _makepkg makepkg complete -F _pacman_key -o default pacman-key # ex:et ts=2 sw=2 ft=sh -- 2.18.0

2 2

[pacman-dev] [PATCH] handle EINTR while polling scripts/hooks
by Andrew Gregory 21 Oct '18

21 Oct '18

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> --- lib/libalpm/util.c | 10 +++++++++- test/pacman/tests/TESTS | 1 + test/pacman/tests/scriptlet-signal-handling.py | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/scriptlet-signal-handling.py diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index eaf85e93..d33eef2a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -665,6 +665,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], ssize_t olen = 0, ilen = 0; nfds_t nfds = 2; struct pollfd fds[2], *child2parent = &(fds[0]), *parent2child = &(fds[1]); + int poll_ret; child2parent->fd = child2parent_pipefd[TAIL]; child2parent->events = POLLIN; @@ -685,7 +686,14 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], #define STOP_POLLING(p) do { close(p->fd); p->fd = -1; } while(0) while((child2parent->fd != -1 || parent2child->fd != -1) - && poll(fds, nfds, -1) > 0) { + && (poll_ret = poll(fds, nfds, -1)) != 0) { + if(poll_ret == -1) { + if(errno == EINTR) { + continue; + } else { + break; + } + } if(child2parent->revents & POLLIN) { if(_alpm_chroot_read_from_child(handle, child2parent->fd, ibuf, &ilen, sizeof(ibuf)) != 0) { diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 5deb93c4..dc0b4ec3 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/replace102.py TESTS += test/pacman/tests/replace103.py TESTS += test/pacman/tests/replace104.py TESTS += test/pacman/tests/replace110.py +TESTS += test/pacman/tests/scriptlet-signal-handling.py TESTS += test/pacman/tests/scriptlet-signal-reset.py TESTS += test/pacman/tests/scriptlet001.py TESTS += test/pacman/tests/scriptlet002.py diff --git a/test/pacman/tests/scriptlet-signal-handling.py b/test/pacman/tests/scriptlet-signal-handling.py new file mode 100644 index 00000000..e65df55b --- /dev/null +++ b/test/pacman/tests/scriptlet-signal-handling.py @@ -0,0 +1,15 @@ +self.description = "Handle signal interrupts while running scriptlets/hooks" + +p1 = pmpkg("dummy") +p1.install['post_install'] = """ + kill -INT $PPID # send an arbitrary signal that pacman catches + sleep 1 # give alpm time to close the socket if EINTR was not handled + echo to-parent # if the interrupt is not handled this will die with SIGPIPE + echo success > interrupt_was_handled + """ +self.addpkg(p1) + +self.args = "-U %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_EXIST=interrupt_was_handled") -- 2.19.0

2 1

[pacman-dev] [PATCH] reset signal handlers before running scripts/hooks
by Andrew Gregory 21 Oct '18

21 Oct '18

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> --- Hopefully nobody ignores or depends on signals outside of the POSIX list. As far as I can tell, the only way to reset all signal handlers is to iterate over the entire range of positive integers. lib/libalpm/util.c | 20 ++++++++++++++++++++ test/pacman/tests/TESTS | 1 + test/pacman/tests/scriptlet-signal-reset.py | 11 +++++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/pacman/tests/scriptlet-signal-reset.py diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index a06f5bfd..eaf85e93 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -548,6 +548,25 @@ static int _alpm_chroot_read_from_child(alpm_handle_t *handle, int fd, return 0; } +static void _alpm_reset_signals(void) +{ + /* reset POSIX defined signals (see signal.h) */ + /* there are likely more but there is no easy way + * to get the full list of valid signals */ + int *i, signals[] = { + SIGABRT, SIGALRM, SIGBUS, SIGCHLD, SIGCONT, SIGFPE, SIGHUP, SIGILL, + SIGINT, SIGKILL, SIGPIPE, SIGQUIT, SIGSEGV, SIGSTOP, SIGTERM, SIGTSTP, + SIGTTIN, SIGTTOU, SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, SIGTRAP, + SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ, + 0 + }; + struct sigaction def; + def.sa_handler = SIG_DFL; + for(i = signals; *i; i++) { + sigaction(*i, &def, NULL); + } +} + /** Execute a command with arguments in a chroot. * @param handle the context handle * @param cmd command to execute @@ -633,6 +652,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], exit(1); } umask(0022); + _alpm_reset_signals(); execv(cmd, argv); /* execv only returns if there was an error */ fprintf(stderr, _("call to execv failed (%s)\n"), strerror(errno)); diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index b11cb511..5deb93c4 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/replace102.py TESTS += test/pacman/tests/replace103.py TESTS += test/pacman/tests/replace104.py TESTS += test/pacman/tests/replace110.py +TESTS += test/pacman/tests/scriptlet-signal-reset.py TESTS += test/pacman/tests/scriptlet001.py TESTS += test/pacman/tests/scriptlet002.py TESTS += test/pacman/tests/sign001.py diff --git a/test/pacman/tests/scriptlet-signal-reset.py b/test/pacman/tests/scriptlet-signal-reset.py new file mode 100644 index 00000000..27246d12 --- /dev/null +++ b/test/pacman/tests/scriptlet-signal-reset.py @@ -0,0 +1,11 @@ +self.description = "Reset signals before running scriptlets/hooks" + +p1 = pmpkg("dummy") +# check if SIGPIPE is ignored, it should be fatal, but GPGME ignores it +p1.install['post_install'] = "kill -PIPE $$; echo fail > sigpipe_was_ignored" +self.addpkg(p1) + +self.args = "-U %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!FILE_EXIST=sigpipe_was_ignored") -- 2.19.0

2 1

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.0-rc2, updated. v3.0.0-rc2
by Andrew Gregory 20 Oct '18

20 Oct '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 annotated tag, v3.0.0-rc2 has been updated to fc4cd3864aae4edd5835116d9191b48f60ffa4a4 (tag) from b977b9c030861decd22376e4d2a9147e830ebfae (which is now obsolete) tagging 9e3a1853451230d887c3c89f49f04e502fb69621 (commit) replaces v3.0.0-rc1 tagged by Andrew Gregory on Sat Oct 20 12:53:22 2018 -0700 - Log ----------------------------------------------------------------- replaces broken tag b977b9c030861decd22376e4d2a9147e830ebfae -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlvLh7IACgkQu9/8kjBr ESFJ9QgAgulpF3KQDRNRgGIpoIlblE8U0H6AziEr+lG3RRUGZs4gxJybD2aMkcrB KSQ0L4dTHfcQ1d//d+9N2TnEf60erz+ryC+lBDzNenqZ4ocLQwiYeRCzyc8DqIoU 7Rl8mFgv0IB+4IOh5r9nPFzsGqV1UJkTjOP5guHVsy7U/1ZbXEEjhBUwkhWPfpke 3QV+7T2I2oq8aFMm6Xx30WuOIUeFpjQ+HzyI3evVWQW/B3sL5CsTm/iyav3MaAZs rtCrGkNpfH1EI2+N8WW/sA6ZON+LpnEoUnovaYD2wU2KRlnZDc5sZt3jXp9ETBvp poKY0EgIJulQ5US59AdIWg2zWKDfSw== =oJsw -----END PGP SIGNATURE----- Aaron Griffin (7): * Fixed an issue with globbing the --test argument Added this test to check the XferCommand functionality * Fix the double package name URL when using XferCommand * Bug fix for makepkg dependency testing. This requires that we * Updated -V output to include the 2007 copyright date. * Two fixes when running under a new root (-r|--root) * Fixed an error with 'cascade' removal due to creation of a new pmpkg_t struct Dan McGee (33): * rankmirrors updates from Scott Horowitz <stonecrest(a)gmail.com>. * Removed a mirrorlist that codemac says is quite outdated. * Failure to #include config.h cost us here, we lost all NLS in alpm.c. This commit looks much more monumental than it is. Almost all just #include * Added missing header include guards in md5.h and sha1.h. Trying to fix up this autotools stuff a bit more. * Remove sha1 checksums for now from the INTEGRITY_CHECK array. * Updated Italian translation * Fix FS #6534- unclear IgnorePkg message. Sorry translators, had to update * Sorry tranlators, another string update. .pacorig was displayed twice in * Slight updates of Hungarian translation * -Qs was returning an error if no package found, which is not the same behavior as -Ss. * Oops, that last commit had some debug stuff in it. Removed it and added * Updated Italian translation * Added a readme file to the contrib/ directory. * Updated Brazilian Portuguese translation * Updated German translation * Updated pot files for hopefully the last time before release. * Slight updates to NEWS file. * Mark a function as static that is only used in deptest.c. * Updated Italian translation * Added confirmation step to makepkg -C operation to ensure user is deleting * Another slight update, getting rid of -rf flags and clarifying a message. * Updated Italian translation * Added Russian language translation. Thanks! * Fix group comparison issue and associated compilation warnings by using * Updated Hungarian translation, thanks! * Updates to Hungarian translation from Nagy, mostly cleanup stuff. * Fixed -Qil regression, now both flags are honored. (FS #1355) * Removed ${CFLAGS} from Makefile.am(s) as it was causing all CFLAGS to be * Fix an issue where the same dependency was recorded multiple times in the * Fix wrong filesize being recorded to local DB. Reported by Andreas Radke. * Noted a misspelling for later (after we are not in string freeze). Jürgen Hötzel (1): fixed string comparison callback (patch from Nagy Gabor) ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.0-rc1, updated. v3.0.0-rc1
by Andrew Gregory 20 Oct '18

20 Oct '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 annotated tag, v3.0.0-rc1 has been updated to bdb94daf7256d315c39ce73b78ffcf2c8b5a77cf (tag) from 59ae306a5453e0113ffba8395db9df1b5507c650 (which is now obsolete) tagging 11fbc595d48d55be929e259285bb65e53ef33007 (commit) tagged by Andrew Gregory on Sat Oct 20 12:47:37 2018 -0700 - Log ----------------------------------------------------------------- replaces broken tag 59ae306a5453e0113ffba8395db9df1b5507c650 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlvLhlkACgkQu9/8kjBr ESFf1AgAn3mykXPagGnkXeunD9xjXmzo4Fnx7OLbOCBzBL0nZATLUjAyu0j26HO7 PaScKOuSOc5m9WHYdmbqQy8fIsu1mI9jyNC0q1iTCpX54DCp1RZSmMIHlO7wgHCJ kMHVHfmnt5Zz7Y9bmYm0MSbLPklbUzcSeOh1DzgIERsJD2aCJ3Dwstfpg9uKTGty jM2n3ZhB5WSw4Sz6cKt0eH+y64YKkwvQVTNoMS7kgQBXrEHITh4gtmDeEz4FcYAT OEJc7xXFQFYbblcpAMeYKRfyjN54F5fkXHj7jWijBSa4LBOlwTl6UGDZxKXnjXR1 Z6ZBWoROrhOs3ASDlubfFIGPzC3Bsw== =z+VF -----END PGP SIGNATURE----- Aaron Griffin (313): Merging Frugalware changes - these need to be checked for instances of "Frugal" Added pactest to repository, from Aurelien Foret: Frugalware changes - mainly architecture updates and signed/unsigned changes Merged frugalware changes (too many to list). Also added some config file Merged frugalware changes. Added a few other minor things too, but there's alot Final frugalware changes commit include changes so that this compiles Fixed java includes - java bindings now compile Corrected documentation compilation - succeeds now Added alpm function docs along *** empty log message *** Whoops forgot some .in files *** empty log message *** Added po files... not sure if this is the right approach Added sha1 support (for now?) Another forgotten file set Removed convertdb Whoops, actually remove convertdb this time Added po files Applied changes from frugalware: Frugalware patch for AC_CHECK_PROGS fixups: *** empty log message *** Applied Frugalware patch from Christian Hamar alias krix <krics(a)linuxforum.hu> configure changes for java detection (require swig) Copyright changes Adjust progress bar to align with frugalware's progressbar Removed extra includes Removed three checks for po4a (patching issue) Yet another "added three times" issue. Fixed doxygen comments Reverted debug parameter to -1 Added copyright holder Removed old db files (unused) From VMiklos <vmiklos(a)frugalware.org> A handful of minor changes: Whoops, this file got left out Minor changes: More extern moving - keep extern decls in the headers makes for easier/better Fixed this test so that it succeeds - it is probably not 100% appropriate, but Fixes from frugalware: few 'typos' included while patching Reverted the "out of memory" error to 1 to prevent API changes. Added re-pacman Added PM_DLFNM_LEN define, via VMiklos Attempted fix for x86_64 - switched some unsigned char variables to ints, and Fixed library directory for bindings - we need the craptastic .libs libtool dir Moved downloaded db unpacking to the backend files, to easier allow conversion Remove generated man pages from CVS Fri Oct 27 21:54:32 CEST 2006 VMiklos <vmiklos(a)frugalware.org> Added libfetch linux port + misc changes Numerous changes: Numerous changes: * Makefile changes for libfetch integration Forgot to cycle to next server on download error - fixed, as well as the Removed user-CFLAGS during a debug build. Added -Wall to normal build(I like -Wall) Fixed pacman -U: Whoops forgot this Added a newline upong progress completion - this was accidentally left out causing the second progress bar to overwrite the first * Fixed some alpm_get_option calls (long params were used for C99 compliance, * Modified some error output and logging Removed antesis mirror, as it no longer works Added mcheck support for memory debugging * Fixed an error message that should be a debug message * Improved mcheck output mcheck() seems to cause segfaults. Annoying. Switched back to useing mtrace() - if anything valgrind is superior to mcheck anyway Whoops - I fail at setenv Last mtrace/setenv change, I swear Skip root check on -Sp *** empty log message *** * Numerous mini valgrind fixes. * autotool fixes * has_archname changes * has_archname additions * Initial changes to gensync - makepkg changes were not checked in from another * Changes to some of the TODOs and a brief glance at the NEWS file... * integrity check looping - support multiple algorithms at once * makepkg.conf.in variable changes (missed the checkin) Minor makepkg changes - mainly from Daniel McGee * repo-add script - to add entries to a db file directly from package data (no PKGBUILD) libalpm appends the trailing / to the config root, no need to do it here * Fixed a double free which happened in 2 cases in --sync * Fixed an error when trying to download to an unwritable location Removed global maxcols - it is looked up on the fly now, so the progress bar is * Completed getinfo api changes (pmmissing_t, pmtrans_t, etc) * usize -> isize conversion Added Dan McGee to the Authors file for his contributions on the mailing list * Whoops util Makefile *** empty log message *** -std=c99 seems to undefine PATH_MAX in this case. I don't care enough to fix it * Move sync *after* transaction init (lock file). We don't want to stomp on the * Fixed some error output for "-Sd" and "-Rsc" dealing with missing/ignored * cosmetic: double space in "full system upgrade" * Cosmetic changes and typo fixes * Fixed the bug where -R pkgA pkgB failed when pkgA depended on pkgB Added dbpath validation Corrected -Rsc operation - dependancy info was not being read from the DB Changed "Total Uncompressed Size" to "Total Installed Size" Added 'abs' and configs to CVS Corrected -Qg description Check status of final tar/compress package creation for final status (FS#3382) Changed upgrade message to use the term "installation" to make the meaning more Removed an extra call to alpm_option_set_root() - it is set by alpm_init() A few minor updates so --root works again. Merged some proposed changes from "Dan McGee" <dpmcgee(a)gmail.com> rankmirrors script from Dan McGee <dpmcgee(a)gmail.com> Copy/pasta errors from mail client. Fixed. * Dan McGee's makepkg updates http://www.archlinux.org/pipermail/pacman-dev/2006-December/000792.html FS #3289 fix from Dan McGee <dpmcgee(a)gmail.com> Makefile adjustments for installation rules: * Added etc/abs dir to configure generated makefiles More abs build fixes *** empty log message *** * modeline fixes / reformatting * Jürgen Hötzel <juergen(a)hoetzel.info> * Dan McGee <dpmcgee(a)gmail.com> Added default SRCDST setting to pacman's source cache Restored NoUpgrade options - see http://www.archlinux.org/pipermail/pacman-dev/2006-December/000838.html for details *untested* potential fix for the NoUpgrade issues. Errors with last merge (manual patching) * Dan McGee <dpmcgee(a)gmail.com> Jürgen Hötzel <juergen(a)hoetzel.info> Fixes from Dan McGee <dpmcgee(a)gmail.com> and myself * FS#5990 fix (trailing slash) * Unused variable 'path' * Properly fix the NoUpgrade issues. Modified front end output routines to accept a "padding' setting, which pads any Cleanup from Dan McGee <dpmcgee(a)gmail.com> and JÃŒrgen HÃ¶tzel <juergen(a)hoetzel.info> *** empty log message *** Configuration changes: Removed archlinux.de mirror by request Column fix when stdout is redirected. Default to 80. * Removed autoconf TODO fixed in last commit * Removed latest fix from TODO.autoconf * Fix a missing slash separator in printed uri * James Rosten <seinfeld90(a)gmail.com> * Missing error label in sync.c * Added instructions for patch submission * James Rosten <seinfeld90(a)gmail.com> *** empty log message *** * Bug fix FS#6058 * bug fix FS#6100 - fix --print-uris output * cosmetic: newline after "local database is up to date" * James Rosten <seinfeld90(a)gmail.com> * Dan McGee <dpmcgee(a)gmail.com> * Dan McGee <dpmcgee(a)gmail.com> * Jürgen Hötzel <juergen(a)hoetzel.info> *** empty log message *** Added Jamie (yankees26) cvsignore cleanup and additions James Rosten <seinfeld90(a)gmail.com> JÃŒrgen HÃ¶tzel <juergen(a)hoetzel.info> James Rosten <seinfeld90(a)gmail.com> Roman Kyrylych <Roman.Kyrylych(a)gmail.com> Dan McGee <dpmcgee(a)gmail.com> Dan McGee <dpmcgee(a)gmail.com> * Misc logging changes Added strerror() output on unlink failure Dan McGee <dpmcgee(a)gmail.com> Dan McGee <dpmcgee(a)gmail.com> Some confusion with variable names in unlink_file caused unlink to try and find the _relative_ file instead of absolute. The absolute path name has also been used in some of the output there too. * remove static neednl - no accessor functions (yet) *** empty log message *** Blah blah commit message for testing cvslog -> email Preliminary checkin for alpm_list conversion Added some things I noticed when making alpm_list changes, but didn't want to change too much at once. Johannes Weiner <hannes(a)saeurebad.de> Johannes Weiner <hannes(a)saeurebad.de> Whoops. There's a 0 where there should be a 1. Moved some decls to make the "pkg_invalid" patch compile again. makepkg file-type detection changes from James Rosten <seinfeld90(a)gmail.com> Removed list.h * Dan McGee <dpmcgee(a)gmail.com> Introduced an infinite loop during the pmlist -> alpm_list transition, whoops Changelog support for makepkg - this has been in pacman itself for some time, * Added a check for .FILELIST for package validity in addition to .PKGINFO Rename Changelog -> ChangeLog (the standard way of casing a ChangeLog) Lowercase "changelog" in output message * Added some calloc calls to replace the malloc-then-set-to-zero functionality James Rosten <seinfeld90(a)gmail.com> James Rosten <seinfeld90(a)gmail.com> Removed some debugging cruft left in in the last commit This mainly deals with code clarity- removing currently unneeded * Shuffled some of the alpm_list free funtions - still not perfect, but better Cleanup 'neednl' usage - make it static James Rosten <seinfeld90 at gmail.com> * Fix FS #3107- Use ISO date style * copy and paste error, "resolving deps" -> "cleaning up" Forgot this patch from Dan McGee as part of the bug #5409 fixes Dan McGee <dpmcgee(a)gmail.com> Missed that 8) This is a silly script now that a fancy aurbuild is out in the wild (on the AUR, K. Piche <kpiche(a)rogers.com> K. Piche <kevin.piche(a)cgi.com> Turn debug off by default TODO changes Well that silly memory clobber was plain old "uninitialized data" - fixed More uninitialized stuff... I believe these were removed at some point. Should Debug logging changes: Fix corrupt DB entry handling when loading package entries. TODO changes 8) Switched an int to an enum * Make -Qo work on multiple files again * Forgot the int->enum header checkin Removed the extra newline based on general opinion * !strcmp reads funny (as "not string compare" - switch those to == 0, which has Move filelist creation ABOVE the other metafiles to keep them out of the list install scriptlet is _always_ .INSTALL -Ql needs the 'root' prepended to each file Cleaned up some of the metadata control It appears I misunderstood what this bash-ism did Loading package data from a file was ALWAYS generating the filelist, instead of * Minor output fix (move colon so it's not part of the URL) * unified the progress bars (fill_progress function) * Added archive verification when loading package metadata for -u and -A Implemented a crappy version of -Qu (query upgrades). This simply outputs the Added the --upgrades option for -Qu (--query --upgrades) Attempt to unify the -S and -Su version comparissons for when a package is newer Copy-pasta errors. 8) Swapped out PKGBUILD.8 for PKGBUILD.5 from Dan McGee - original PKGBUILD.8 had too many Frugal specific changes. Minor fixups for the moment, still partially complete Attempt #2 at -S/-Su unification: verify that the 'force' option has been read before comparing versions Minor experimental changes to the download progress bar: I broke the progress bars earlier. Put that back to normal. * Fix total transfered size on download bar Cleanup and more debug info for alpm_pkg_compare_versions Only honor 'force' if versions are NOT identical Copy/pasta error in alpm_get_upgrades that caused a segfault *** empty log message *** *** empty log message *** Attempt to NOT remove packages on filesystem errors (like a read-only * Fixed some missing error values in strerror * Cleaned up direct pm_fprintf usage (move to MSG/ERR macros for now) * Remove "RETRIEVE_LOCAL" trans event as libdownload handles local files * Fix #2982 - use -Rs to remove deps * I made "alpm_versioncmp" public a while back, without noticing this was already done (alpm_pkg_vercmp). I dropped this change, making versioncmp "private" again. (alpm_versioncmp -> _alpm_versioncmp, hidden symbol) Cleaned up some more output * 'add' percentages now cap at 100% (see the comment) * Package file parsing - fixed size and isize - isize is the "size" variable *** empty log message *** This should be an ERROR, not a WARNING Added 'testpkg' binary to test for validity of a package: * Updated the README file Updated gensync to use repo-add better error message Rewrote updatesync in terms of repo-add and repo-remove Wasn't clearing out the 'pkgname' variable, which was causing goofy output * Removed the 'vercmp' op from pacman. The standalone 'vercmp' binary should be * Added --cachedir commandline option Exit status of 2 seems wrong for -V Added changes from Daniel YC Lin via bug #3266 * Added long options (missing in patch) Fix some x86_64 configuration handling Changed "MARCHFLAG" to "ARCHSWITCH" as the name was confusing (it's not a FLAG These were in the wrong order, so errored for me. Reverted the exit 2 -> exit 0 change. This was there for a reason (so that Removed desc_localized for the time being. We don't have localized * Refactored conflict checking within packages. Profiling from Dan showed an From Phil Dillon-Thiselton <dibblethewrecker(a)gmail.com>: TODO update While trying to change the number of missing deps output by makepkg, I noticed * Fixed _alpm_pkg_compare_versions so that it does not output warnings if versions match. (reported by Travis Willard) * Bugfix for FS#6427: Allow -Si to use "repository/package" syntax * Bugfix FS#6422 - spacing for warning output. Due to the fact that we fixed Added a 'contrib' directory for other stuff that might be a good idea to maintain here. * A whole mess of backup changes Added a config file for the vim-project plugin for kicks. To use: * Fix version comparisons when one pkgrel doesn't exist (this ony fails on an == Added new italian translation from Giovanni Scafora <linuxmania(a)gmail.com> Moved the update_depends function to trans.c, as it depends on a transaction * Some cascade removal changes. Mainly code cleanup, but this is an attempt to * Looks like I left some debugging code in there * Indentation changes - 4 spaces for python, we standardized this before (and * Use the libtool'd .la file as a link target so we can run pactest properly * Re-added a compare function for syncpkg's - it was removed without thinking TODO updates * Using positional params (POSIX compliant, not C standard) for printfs that * Cleaned up some debug output * Forgot the second printf in the last commit * debug cleanup (more) * Prepend all lists with _ for consistency * Modified the handling and output w.r.t. IgnorePkg entries. -Sy always ignores Just some changes to my TODO We don't need this anymore * Removed a stray print statement left in there * Fixed globbing for pactest --test argument *** empty log message *** Ignore that... wasn't supposed to happen * conflicts are returned with the full path, so prepending root is redundant * Too much debugging output in the alpm_pkg_compare_versions function * The info level for this was wrong, causing replacements to not really work I had this laying around, figured someone might find it useful Whoops, added to Makefile.am Syntax error else if --> elif (thanks to yankees26 for finding this) * corrected (IMO) --debug usage with pactest. --debug is now passed straight * Writing 'replaces' info to both /desc and /depends files for testing - see the * Enforce const char* params when using strings * pacman hidden arguments: removed -Y and -D. -T is the only hidden arg now, to * Added a small note to HACKING * This test was off. pactest doesn't do all the DB work, so we need to manually * Fixed a pacman warning when these fake packages didn't create an (empty) * Just a note for future reference *** empty log message *** * REQUIREDBY test was reversed (pkg3 requiredby pkg1, not pkg1 requiredby pkg3) * Switched some functions to alpm_pkg_get_* usage as I came across them * Comment clarification Big commit this time: Minor changes Added a test for checking 'requiredby' removal * libtool fixes for building against the right libs * handle changes: callbacks should check handle first, as there's a few * Fixed a whole mess of extra '/' pathing issues when a different root is * Fixed the handle realroot stuff * By Roman's request - proactive backup=() entry test case Aurelien Foret (470): Fixed a typo in add_loadtarget() Renamed PM_TRANS_CB_XXX to PM_TRANS_EVT_XXX Improved error handling in add_loadtarget() Renamed PACXXX defines to PM_XXX Added a db_update() function to manage sync databases updates. Removed a hardcoded reference to the 'local' database in db_create() Added LOG_STR_LEN define to avoid hardcoded length for log strings Removed a leftover debug printf Fixed a typo Added a missing argument in db_create() Removed the "__" prefix from __pm_logcb and __pm_logmask Make sure we generate a UPGRADE_DONE event during upgrades One more ORE comment Added DB_TREENAME_LEN define to avoid hardcoded length for database string New ORE tag *** empty log message *** Moved log callback definition to alpm.h - added PM_EXT_PKG and PM_EXT_DB defines to alpm.h (taken from pacman 2.9.3) - reworked sync_synctree() to make use of alpm_db_update() Avoided usage of global variables pmo_root and pmo_dbpath. Added missing extern declaration Bring back db_scan() modifications from pacman 2.9.1 Code formatting Dropped pmo_nosave parameter (now included in pmo_flags) Code reformatting Added a missing FtpQuit() call Code cleanup Renamed PM_RET_ERR to RET_ERR (no need for a PM_ prefix for internal Removed hardcoded reference to fields of packages One more sanity check, and one more ORE tag Removed unuseful getuid() calls Fixed some typo... Avoided extern references to pmo_root. Relocated log and transaction stuffs from pacman.c to log.c and trans.c Copyright update Removed an uneeded global reference Revert to previous version Removed an hardcoded string length Removed an hardcoded string length pacman_deptest() rework Rework for fixed length strings Added support for .lastupdate files (from pacman 2.9.1) - added HTTP support for .lastupdate files removed a deprecated placeholder added support for the XFERCOMMAND option - added pmo_chomp support (from pacman 2.9.3) replaced rewinddir() calls by db_rewind() fetch_pkgurl: do not download a file if it's already in the current dir added display of backup info in dump_pkg_full() Let the C preprocessor concatenates CACHEDIR string - added db_setlastupdate to db.c moved db_find_conflicts from db.c to conflict.c removed leftover debug printf - removed db_find_conflicts() declaration from db.h uncommented a call to alpm_logaction reorganization removed duplicated prototype cleanup for add_loadtarget() logs fix: one can't add a package twice in transaction targets list added a missing goto! replaced hardcoded references to the cache by CACHEDIR backported fixes for trim() from pacman 2.9.5 Backport from pacman 2.9.5 Backport from pacman 2.9.5 (code cleanup) fixed a typo updated comments _alpm_runscriplet fixes Backport from pacman 2.9.5 More backport from pacman 2.9.5 (mainly for resolvedeps) Backport from pacman 2.9.5 (--ignore in usage) reworked PM_LOG_XXX messages during install/remove/upgrade operations backport from pacman 2.9.5 (splitdep returns an int) backport from pacman 2.9.5 (formatting, commentaries) rewrote list_free to not be recursive anymore - fixed a small memory leak made 'provides' actually work when updating 'requiredby' fields from deps renamed temp files from pacman_XXXXXX to alpm_XXXXXX fixed an error message added a FREELISTPTR macro to free a PMList without freeing its data improved log message for alpm_db_update improved logs (use _alpm_log instead of fprintf) replaced occ of list_free() by FREELIST/FREELISTPTR macros reworked dbpath handling to make it possible to use databases stored at different locations at the same time maked use of db->path instead of handle->root+handle->dbpath+db->treename Replaced snprintf calls by the SNPRINTF macro to avoid buffer overflows when copying strings clearer string length for a strncpy call Turned pmdepmissing_t into an opaque structure turned pmdepmissing_t into an opaque structure changed alpm_db_register() prototype put back 5 _alpm_log() calls put back 3 _alpm_log() calls changed alpm_db_register() prototype *** empty log message *** backport from pacman 2.9.5 - chdir fixed a log mask removed an uneeded call to db_scan checked for db_update() archive existence started the work on "pacman_sync" fixed a compilation warning reworked sync_cleanup added RESOLVEDEPS to the list of transaction events reworked resolvedeps: sync with changes in alpm.h and new RESOLVEDEPS event added support for PACKAGES field in alpm_trans_getinfo - updated transaction events fixed a log level - added 'lastupdate' field to pmdb_t more work to backport pacman_sync from pacman 2.9.5 added list_is_ptrin() reworked a log - added transaction flags for the removal of a package to be upgrade fixed a typo added logs for cache generation replaced transaction 'packages' field by 2 queues: one for packages to be installed and the other for the ones to be removed updated structure names (PM_SYNCPKG), and added transaction queues (install & remove) package 'reason' field should default to 0 reworked MSG and ERR outputs reverted back to trans->packages instead of install and remove queues more work to backport the sync features from pacman 2.9.5 synchronization with libalpm for latest sync feature work fixed a small memory leak removed a leftover comment - small bugfixes fixed a potential segfault more work in sync_prepare reworked alpm_db_readpkg added function pkg_splitname (not used for now) added option -p in pacman usage screen backported support for print-uris from pacman 2.9.x updated a log - updated sync feature replaced a call to list_free by the macro FREELIST -fixed 2 logs added packages integrity checking more work for sync_commit() reworked transaction prototypes reworked handle structure initialization - reworked transaction prototypes - reworked pmsyncpkg_t structure - general cleanup cleanup to keep in sync with alpm changes fixed a user message more sanity checks for pkg_load() renamed PM_ERR_INVALID_NAME to PM_ERR_PKG_INVALID_NAME improved logs for package removal add_loadtarget: load package info only when needed fixed a log message more work for sync_commit() fixed a segfault bypass trans_prepare() if there is no target avoided a call to db_scan() - fixed args order in list_is_ptrin() fixed args order in list_is_ptrin() - fixed args order in list_is_ptrin() avoided two calls to db_scan() in checkdeps() display the list of targets to be removed before trans_commit() call code beautifying first steps to support REPLACES feature renamed list_is_ptrin() in list_is_in() some remork for pacman_deptest() code cleanup rework the cache handling to avoid as much as possible calls to db_scan() fixed some potential resource leaks outputs cleanup added transaction events for sync_commit operations removed deprecated comments in add_commit() logs cleanup code cleanup use the cache instead of calling db_scan() - fixed a cut'n'paste bug with %REASON% entry fixed the format of %REASON% entry when writing it code cleanup slighlty improved efficiency for dump_pkg_full() fixed a commented MLK in db_find_conflicts()/CHECK1 some more efficiency in remove_prepare() cascade loop got ride of an ORE tag in resolvedeps() added support for the package reason field avoided to load twice the same target in remove_loadtarget() added a new ORE tag fixed potential memory leaks code cleanup removed an uneeded check reimplemented list_free() a safer way - rework to support pacman_deptest() reworked pacman_deptest() *** empty log message *** removed unused function list_is_ptrin() removed the extra line feed appended by asctime() fixed targets display for cascade or recurse commands added a --debug option to externally set the library log level updated REASON constants to be consistent with databases from pacman 2.9.x code cleanup code cleanup ../../README get ride of ORE tags do not register an already registered db code cleanup fixed a small memory leak with md5sums handling moved pkg_cmp() to cache.c reimplemented list_remove to deal with lists of any kind of data fixed a small memory leak during the cleanup of config data added some debug logs found a possible MLK: to be fixed make use of the new list_remove implementation code cleanup - fixed a small memory leak fixed a memory leak and avoided to modify a read-only parameter code cleanup event transaction callback rework to prepare the introduction of a conversation callback code cleanup code cleanup fixed some small memory leaks reordered operations in add_commit (as in pacman 2.9.x) fixed a typo fixed a pointer error code cleanup fixed a memory leak with md5 sums handling - indented properly sync_cleancache() fixed cb_trans() prototype changed license package field to a list changed license package field to a list Fixed some typos Small update Added a PKG_FULLNAME_LEN macro Applied reworked patch from VMiklos (vmiklos(a)frugalware.org) Fixed an error log Added a CYGWIN define to include header files required to build in a Cygwin environment Added a missing include for CYGWIN target Applied patch from Christian Hamar (krics(a)linuxforum.hu) Moved the REPLACES and FORCE package fields from DESC to DEPENDS db entry Reworked the cache handling to only load DEPENDS info by default Code update to make use of PKG_FULLNAME_LEN Fixed an text formatting issue update Added an error string for lock file creation failure Fixed missing parameter in trans_init() call Fixed EVENT and QUESTION macros - more sanity checks pacman should work without its configuration file! improved query_fileowner() function removed a leftover comment pacman update to cope with the CACHEDIR option from the library added PM_OPT_CACHEDIR library option added a missing header file declaration removed useless getenv() calls added alpm.h to delivery targets (Jason) removed an uneeded variable declaration do not free the cache right before using it! added a missing line feed in a MSG call added pmconfig_t structure to hold all the configuration removed entry dealing with pacman configuration structure stripped end of lines renamed pmconfig_t to config_t added PACCONF, PACDB and PACROOT defines fixed some compilation warnings fixed a compilation warning fixed parseconfig usage Used the chroot syscall instead of the chroot binary removed the declaration of an unused variable added more pm_errnos fixed compilation warnings added a FREESYNC macro to release pointers to pmsyncpkg_t structures fixed wrong prototype usage for trans_new() cleanup fixed compilation warnings fixed a file descriptor leak Fixed some memory leaks (patch from Essien Ita Essien <essiene(a)datavibe.net>) Fixed some logging issues (patch from VMiklos <vmiklos(a)frugalware.org>) Fixed a typo (spelling) fix (patch from VMiklos <vmiklos(a)frugalware.org>) Allowed C++ usage (patch from VMiklos <vmiklos(a)frugalware.org>) added a debug log when freeing the package cache removed an uneeded call to strtrim used defines from alpm.h instead of local ones (patch from VMiklos <vmiklos(a)frugalware.org>) do not consider duplicated targets as an error (patch from VMiklos <vmiklos(a)frugalware.org>) don't complain on PM_ERR_DB_UPTODATE errors (patch from VMiklos <vmiklos(a)frugalware.org>) added a missing code chunk of the ignore command line option (patch from VMiklos <vmiklos(a)frugalware.org>) fixed a segfault and added more verbose outputs in group handling (patch from VMiklos <vmiklos(a)frugalware.org>) *** empty log message *** renamed error titles from XXX to xxx - fixed a regression with pacman 2.x (patch from VMiklos <vmiklos(a)frugalware.org>) removed some overlapping pm_errno assignments - reworked verbose levels fixed a possible memory corruption fixed a possible memory leak Added Cygwin target defines code cleanup fixed a typo fixed various memory leaks fixed possible memory corruption code cleanup code cleanup more sanity checks: do not add or remove databases while a trasaction is running code cleanup fixed a corrupted argument code cleanup fixed a segfault in removdeps added .lastudate support for HTTP protocol terminated .lastupdate implementation for HTTP protocol fixed a regression - fix for sync conflicts (patch from VMiklos <vmiklos(a)frugalware.org>) tweaked a log (patch from VMiklos <vmiklos(a)frugalware.org>) added a missing cachedir registration various code cleanup - started to rename list_XXX calls to _alpm_list_XXX code cleanup - fixed a regression with pacman 2.x (reworked patch from VMiklos <vmiklos(a)frugalware.org>): fixed the usage of 4 list_is_in calls (should have been list_is_strin) moved pacman_deptest function in its own file removed ORE tags (after tests, no real performance increase by implementing them) - sync: populates *data when a conflict can't be resolved pacman_sync: handle trans_prepare error cases (patch from VMiklos <vmiklos(a)frugalware.org>) removed a misleading PM_ERR_XXX occurrence code cleanup (mainly removed line spaces at the beginning of lines by tabulations) - removed uid checks (CYGWIN) removed handle/uid checks (CYGWIN) code cleanup added more debug logs in the sync conflict/replace code Fixed a regression in the conflict handling code code cleanup removed a restriction: the data parameter of XXX_prepare functions can be NULL sync_commit can now return conflicting files with a trans_prepare like data structure (patch from VMiklos <vmiklos(a)frugalware.org>) removed all code related to PM_SYNC_TYPE_DEPEND - merged pkg_new and pkg_dummy functions code cleanup added ALLDEPS transaction flag mainly to handle "makepkg -s" made use of the new ALLDEPS transaction flag to handle "makepkg -s" fixed a memory leak in the transaction cleanup code code cleanup updated README and download comments about mtimes support fixed an awfull typo - added 2 more ORE tags (to be reviewed) in the replace/conflict sync code added more doxygen comments (patch from VMiklos <vmiklos(a)frugalware.org>) removed "^M" symbols at end of lines improved log and debug messages code cleanup code cleanup removed unuseful error codes fixed a possible memory corruption added a missing commentary from pacman 2.9.x code code cleanup maked verbose group listing enabled by -Sgg instead of -Sgv code cleanup sysupgrade: skip version cmp for pkg elected for removal (patch from VMiklos <vmiklos(a)frugalware.org>) checkdeps: sync_prepare: added a missing chunk of code for dependency checks of packages elected for removal pulled out conflict checkings from checkdeps() in its own function: checkconflicts() fixed tabs more code cleanup - code cleanup reworked log messages even more code cleanup code cleanup code cleanup added the possibility to "-Syy" (can be used to force synctrees update, even if mtimes are ok) fixed detection for duplicate entries in list of deps/conflicts more code cleanup yet added a FAKEROOT define allowing to use pacman in a fakeroot enivronment (for tests purpose) resolvedeps: return the depmiss info to the frontend in case of failure fixed a typo document package, group, sync and transaction functions (patch from VMiklos <vmiklos(a)frugalware.org>) doxygen comments update (patch from VMiklos <vmiklos(a)frugalware.org>) - fixed a compilation warning reordered group entry position in db_write (to be in line with alpm/db_write) reworked lock handling (patch from VMiklos <vmiklos(a)frugalware.fr>) reworked lock handling (patch from VMiklos <vmiklos(a)frugalware.org>) fixed a compilation warning added missing retval values in trans_release error cases added a missing error message in case of lock failure fixed potential file descriptor leaks cleaned up db_write error cases handling improved log messages for add_commit cleanup up error cases handling in pacman_deptest added a missing trans_release before pacman_sync call removed unlock code from alpm_release() Added a missing trans_release call upon lib shutdown (patch from VMiklos <vmiklos(a)frugalware.org>) doxygen support: added @brief field (patch from VMiklos <vmiklos(a)frugalware.org>) added libalpm manpage (patch from VMiklos <vmiklos(a)frugalware.org>) added line feeds when needed (patch from VMiklos <vmiklos(a)frugalware.org>) fixed typos in 2 debug logs fixed vprint implementation (patch from VMiklos <vmiklos(a)frugalware.org>) - moved yesno() from util.c to log.c fixed a possible memory leak - sync_prepare: fixed a case where a conflict should be removed from the target list code cleanup copyright update added a pmconflict_t structure to handle file conflicts added support for the PM_CONFLICT structure to handle file conflicts added alpm_pkg_checkmd5sum() to check md5sums for package from the cache added support for alpm_pkg_checkmd5sum() pacman 2.9.8 synchro copyright update copyright update synchro with pacman 2.9.8 code cleanup code factorization code factorization: take 2 error codes cleanup db_write cleanup: only write non-empty fields db_write: only write non-empty fields to database added more logs - reworked debug messages reworked debug messages added a add_faketarget function reworked logs added the possibility to force synctree update by using -Syy better use ERR than fprintf for error messages fixed a compilation warning - added a WARN macro to display warnings used MALLOC macro when possible fixed a typo fixed a compilation warning - merged db_open and db_create into one single function moved the .lastupdate support from libalpm to pacman removed a leftover comment - db_write: add support to write both local and sync entries - grep is now a static function fixed directory roots when running scriplets code cleanup *** empty log message *** sync with pacman 2.9.8 code cleanup *** empty log message *** doxygen support for autotools (patch from Christian Hamar <krics(a)linuxforum.hu> partial support for version comparators (patch from VMiklos <vmiklos(a)frugalware.org>) commented out doxygen support as it produces an error prepend library function names with _alpm (helped with the patch from VMiklos <vmiklos(a)frugalware.org>) synchro with pacman 2.9.8 fixed doxygen support (patch from VMiklos <vmiklos(a)frugalware.org>) dropped the MALLOC macro checkmd5sums enhancements the library must provide default values for main options skipped conflict resolution for targets removed from transaction set fixed outputs when downloadonly flag is set (patch from VMiklos <vmiklos(a)frugalware.org>) improved _alpm_list_free handling fixed indentation disable progress bar if the output is redirected (patch from VMiklos <vmiklos(a)frugalware.org>) added ERROR logs in case of malloc failures (patch from VMiklos <vmiklos(a)frugalware.org>) added a debug log code cleanup code cleanup reworked the db object to prepare future integration with different backends removed HoldPkg option (frontend only feature) fixed HoldPkg implementation make cache works when loading it with DEPENDS info only added more debug logs added a FLAG_NOCONFLICT fixed alpm_db_update extraction path - changed flags type from char to int added a NOSCRIPLET flag to transactions (patch from VMiklos <vmiklos(a)frugalware.org>) fixed reason loading if the pkg cache is loaded with DEPENDS only prepare code for cache loaded with only DEPENDS code cleanup removed an unexpected log fixed a commentary removed db_scan calls removed db_scan calls - take 2 fixed pkgdesc usage keep gensync and updatesync in sync db_write: fixed md5sum field all _alpm_XXX_cmp functions are now public code cleanup removed an uneeded error code (DB_UPTODATE) build be_files.c as a additional object code cleanup - removed pacman.h removed pacman.h put back treename in db->path fixed a regression (patch from VMiklos <vmiklos(a)frugalware.org>) fixed dbpath initialization (found out by VMiklos <vmiklos(a)frugalware.org>) added .cvsignore files Dan McGee (119): Discussed on IRC for a bit, this makes the following changes for clarity: * Modified info query so it doesn't show more than available when querying a * Remove -fno-strict-aliasing as it is now unnecessary to compile. adding my personal TODO file Fixing line spacings of download/install size messages. * Updated repo-add script to remove same package, different version when * Refactored some functions to clean up variable declaration. slight line spacing/indent updates just an update removal of unnecessary '\' in integrity check generation This removes the warning about skipping dependency checking when the user is Added mirror in Finland to mirrorlist * Tried to clean up newline display a bit in the frontend. Updated news file to be more relevant with previous release of pacman; Fix problem with PKGDEST variable not being used correctly. No longer necessary to explicitly specify SRCDEST, leave it up to user to Add newlines to error messages * Updated makepkg to use a new form of options. These two arrays now replace oops, ENVIRONMENT -> BUILDENV in comments * Added some backwards compatability stuff to makepkg, along with helpful fix makefiles for PKGBUILD.8 -> PKGBUILD.5 one more change for man page move I should test code before I check it in. Also a fix for the annoying wget output in PKGBUILD bug. Cleaning up mistakes. :P * Makepkg updates, and small bugfix on man page compression. * Update of all the *.po files and *.pot template files. Oops. Actuall add two new translation templates as requested on the ML- * Added a 'translation-help' file for use by our translators. Spruced up the TODOs a bit, got rid of some of them since a lot of it was Greatly simplify the way our non-existant translated manpages were being Forgot to remove a few files from configure.ac Fix newlines for real, and add a missing _() gettext wrapper. * Nice overhaul of manpages. It is at least a start. * Oops. Added some files to make "make update-po" work. Small changes to README, mostly just to postpone making any real changes. :) * Hopefully fixed the download progres bar for real. We should no longer Another round of manpage updates. Cleaned up the PKGBUILD man a bit. Man pages, man pages, man pages. Just a few more additions and clarifications, * Remove "error: " text from ERR() call since it is appended by ERR anyway. New manpages were going nowhere without an updated makefile * Fix compile errors/warnings. A few more slight changes to the pacman man page Adding repo-remove script, allows for a package to be removed from a repo. Forgot to update the Makefile with the new script, adding it. * Implemented FS #5641 as suggested in Aaron's comment- '-S' option now means * Unified description of arch variable. Recommend using single quotes in TODO update and .cvsignore addition * Fixed an i18n bug; length of description string was hardcoded previously; * Updated translation-help guide with instructions for updating one po file. Fixed locale setting issues in the frontend, and fixed description of --cachedir. Adding official translations. Thanks a lot, guys! Pierre Schmitz <pierre(a)archlinux.de> Translation Update, pt_BR: Slightly optimized to remove duplicate strcmp operation. * Updated a too-verbose message in pacman/add.c. (shouldn't be an issue withi * Removed needless checking of package infolevel- leave it to the * Updated makepkg.8 manpage to reflect shift of -S to --usesudo. * pt_BR translation updates. * strlen -> mbstowcs (multibyte str to wide char str) conversion where we * Updated Italian translation * Updated pt_BR translation (Douglas Soares de Andrade), and merged other * Updated Italian translation Updated NEWS file with some of Roman's suggestions. * Updated German translation * Removed unnecessary #define * Adding pacsearch - a script to search both the sync repos and locally Small updates, read diff for details * Added some improved debug output to file conflict checking. * Updated bash_completion script to 3.0 options. * Updated German translations. * Updated conflict checking one last time. You can finally have a file move * Slightly fixed up the check target- we now pass 16 instead of 10 tests in Thought about adding this a while back, finally remembered it. Basically a copy of the pacman-coding.html document in text form. * Update Italian Translation Fixed up the output a bit. * Slight message change for consistancy- add a ' ' (space char) at the * Fixed inconsistency of args- _alpm_db_read, _alpm_db_write. Ignore pactest-created root directory * Updated Italian translation * A lot of Makefile.am updates to try to get 'make dist' and 'make distcheck' * Rewrote pactest with an OptionParser so we can have helpful help text, and * Updated German translations. * Update the translation POT files- I don't want to do this daily but the Big commit here, I'll try to cover all the bases. * Updated distcheck target- added some flags so pactest is 100% correct. * Removed man2html stuff from configure. It is now available in the doc/ * Changes to quite a few of the tests, mostly minimal changes (better * Oops. Messed a few things up, fixing them now. * added contrib/.cvsignore, and slight change to supfile.testing * Updated Italian translation Implementing feature request: <http://bugs.archlinux.org/task/4706> * Updated Italian translation * Added some undocumented options to the manpage. * TODO updates. * db search optimization- why don't we compile the regex once instead of once * Added 5 new upgrade tests, which check various things with depends, * Updated all the supfiles for consistancy, and added a commented out line * Updated description of test upgrade052. * Prevent this error when creating empty packages. * Added another test- I believe it is a possible situation and one we need to * Some new tests. That bring new failures. :) * Added another test as suggested by Nagy on the ML- a package both provides * Implemented Douglas' suggestion from the ML- print all integrity checks * Unifying placement of REPLACES in desc file, as pacman2 does. We'll worry * Fix up _alpm_db_free, remove use of void*. * Silly mistake on making sync895 and sync896- I didn't create the field * Updated Italian translation * Modified values of INFRQ_* options so we start at 0x01 and not 0x00. This * Updated Italian translation * Slight documentation update. * Oops- I need to learn to count in hex. * A little more hacking with wchar_t output, but nothing really changed in * file utility was updated to version 4.20, removing code that was there to * Updated Italian translation * Remove unnecessary call to _alpm_trans_update_depends that was erroring * Maybe that call to _alpm_trans_update_depends was necessary. Added it back * Update distcheck flags, we no longer need to pass --disable-fakeroot. * Hopefully the LAST big update of the language files before release. Judd Vinet (72): Initial revision made makepkg echo the version-release number as well (#2375) added i18n to TODO changed license package field to a list test test patch from vmiklos -- properly remove each db entry instead of rmrf'ing the whole thing Merging in recent fixes/additions from 2.9.7 added more error messages, enabled the db permission check in trans_commit correct a trans_commit protocol fixed a segfault w/ the skiplist added conversation callback support for transactions started some doxygen comment blocks removed debug stmt added first part of the autoconf stuff - patch from Christian Hamar <krics(a)linuxforum.hu> bumped up PACMAN_VERSION added idea from christian to TODO added patch to use the system memcpy for md5 stuff added INFRQ_DESC back to the package cache so the group cache will work remove dupes from group lists in sync removed debug comment added a default cachedir Added CacheDir directive copied up-to-date scripts from pacman 2.9.7 improved the Replace question format a bit fixed a segfault that occured in special cases when propagating requiredby fields during package replacements bugfix: before searching databases for a dependency, make sure one of the packages in the final list doesn't already provide that dependency added patch from VMiklos - fixes ownership problems when building in a chroot w/ fakeroot added pacman-optimize to Makefile.am added --no-check-certificate added Doxyfile don't die on missing package files, just warn (#3535) Applied unset_lcall_lang.diff -- unset LANG/LC_ALL before building packages added Frugalware patch: -Q --foreign to display packages not found in sync repos typo added frugalware patch for DistCC support patch from VMiklos: regarding the documentation, groups have to be renamed from foo to alpm_foo verbosity fix from VMiklos VMiklos: --noconfirm fix VMiklos: add STRNCPY macro from alpm to pacman applied first try at sync conflict handling (VMiklos) plus a couple changes renamed rpmvercmp to versioncmp, added some fixes from isteve(a)bofh.cz Added .tbz2 extension to makepkg patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSION renamed configure.in to configure.ac renamed ChangeLog to NEWS Added AUTHORS file added Miklos and Christian typo fix In the database-against-targets conflict checks, scan db packages' provides removed old/disable provides-conflict checking code cleanup added new options field to PKGBUILDs for package-by-package overrides cleaned up format a bit, added global KEEPDOCS and NOSTRIP flags changed behaviour with original=X,current=Y,new=Z backup scenario -- install new file as .pacnew and keep old one in place little fix for erroneous output use sudo for -i if available (fw) makeworld sudo support Search through package provides if no literal matches are found when scanning for targets with -S added a --noprogressbar switch for scripts to use changes merged from 2.9.8 -- clarified license usage, new options var in PKGBUILDs, --noprogressbar pacman switch... FW: re-add CacheDir setting FW: spaces -> tabs cosmetic fix conflict checks: when doing db-vs-target checks, opt to use the NEWER, to-be-installed package instead of the local db version if there's one available first stage of i18n stuff from VMiklos patch: check strlen of str, NOT msg, which is always true i18n stuff bugfix: when looking at provides, defer to the new, to-be-installed package's provisios instead of the the existing package's spelling fix Patch from FW: Better control over CTRL-C interruptions -- do not leave the DB in an inconsistent state removed libtar support in favour of libarchive small typo fix JÃŒrgen HÃ¶tzel (9): * Fix building outside $(srcdir). * fixed path to automake (removed hardcoded version) * doxygen check cleanup * removal of swig generated bindings * removal of swig generated bindings * fixed clean target: no error if repository files do not exist * gen-mirrorlist.sh not needed anymore * fixed dist target * unset LC_ALL, LANG after sourcing /etc/profile.d/* ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.0, updated. v3.0.0
by Andrew Gregory 20 Oct '18

20 Oct '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 annotated tag, v3.0.0 has been updated to c914ef466fc08048b95f999cb99c4e8431548c18 (tag) from c6b17b224f264973f32291ec0e4101d1a9fd0af1 (which is now obsolete) tagging 58fe79eef64fb87b2553e6514a47beaa6d0249c1 (commit) replaces v3.0.0-rc2 tagged by Andrew Gregory on Sat Oct 20 12:45:51 2018 -0700 - Log ----------------------------------------------------------------- replaces broken tag c6b17b224f264973f32291ec0e4101d1a9fd0af1 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlvLhe8ACgkQu9/8kjBr ESGH8QgArLmBhjuFwAaOc7Sj1THPF5BkwWqDcTQDSqMjmBdv3LskC1/ija/IsV2J k6e9FGqHZk2H/EsSuxflpDd0M0XpLAxmcHnNe1qTPoqyCBBmNpwNZDeVE6115FBX GX3q4mHQLmDJduhQJR0hHBvmUGXfKZoxNznHl/0MYZEosl6lAibwLAxdda1ro6RN XXbAVc/5b8bIsqL2o1Jj66VJnOCarUQ2KoygQ8kMjVyLcxw9g4qsYsLGKzDXgUUm 5dCIskNPDdJDGCtIPNOyPQemS5BJl3e8QFwo6OP9VgeSPhKnSTqnNlxy2mDtcwOP gPPWAN4Aya5zZa31NzifbV58GyuDhA== =gB59 -----END PGP SIGNATURE----- Aaron Griffin (14): * Missed a path when requiring that all paths end with / - this caused -U not to * Sebastian Sareyko * makepkg.conf.in: Added /usr/share/gtk-doc back into default DOC_DIRS James Rosten <seinfeld90(a)gmail.com> Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> * Fix pacman -Se which installs depends only, as it was broken * Fix asking the user to upgrade when using -Sp Giovanni Scafora <linuxmania(a)gmail.com> * Quick fixup for the translations due to a typo fix committed earlier. * -Qo now properly resolves paths when finding an owner * Correct install scriptlet usage (reuse of handle->root when not needed) I was mistaken, newpkg->data IS useful here, as the scriptlet isn't in the FS at Quick pactest changes: * Added a mirror list for [testing] (it appears most mirrors mirror testing) Dan McGee (29): * Resizing terminal while progress bars were displayed caused some weird * Small updates to my TODO file. * Fixed up broken translation * Updated Russian translation * Updated Hungarian translation * Missing a 'msg' in makepkg- pointed out by wain on Flyspray. Thanks! * Added quoting on several makepkg paths that were lacking it. James Rosten <seinfeld90(a)gmail.com> * Adding new Turkish mirror as posted on the forums. * Updated Italian translation * TODO list updates. * makepkg: fix installation of dependencies with version comparitors. * makepkg: Fix behavior of -Ssr: deps were not being correctly removed before. * makepkg: a few more changes to get dependencies working correctly. If a * NEWS: add quick line about backup files. * TODO.dan updates. * pacman.c: Add CacheDir to -v --verbose output. * Typo fix. * Updated Italian translation * Fix conflict checking to ignore symlinks that were in previous version of Lots of translation updates before we release. Roman Kyrylych <roman.kyrylych(a)gmail.com> * Updated Brazilian Portuguese translation Clarify some English messages as suggested by Nagy Gabor. I even did the hard Fixed alpm_log call- too many parameters passed. (bardo on #archlinux-pacman) * Updated German translation * Removed three dead mirrors (Dale Blount <dale(a)archlinux.org>). Andrew Fyfe <andrew(a)neptune-one.net> * Fix bug where 'makepkg -L' doesn't stop on build failure. Jürgen Hötzel (1): * dont use XferCommand if retrieving local files, fixes wget error: ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman: don't error when a group exists but all packages are ignored
by morganamilo 20 Oct '18

20 Oct '18

Currently when attempting to sync a group where all packages are ignored (either by ignorepkg, ignoregroup or --needed) pacman will error with "target not found". Instead, if a group has no packages, check if the group exists and only throw an error if it does not. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d3d198a..316853bb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1446,6 +1446,8 @@ int alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, alpm_list_t *alpm_find_group_pkgs(alpm_list_t *dbs, const char *name); +int alpm_group_exists(alpm_list_t *dbs, const char *name); + /* * Sync */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 05f58fad..57058782 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -313,6 +313,26 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, return pkgs; } +/** Check if a group exists across a list of databases. + * @param dbs the list of alpm_db_t * + * @param name the name of the group + * @return 1 if the group exists, 0 if it does not + */ +int SYMEXPORT alpm_group_exists(alpm_list_t *dbs, + const char *name) +{ + alpm_list_t *i; + for(i = dbs; i; i = i->next) { + alpm_db_t *db = i->data; + + if (alpm_db_get_group(db, name)) { + return 1; + } + } + + return 0; +} + /** Compute the size of the files that will be downloaded to install a * package. * @param newpkg the new package to upgrade to diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ef8faedf..32df6e04 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -543,6 +543,10 @@ static int process_group(alpm_list_t *dbs, const char *group, int error) int count = alpm_list_count(pkgs); if(!count) { + if(alpm_group_exists(dbs, group)) { + return 0; + } + pm_printf(ALPM_LOG_ERROR, _("target not found: %s\n"), group); return 1; } -- 2.19.1

2 3

[pacman-dev] [PATCH v2] Port pactest to python3
by Dave Reisner 19 Oct '18

19 Oct '18

Use BytesIO instead of StringIO, and ensure that we unicode-encode data where needed. --- * Make sure pactest --review is happy configure.ac | 2 +- test/pacman/pactest.py | 5 +++-- test/pacman/pmdb.py | 4 ++-- test/pacman/pmpkg.py | 6 +++--- test/pacman/util.py | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index a569ffeb..c369ca74 100644 --- a/configure.ac +++ b/configure.ac @@ -179,7 +179,7 @@ AC_SUBST(LFS_CFLAGS) AC_PROG_AWK AC_PROG_CC_C99 AC_PROG_INSTALL -AC_CHECK_PROGS([PYTHON], [python2.7 python2 python], [false]) +AC_CHECK_PROGS([PYTHON], [python3 python], [false]) AC_PATH_PROGS([BASH_SHELL], [bash bash4], [false]) # check for perl 5.10.1 (needed by makepkg-template) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 1f5b8483..85cce6a1 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#! /usr/bin/python3 # # pactest : run automated testing on the pacman binary # @@ -45,7 +45,8 @@ def write(self, message): # duplicate stdout/stderr to a temporary file class OutputSaver(): def __init__(self): - self.save_file = tempfile.NamedTemporaryFile(prefix='pactest-output-') + self.save_file = tempfile.NamedTemporaryFile( + prefix='pactest-output-', mode='w') def __enter__(self): sys.stdout = MultiWriter(sys.stdout, self.save_file) diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index f7671987..95aa8756 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -15,9 +15,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +from io import BytesIO import os import shutil -from StringIO import StringIO import tarfile import pmpkg @@ -251,7 +251,7 @@ def generate(self): filename = os.path.join(pkg.fullname(), name) info = tarfile.TarInfo(filename) info.size = len(data) - tar.addfile(info, StringIO(data)) + tar.addfile(info, BytesIO(data.encode('utf8'))) tar.close() # TODO: this is a bit unnecessary considering only one test uses it serverpath = os.path.join(self.root, util.SYNCREPO, self.treename) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 5a32ccd6..4667ebc1 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from io import BytesIO import os -from StringIO import StringIO import tarfile import util @@ -146,7 +146,7 @@ def makepkg(self, path): for name, data in archive_files: info = tarfile.TarInfo(name) info.size = len(data) - tar.addfile(info, StringIO(data)) + tar.addfile(info, BytesIO(data.encode('utf8'))) # Generate package file system for name in self.files: @@ -167,7 +167,7 @@ def makepkg(self, path): # TODO wow what a hack, adding a newline to match mkfile? filedata = name + "\n" info.size = len(filedata) - tar.addfile(info, StringIO(filedata)) + tar.addfile(info, BytesIO(filedata.encode('utf8'))) tar.close() diff --git a/test/pacman/util.py b/test/pacman/util.py index 5fbe4c35..544bdd8d 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -152,7 +152,7 @@ def getmd5sum(filename): def mkmd5sum(data): checksum = hashlib.md5() - checksum.update("%s\n" % data) + checksum.update(("%s\n" % data).encode('utf8')) return checksum.hexdigest() -- 2.19.1

1 0

[pacman-dev] [PATCH] libalpm: process needed before group selection
by morganamilo 18 Oct '18

18 Oct '18

When --needed is used, up to date packages are now filtered out before showing the group select. Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- This patch set is currently incomplete. There is a problem where if every package in the group is already installed you end up with the eror. "error: target not found: groupname". Instead "there is nothing to do" should be produced instead. I'm unsure of how to solve this so I am submitting this for discussion. Currently my idea is to have alpm_find_group_pkgs gain a new param `int *exists` which the front end can then check instead of the length of the return. Or instead the needed check could just be moved to the front end. Let me know if theres a better way. diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b6ae7b72..f1c02417 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -270,6 +270,8 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, for(i = dbs; i; i = i->next) { alpm_db_t *db = i->data; alpm_group_t *grp = alpm_db_get_group(db, name); + alpm_handle_t *handle = db->handle; + alpm_trans_t *trans = handle->trans; if(!grp) { continue; @@ -277,10 +279,26 @@ alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs, for(j = grp->packages; j; j = j->next) { alpm_pkg_t *pkg = j->data; + alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, pkg->name); if(alpm_pkg_find(ignorelist, pkg->name)) { continue; } + if(local) { + const char *localpkgname = local->name; + const char *localpkgver = local->version; + int cmp = _alpm_pkg_compare_versions(pkg, local); + + if(cmp == 0) { + if(trans != NULL && trans->flags & ALPM_TRANS_FLAG_NEEDED) { + /* with the NEEDED flag, packages up to date are not reinstalled */ + _alpm_log(handle, ALPM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + localpkgname, localpkgver); + ignorelist = alpm_list_add(ignorelist, pkg); + continue; + } + } + } if(alpm_pkg_should_ignore(db->handle, pkg)) { alpm_question_install_ignorepkg_t question = { .type = ALPM_QUESTION_INSTALL_IGNOREPKG, -- 2.19.0

3 4

[pacman-dev] [PATCH] alpm: Fix SIGINT handling re: aborting download
by Olivier Brunel 17 Oct '18

17 Oct '18

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. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index cca39470..0a3293cf 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -253,6 +253,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, const char *useragent = getenv("HTTP_USER_AGENT"); struct stat st; + dload_interrupted = 0; /* the curl_easy handle is initialized with the alpm handle, so we only need * to reset the handle's parameters for each time it's used. */ curl_easy_reset(curl); -- 2.19.0

2 4

[pacman-dev] [PATCH 1/2] Port pactest to python3
by Dave Reisner 17 Oct '18

17 Oct '18

Use BytesIO instead of StringIO, and ensure that we unicode-encode data where needed. --- configure.ac | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 5 +++-- test/pacman/pmpkg.py | 8 +++++--- test/pacman/util.py | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index a569ffeb..c369ca74 100644 --- a/configure.ac +++ b/configure.ac @@ -179,7 +179,7 @@ AC_SUBST(LFS_CFLAGS) AC_PROG_AWK AC_PROG_CC_C99 AC_PROG_INSTALL -AC_CHECK_PROGS([PYTHON], [python2.7 python2 python], [false]) +AC_CHECK_PROGS([PYTHON], [python3 python], [false]) AC_PATH_PROGS([BASH_SHELL], [bash bash4], [false]) # check for perl 5.10.1 (needed by makepkg-template) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 1f5b8483..628193ff 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#! /usr/bin/python3 # # pactest : run automated testing on the pacman binary # diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index f7671987..26a8d9a4 100644 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -17,9 +17,10 @@ import os import shutil -from StringIO import StringIO import tarfile +from io import BytesIO + import pmpkg import tap import util @@ -251,7 +252,7 @@ def generate(self): filename = os.path.join(pkg.fullname(), name) info = tarfile.TarInfo(filename) info.size = len(data) - tar.addfile(info, StringIO(data)) + tar.addfile(info, BytesIO(data.encode('utf8'))) tar.close() # TODO: this is a bit unnecessary considering only one test uses it serverpath = os.path.join(self.root, util.SYNCREPO, self.treename) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 5a32ccd6..e42bd4d5 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -15,7 +15,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import os -from StringIO import StringIO + +from io import BytesIO + import tarfile import util @@ -146,7 +148,7 @@ def makepkg(self, path): for name, data in archive_files: info = tarfile.TarInfo(name) info.size = len(data) - tar.addfile(info, StringIO(data)) + tar.addfile(info, BytesIO(data.encode('utf8'))) # Generate package file system for name in self.files: @@ -167,7 +169,7 @@ def makepkg(self, path): # TODO wow what a hack, adding a newline to match mkfile? filedata = name + "\n" info.size = len(filedata) - tar.addfile(info, StringIO(filedata)) + tar.addfile(info, BytesIO(filedata.encode('utf8'))) tar.close() diff --git a/test/pacman/util.py b/test/pacman/util.py index 5fbe4c35..544bdd8d 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -152,7 +152,7 @@ def getmd5sum(filename): def mkmd5sum(data): checksum = hashlib.md5() - checksum.update("%s\n" % data) + checksum.update(("%s\n" % data).encode('utf8')) return checksum.hexdigest() -- 2.19.0

2 2

[pacman-dev] [PATCH 1/2] pacman: fix possible buffer overflow
by morganamilo 17 Oct '18

17 Oct '18

in the function query_fileowner, if the user enters a string longer than PATH_MAX then rpath will buffer overflow when lrealpath tries to strcat everything together. Even if we made sure filename was never longer than PATH_MAX this would not help because lrealpath may concatenate filename with the current directory among other things. So simply let lrealpath calculate the size needed and allocate it for us. This also fixes the compiler warning; query.c: In function ‘query_fileowner’: query.c:192:4: warning: ‘strncpy’ specified bound 4096 equals destination size [-Wstringop-truncation] strncpy(rpath, filename, PATH_MAX); The warning could have also been Fixed by using PATH_MAX -1 and explicitly terminating the string. However this would not fix the buffer overflow. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..a1197cea 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -155,10 +155,10 @@ static int query_fileowner(alpm_list_t *targets) for(t = targets; t; t = alpm_list_next(t)) { char *filename = NULL; - char rpath[PATH_MAX], *rel_path; + char *rpath = NULL, *rpathsave, *rel_path; struct stat buf; alpm_list_t *i; - size_t len; + size_t len, rlen; unsigned int found = 0; int is_dir = 0, is_missing = 0; @@ -187,9 +187,15 @@ static int query_fileowner(alpm_list_t *targets) } } - if(!lrealpath(filename, rpath)) { + if(!(rpath = lrealpath(filename, NULL))) { /* Can't canonicalize path, try to proceed anyway */ - strncpy(rpath, filename, PATH_MAX); + rpath = strdup(filename); + } + + rlen = strlen(rpath); + if(rlen + 1 >= PATH_MAX) { + pm_printf(ALPM_LOG_ERROR, _("path too long: %s/\n"), rpath); + goto targcleanup; } if(strncmp(rpath, root, rootlen) != 0) { @@ -201,11 +207,14 @@ static int query_fileowner(alpm_list_t *targets) rel_path = rpath + rootlen; if((is_missing && is_dir) || (!is_missing && (is_dir = S_ISDIR(buf.st_mode)))) { - size_t rlen = strlen(rpath); if(rlen + 2 >= PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s/\n"), rpath); goto targcleanup; } + if ((rpathsave = realloc(rpath, rlen + 2)) == NULL) { + goto targcleanup; + } + rpath = rpathsave; strcat(rpath + rlen, "/"); } -- 2.19.0

3 9

[pacman-dev] [PATCH v2] libalpm: parse {check, make}depends when reading database
by morganamilo 09 Oct '18

09 Oct '18

Commit 0994893b0e6b627d45a63884ac01af7d0967eff2 added the alpm_pkg_get_{make,check}depends functions but forgot to include logic for parsing these fields from the database. As a result these functions will always return an empty list. This commit adds the parsing logic. Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- Only after making this patch do I see FS#60347. V2 addes the extra lazy loading code pointed out in the comments. As a result this patch is basically identical to Alexandre Garnier's patch. But as they have not submitted their patch to the mailing list I'll submit mine. diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 7c2f96b8..12b13a12 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -153,6 +153,18 @@ static alpm_list_t *_cache_get_optdepends(alpm_pkg_t *pkg) return pkg->optdepends; } +static alpm_list_t *_cache_get_makedepends(alpm_pkg_t *pkg) +{ + LAZY_LOAD(INFRQ_DESC); + return pkg->makedepends; +} + +static alpm_list_t *_cache_get_checkdepends(alpm_pkg_t *pkg) +{ + LAZY_LOAD(INFRQ_DESC); + return pkg->checkdepends; +} + static alpm_list_t *_cache_get_conflicts(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC); @@ -303,36 +315,38 @@ static int _cache_force_load(alpm_pkg_t *pkg) * logic. */ static struct pkg_operations local_pkg_ops = { - .get_base = _cache_get_base, - .get_desc = _cache_get_desc, - .get_url = _cache_get_url, - .get_builddate = _cache_get_builddate, - .get_installdate = _cache_get_installdate, - .get_packager = _cache_get_packager, - .get_arch = _cache_get_arch, - .get_isize = _cache_get_isize, - .get_reason = _cache_get_reason, - .get_validation = _cache_get_validation, - .has_scriptlet = _cache_has_scriptlet, - .get_licenses = _cache_get_licenses, - .get_groups = _cache_get_groups, - .get_depends = _cache_get_depends, - .get_optdepends = _cache_get_optdepends, - .get_conflicts = _cache_get_conflicts, - .get_provides = _cache_get_provides, - .get_replaces = _cache_get_replaces, - .get_files = _cache_get_files, - .get_backup = _cache_get_backup, - - .changelog_open = _cache_changelog_open, - .changelog_read = _cache_changelog_read, - .changelog_close = _cache_changelog_close, - - .mtree_open = _cache_mtree_open, - .mtree_next = _cache_mtree_next, - .mtree_close = _cache_mtree_close, - - .force_load = _cache_force_load, + .get_base = _cache_get_base, + .get_desc = _cache_get_desc, + .get_url = _cache_get_url, + .get_builddate = _cache_get_builddate, + .get_installdate = _cache_get_installdate, + .get_packager = _cache_get_packager, + .get_arch = _cache_get_arch, + .get_isize = _cache_get_isize, + .get_reason = _cache_get_reason, + .get_validation = _cache_get_validation, + .has_scriptlet = _cache_has_scriptlet, + .get_licenses = _cache_get_licenses, + .get_groups = _cache_get_groups, + .get_depends = _cache_get_depends, + .get_optdepends = _cache_get_optdepends, + .get_makedepends = _cache_get_makedepends, + .get_checkdepends = _cache_get_checkdepends, + .get_conflicts = _cache_get_conflicts, + .get_provides = _cache_get_provides, + .get_replaces = _cache_get_replaces, + .get_files = _cache_get_files, + .get_backup = _cache_get_backup, + + .changelog_open = _cache_changelog_open, + .changelog_read = _cache_changelog_read, + .changelog_close = _cache_changelog_close, + + .mtree_open = _cache_mtree_open, + .mtree_next = _cache_mtree_next, + .mtree_close = _cache_mtree_close, + + .force_load = _cache_force_load, }; static int checkdbdir(alpm_db_t *db) @@ -773,6 +787,10 @@ static int local_db_read(alpm_pkg_t *info, int inforeq) READ_AND_SPLITDEP(info->depends); } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_SPLITDEP(info->optdepends); + } else if(strcmp(line, "%MAKEDEPENDS%") == 0) { + READ_AND_SPLITDEP(info->makedepends); + } else if(strcmp(line, "%CHECKDEPENDS%") == 0) { + READ_AND_SPLITDEP(info->checkdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { READ_AND_SPLITDEP(info->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5009a7da..af94b2d5 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -700,17 +700,9 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_SPLITDEP(pkg->optdepends); } else if(strcmp(line, "%MAKEDEPENDS%") == 0) { - /* currently unused */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - } + READ_AND_SPLITDEP(pkg->makedepends); } else if(strcmp(line, "%CHECKDEPENDS%") == 0) { - /* currently unused */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - } + READ_AND_SPLITDEP(pkg->checkdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { READ_AND_SPLITDEP(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { -- 2.19.1

5 5

[pacman-dev] [PATCH] libalpm: parse {check, make}depends when reading database
by morganamilo 08 Oct '18

08 Oct '18

Commit 0994893b0e6b627d45a63884ac01af7d0967eff2 added the alpm_pkg_get_{make,check}depends functions but forgot to include logic for parsing these fields from the database. As a result these functions will always return an empty list. This commit adds the parsing logic. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 7c2f96b8..f8c3947e 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -773,6 +773,10 @@ static int local_db_read(alpm_pkg_t *info, int inforeq) READ_AND_SPLITDEP(info->depends); } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_SPLITDEP(info->optdepends); + } else if(strcmp(line, "%MAKEDEPENDS%") == 0) { + READ_AND_SPLITDEP(info->makedepends); + } else if(strcmp(line, "%CHECKDEPENDS%") == 0) { + READ_AND_SPLITDEP(info->checkdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { READ_AND_SPLITDEP(info->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5009a7da..af94b2d5 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -700,17 +700,9 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%OPTDEPENDS%") == 0) { READ_AND_SPLITDEP(pkg->optdepends); } else if(strcmp(line, "%MAKEDEPENDS%") == 0) { - /* currently unused */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - } + READ_AND_SPLITDEP(pkg->makedepends); } else if(strcmp(line, "%CHECKDEPENDS%") == 0) { - /* currently unused */ - while(1) { - READ_NEXT(); - if(strlen(line) == 0) break; - } + READ_AND_SPLITDEP(pkg->checkdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { READ_AND_SPLITDEP(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { -- 2.19.1

1 0