- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-111-gce040514
by Allan McRae 14 Jan '19

14 Jan '19

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 ce040514c4ed79f3053a104242cde90af471041a (commit) via 5d2f7ee6c376e59ccbd8b6f9a5355cac358f0e84 (commit) via 031611ff40bb85e493453913ae808116fa92c3cc (commit) via 10fe71e5f3ed5cff52166e78ca063baf8d1c1b83 (commit) via aa284c97f1fdef7d43a523387533ad3981627504 (commit) via f7efa6a93d5361af610827d41045d87c7a72f2b5 (commit) via 30e3e21e873b01b98ab91dc1252d4112d6a9fd2a (commit) via 03d85763e08cbe7c5ef1f9863cf25e026ee2756f (commit) via e9d91a688d1a2ebe58e8a895853debf745a529cf (commit) via 9b2a90cfb1910b5092ffec3375177229101323e4 (commit) from 9b637cc27aba561e5270862a1a3eb515e4f3f744 (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 ce040514c4ed79f3053a104242cde90af471041a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:44 2019 -0500 makepkg: return E_PKGBUILD_ERROR for nonexistent PKGBUILD This is not really an error with a "user function". Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5d2f7ee6c376e59ccbd8b6f9a5355cac358f0e84 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:42 2019 -0500 libmakepkg: simplify splitting command output into array Use mapfile instead of hacking around read -a with the $IFS. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 031611ff40bb85e493453913ae808116fa92c3cc Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:58:41 2019 -0500 libmakepkg: add routine for linting $SOURCE_DATE_EPOCH This can only ever be an int, and the specification states that a malformed timestamp should be considered a fatal error. https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 10fe71e5f3ed5cff52166e78ca063baf8d1c1b83 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jan 10 00:54:33 2019 -0500 makepkg: fix unguarded use of printf paths can contain printf-unsafe chars, and printf -v is not somehow immune to this Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa284c97f1fdef7d43a523387533ad3981627504 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:41:13 2018 -0400 makepkg: check_pkgrel: Don't say "decimal" in the error message If you have a malformed pkgrel, the error message says that it must be a "decimal". That isn't quite true, as that would mean that `1.1 == 1.10`. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f7efa6a93d5361af610827d41045d87c7a72f2b5 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:41:12 2018 -0400 makepkg: Better error messages for versions in (check, make, opt)depends/provides/conflicts Given the depends depends=('foo>=1.2-1.par2') and the error message ==> ERROR: pkgver in depends is not allowed to contain colons, forward slashes, hyphens or whitespace. One would be lead to believe that the problem is that they gave a pkgrel in depends at all, not that the pkgrel contains letters. Each of the (check,make,opt)depends, conflicts, and provides linters use a glob to trim off properly formed epoch an rel from the full version string, and pass the remainder to check_pkgver(). This does a good job of accepting/rejecting full versions, but doesn't do a good job of generating good error messages when rejecting if it's because of the epoch or rel. 1. Factor out check_epoch() and check_pkgrel() from lint_epoch() and lint_pkgrel(), similarly to check_pkgver(). 2. Add a check_fullpkgver() that takes a full [epoch:]ver[-rel] string and splits it in to epoch/ver/rel, and calls the appropriate check_ function on each. 3. Use check_fullpkgver() in the {,check,make,opt}depends, conflicts, and provides linters. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 30e3e21e873b01b98ab91dc1252d4112d6a9fd2a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 21:17:17 2018 -0400 libmakepkg/lint_pkgbuild: check for invalid variables even if they're empty Checking the length of the variable to be non-zero before considering it an error is inconsistent; license=() and depends='' and `declare arch` should be considered just as wrong. In fact the current check detects depends='' as non-zero and returns an error, but happily considers the others to be perfectly okay. A more reliable check is to simply see if the name has been declared (whether it is set or not), and then enforce that it's been declared to the right type. As an added benefit, avoiding the creation of proxy-evaled variables to count the number of indexes results in simpler code. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03d85763e08cbe7c5ef1f9863cf25e026ee2756f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 13:52:58 2019 +1000 Add [ignored] to -Qu output for packages in repos that are not Usage = Upgrade List all available updates in -Qu output, but include [ignored] beside those that will not be updated in a -Su operation due to thier repo Usage value (in addition to those that are Ignored). Fixes FS#59854. The following people provided initial patches to print [ignored] on -Qu operations, which highlighted a larger problem to be fixed first: With-thanks-to: morganamilo <morganamilo(a)gmail.com> With-thanks-to: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e9d91a688d1a2ebe58e8a895853debf745a529cf Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 13:44:32 2019 +1000 libalpm/sync.c: change alpm_sync_newversion() to alpm_sync_get_new_version() The behaviour of "pacman -Qu" was very strange... It would only consider packages from repos with Usage = Search (or All), and ignore those with Usage = Sync, Install or Upgrade. This is because the function alpm_sync_newversion() used ALPM_DB_USAGE_SEARCH for its filtering. Given this function is documented (at least in the source) to "Check for new version of pkg in sync repos", I would expect that to look at all repos. However, just changing this parameter, would result in a fairly silent change in behaviour of this function. Instead, rename the function and remove this filtering altogether. Users of this function can filter the dbs passed to this function to achieve their desired output. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9b2a90cfb1910b5092ffec3375177229101323e4 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 12:47:01 2019 +1000 Add -fstack-clash-protection to CFLAGS in debug builds if available Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 6 +-- m4/acinclude.m4 | 19 +++++++ scripts/Makefile.am | 2 + scripts/libmakepkg/executable/checksum.sh.in | 2 +- scripts/libmakepkg/lint_config/meson.build | 1 + .../source_date_epoch.sh.in} | 28 ++++------- .../libmakepkg/lint_pkgbuild/checkdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 14 +++--- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 58 ++++++++++++++++++++++ scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/meson.build | 1 + scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 15 ++++-- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 16 +++--- scripts/makepkg.sh.in | 4 +- src/pacman/query.c | 10 ++-- 21 files changed, 156 insertions(+), 83 deletions(-) copy scripts/libmakepkg/{executable.sh.in => lint_config/source_date_epoch.sh.in} (64%) mode change 100644 => 100755 create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] doc: add a couple missing manpages from the html index
by Eli Schwartz 13 Jan '19

13 Jan '19

The index embeds the names of all doc subpages, and these were never updated. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/index.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index c9e5bcc1..fa7444db 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -43,9 +43,11 @@ There are several man pages available for the programs, utilities, and configuration files dealing with pacman. * linkman:alpm-hooks[5] +* linkman:BUILDINFO[5] * linkman:PKGBUILD[5] * linkman:libalpm[3] * linkman:makepkg[8] +* linkman:makepkg-template[1] * linkman:makepkg.conf[5] * linkman:pacman[8] * linkman:pacman-key[8] -- 2.20.1

1 0

[pacman-dev] [PATCH] doc: keep manpages and html pages in sync
by Eli Schwartz 13 Jan '19

13 Jan '19

We forgot to add BUILDINFO to the list of html docs. Instead of always updating things in two places, just derive the one from the other. meson did not have this problem as it already derives both lists from one template. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/Makefile.am | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 4bb0f01b..de87c409 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,19 +20,7 @@ MANPAGES = \ DOXYGEN_MANS = $(wildcard man3/*.3) -HTML_MANPAGES = \ - alpm-hooks.5.html \ - pacman.8.html \ - makepkg.8.html \ - makepkg-template.1.html \ - repo-add.8.html \ - vercmp.8.html \ - pkgdelta.8.html \ - pacman-key.8.html \ - PKGBUILD.5.html \ - makepkg.conf.5.html \ - pacman.conf.5.html \ - libalpm.3.html +HTML_MANPAGES = $(addsuffix .html,$(MANPAGES)) HTML_OTHER = \ index.html \ -- 2.20.1

1 0

[pacman-dev] [PATCH v2 0/3] makepkg: Improve lint_pkgbuild error messages for epoch/ver/rel
by Luke Shumaker 10 Jan '19

10 Jan '19

From: Luke Shumaker <lukeshu(a)parabola.nu> The error messages that makepkg prints when encountering a bad epoch/pkgver/pkgrel are often somewhat misleading. These patchset tries to improve that. The behavior is intended to be unchanged, other than what the messages say. v2: - Don't skip lint_pkgrel if (( PKGVERFUNC )), I should have never included that bit in v1. - check_fullpkgver: Don't let rel strip ver down to nothing Luke Shumaker (3): makepkg: Better error messages for versions in (check,make,opt)depends/provides/conflicts makepkg: check_pkgrel: Don't say "decimal" in the error message makepkg: check_pkgver: Report what the bad pkgver is scripts/Makefile.am | 1 + .../lint_pkgbuild/checkdepends.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/conflicts.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/depends.sh.in | 14 ++--- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 10 +++- .../libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 58 +++++++++++++++++++ .../lint_pkgbuild/makedepends.sh.in | 10 ++-- .../libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 ++-- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 15 +++-- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- .../libmakepkg/lint_pkgbuild/provides.sh.in | 10 ++-- 11 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in -- Happy hacking, ~ Luke Shumaker 2.18.0

2 6

[pacman-dev] [PATCH] makepkg: fix unguarded use of printf
by Eli Schwartz 10 Jan '19

10 Jan '19

paths can contain printf-unsafe chars, and printf -v is not somehow immune to this 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 56642b11..a040d384 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1142,7 +1142,7 @@ fi # canonicalize paths and provide defaults if anything is still undefined for var in PKGDEST SRCDEST SRCPKGDEST LOGDEST BUILDDIR; do - printf -v "$var" "$(canonicalize_path "${!var:-$startdir}")" + printf -v "$var" '%s' "$(canonicalize_path "${!var:-$startdir}")" done unset var PACKAGER=${PACKAGER:-"Unknown Packager"} -- 2.20.1

1 0

[pacman-dev] [PATCH] libmakepkg/lint_pkgbuild: check for invalid variables even if they're empty
by Eli Schwartz 10 Jan '19

10 Jan '19

Checking the length of the variable to be non-zero before considering it an error is inconsistent; license=() and depends='' and `declare arch` should be considered just as wrong. In fact the current check detects depends='' as non-zero and returns an error, but happily considers the others to be perfectly okay. A more reliable check is to simply see if the name has been declared (whether it is set or not), and then enforce that it's been declared to the right type. As an added benefit, avoiding the creation of proxy-evaled variables to count the number of indexes results in simpler code. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 3266cb5e..52bb61a9 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -37,12 +37,11 @@ lint_variable() { replaces sha1sums sha256sums sha384sums sha512sums source) local string=(changelog epoch install pkgdesc pkgrel pkgver url) - local i a v pkg keys out bad ret=0 + local i a pkg out bad ret=0 # global variables for i in ${array[@]} ${arch_array[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p $i > /dev/null 2>&1; then if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" ret=1 @@ -54,11 +53,9 @@ lint_variable() { [[ $a == "any" ]] && continue for i in ${arch_array[@]}; do - v="${i}_${a}" - eval "keys=(\"\${!${v}[@]}\")" - if (( ${#keys[*]} > 0 )); then - if ! is_array $v; then - error "$(gettext "%s_%s should be an array")" "$i" "$a" + if declare -p "${i}_${a}" > /dev/null 2>&1; then + if ! is_array ${i}_${a}; then + error "$(gettext "%s should be an array")" "${i}_${a}" ret=1 fi fi @@ -66,8 +63,7 @@ lint_variable() { done for i in ${string[@]}; do - eval "keys=(\"\${!$i[@]}\")" - if (( ${#keys[*]} > 0 )); then + if declare -p "$i" > /dev/null 2>&1; then if is_array $i; then error "$(gettext "%s should not be an array")" "$i" ret=1 -- 2.17.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-101-g9b637cc2
by Allan McRae 10 Jan '19

10 Jan '19

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 9b637cc27aba561e5270862a1a3eb515e4f3f744 (commit) via f9eb2aacb4655cce5faa8a2e7295a96cab91c68c (commit) from 238fa4af4507c573ae4d478d1d7e176429d2c5c5 (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 9b637cc27aba561e5270862a1a3eb515e4f3f744 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 10 14:10:47 2019 +1000 be_local.c: remove aligment in local_pkg_ops The alignment was not overly helpful and caused unnecessary churn when a new value with longer name was added. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9eb2aacb4655cce5faa8a2e7295a96cab91c68c Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Oct 9 02:05:15 2018 +0100 libalpm: parse {check, make}depends when reading database 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 70 +++++++++++++++++++++++++++++++------------------- lib/libalpm/be_sync.c | 12 ++------- 2 files changed, 46 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-99-g238fa4af
by Allan McRae 10 Jan '19

10 Jan '19

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 238fa4af4507c573ae4d478d1d7e176429d2c5c5 (commit) via 268b0255fa2dd6ccef2e4fa08859c7966002e15a (commit) via c5c7fc7f4a361a9a347845b930030077898cd83f (commit) via 2f15921230a424c57c13dc0ba0776d87c2f590c4 (commit) via 7c5958e0eb8f77feab743adcce05b8bfa600b69e (commit) from e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e (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 238fa4af4507c573ae4d478d1d7e176429d2c5c5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Jan 4 00:26:28 2019 -0500 makepkg: fix broken check for the fakeroot binary In commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 we made use of fakeroot absolutely mandatory, and disabled a lot of the code which checked to see if this now-defunct BUILDENV option was set, before setting up the environment to use fakeroot. Unfortunately, we missed one spot. The check_software routine still checked to see if fakeroot was enabled, but due to the option being removed, thought that it was in fact disabled, and as a result this check would never run. Fix by checking to see if we are trying to build either a package or a source package, and if so, checking for fakeroot. These are the only two situations where fakeroot is needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 268b0255fa2dd6ccef2e4fa08859c7966002e15a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Jan 4 00:32:09 2019 -0500 makepkg: add internal variable to track when we're building a package There are state variables for everything else, and we use them to do conditional checks on things, but it's currently a bit difficult to test whether a package is being built, as it's the default action if *no* options are specified. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c5c7fc7f4a361a9a347845b930030077898cd83f Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Jan 4 13:13:16 2019 +1000 makepkg: Make pkgdir a local Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2f15921230a424c57c13dc0ba0776d87c2f590c4 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Jan 4 13:09:38 2019 +1000 makepkg: Create a single-package packaging function Merge the similar code handling unsplit PKGBUILDs and individual packages in a split PKGBUILD and make it a new function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7c5958e0eb8f77feab743adcce05b8bfa600b69e Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Jan 4 12:57:22 2019 +1000 makepkg: Only backup package variables once We don't need to re-backup the variables we restored on the previous iteration. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/makepkg.sh.in | 50 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 1/2] libalpm/sync.c: change alpm_sync_newversion() to alpm_sync_get_new_version()
by Allan McRae 10 Jan '19

10 Jan '19

The behaviour of "pacman -Qu" was very strange... It would only consider packages from repos with Usage = Search (or All), and ignore those with Usage = Sync, Install or Upgrade. This is because the function alpm_sync_newversion() used ALPM_DB_USAGE_SEARCH for its filtering. Given this function is documented (at least in the source) to "Check for new version of pkg in sync repos", I would expect that to look at all repos. However, just changing this parameter, would result in a fairly silent change in behaviour of this function. Instead, rename the function and remove this filtering altogether. Users of this function can filter the dbs passed to this function to achieve their desired output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch should address the comments Andrew made. I have not added the helper function for filtering databases by alpm_usage_type yet, but did file a bug to track it (FS#61333). lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 6 +----- src/pacman/query.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 597e11bd..bbce0971 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1452,7 +1452,7 @@ alpm_list_t *alpm_find_group_pkgs(alpm_list_t *dbs, const char *name); * Sync */ -alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync); +alpm_pkg_t *alpm_sync_get_new_version(alpm_pkg_t *pkg, alpm_list_t *dbs_sync); /** @addtogroup alpm_api_trans Transaction Functions * Functions to manipulate libalpm transactions diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 05f58fad..de579eac 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -51,7 +51,7 @@ /** Check for new version of pkg in sync repos * (only the first occurrence is considered in sync) */ -alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync) +alpm_pkg_t SYMEXPORT *alpm_sync_get_new_version(alpm_pkg_t *pkg, alpm_list_t *dbs_sync) { alpm_list_t *i; alpm_pkg_t *spkg = NULL; @@ -61,10 +61,6 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn for(i = dbs_sync; !spkg && i; i = i->next) { alpm_db_t *db = i->data; - if(!(db->usage & ALPM_DB_USAGE_SEARCH)) { - continue; - } - spkg = _alpm_db_get_pkgfromcache(db, pkg->name); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..9ac6e930 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -286,7 +286,7 @@ static int filter(alpm_pkg_t *pkg) return 0; } /* check if this pkg is outdated */ - if(config->op_q_upgrade && (alpm_sync_newversion(pkg, + if(config->op_q_upgrade && (alpm_sync_get_new_version(pkg, alpm_get_syncdbs(config->handle)) == NULL)) { return 0; } @@ -325,7 +325,7 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { - alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + alpm_pkg_t *newpkg = alpm_sync_get_new_version(pkg, alpm_get_syncdbs(config->handle)); printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); if(alpm_pkg_should_ignore(config->handle, pkg)) { -- 2.20.0

1 1

[pacman-dev] [PATCH] Add -fstack-clash-protection to CFLAGS in debug builds if available
by Allan McRae 10 Jan '19

10 Jan '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Tested with GCC (supports this flag) and clang (does not support). Did not add to meson builds, as it appears that all these flags are not added to the build anywhere in the meson files. configure.ac | 1 + m4/acinclude.m4 | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index ba54c2dd..6f336022 100644 --- a/configure.ac +++ b/configure.ac @@ -443,6 +443,7 @@ if test "x$debug" = "xyes" ; then # Check for -fstack-protector availability GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_CC + GCC_STACK_CLASH_PROTECTION GCC_FORTIFY_SOURCE_CC WARNING_CFLAGS="-g -Wall -Werror" else diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 15bb31e8..845c8286 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -38,6 +38,25 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ fi ]) +dnl GCC_STACK_CLASH_PROTECTION +dnl check -fstack-clash-protection with the C compiler, if it exists then +dnl updates CFLAGS +AC_DEFUN([GCC_STACK_CLASH_PROTECTION],[ + AC_LANG_ASSERT(C) + if test "X$CC" != "X"; then + AC_CACHE_CHECK([whether ${CC} accepts -fstack-clash-protection], + scp_cv_cc, + [scp_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -fstack-clash-protection" + AC_TRY_COMPILE(,, scp_cv_cc=yes, scp_cv_cc=no) + CFLAGS="$scp_old_cflags" + ]) + if test $scp_cv_cc = yes; then + CFLAGS="$CFLAGS -fstack-clash-protection" + fi + fi +]) + dnl GCC_FORTIFY_SOURCE_CC dnl checks -D_FORTIFY_SOURCE with the C compiler, if it exists then updates dnl CPPFLAGS -- 2.20.0

1 0

[pacman-dev] RFC: Really running package_* functions in rbash during printsrcinfo
by Charles Duffy 06 Jan '19

06 Jan '19

Howdy -- I recently had need to dig into the implementation of makepkg --printsrcinfo, and ran into the "running regular expressions against source code" operations in the backend. Obviously, this is not ideal. Indeed, I've previously written packages (doing unusual and typically-undesirable things, granted) with conditional logic *assuming* that actual execution would be taking place. I fully appreciate the decision not to try to go with more expansive attempts at emulating bash parsing/execution in the future, but do folks have any thoughts on **really** executing PKGBUILDs in a restricted environment, including execution of the package_* functions? See a simple sandboxed parser for config files implemented as bash code in code I've written for NixOS at https://github.com/charles-dyfis-net/nixpkgs/blob/f50bfe267a312515d88e86c12…. We might need a little more complexity here -- using DEBUG traps to avoid "|| exit" logic from aborting, f/e -- but my initial impression is that "more accurate than the current implementation" (and maybe a fair bit faster, if we extract all variables in one subshell per function) is not a hard goal to achieve. Thoughts?

2 3

[pacman-dev] [PATCH] repo-add: don't break if delta package sources contain epoch
by Eli Schwartz 05 Jan '19

05 Jan '19

Our sed parser for xdelta3 headers will greedily match on ":" which coincidentally is also the character we use to define a version with an epoch. While we are at it, simply use sed for the whole pipeline, rather than using both grep and sed. Fixes FS#61195 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/repo-add.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index bccf2f37..b9c6a6cc 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -159,8 +159,8 @@ db_write_delta() { md5sum=${md5sum%% *} csize=$(wc -c "$deltafile" | cut -d' ' -f1) - oldfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (source)" | sed 's/.*: *//') - newfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (output)" | sed 's/.*: *//') + oldfile=$(xdelta3 printhdr "$deltafile" | sed -n 's/XDELTA filename (source):\s\+$\.*$/\1/p') + newfile=$(xdelta3 printhdr "$deltafile" | sed -n 's/XDELTA filename (output):\s\+$\.*$/\1/p') if grep -q "$oldfile.*$newfile" "$deltas"; then sed -i.backup "/$oldfile.*$newfile/d" "$deltas" && rm -f "$deltas.backup" -- 2.20.1

3 4

[pacman-dev] [PATCH] Add [ignored] to -Qu output for packages in repos that are not Usage = Upgrade
by Allan McRae 04 Jan '19

04 Jan '19

The behaviour of "pacman -Qu" was very strange... It would only consider packages from repos with Usage = Search (or All), and ignore those with Usage = Sync, Install or Upgrade. This is because alpm_sync_newversion() used ALPM_DB_USAGE_SEARCH for its filtering. Given this function is documented (at least in the source) to "Check for new version of pkg in sync repos", I would expect that to look at all repos. However, just changing this parameter, would result in a fairly silent change in behaviour of this function. To counter that, add a parameter to the function that tells it which databases usage levels to consider. Finally, list all available updates in -Qu output, but include [ignored] beside those that will not be updated in a -Su operation due to thier repo Usage value (in addition to those that are Ignored). Fixes FS#59854. With thanks to the following who provided initial patches to print [ignored] on -Qu operations, which highlighted the larger problem: morganamilo <morganamilo(a)gmail.com> Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- In comments on earlier patches, there was debate about what the alpm_sync_newversion() is doing. Although I expect users of this function to likely always pass ALPM_DB_USAGE_ALL, I think changing the function signature is the safest way to handle this change. Comments? lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 4 ++-- src/pacman/query.c | 11 ++++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 597e11bd..67f9e8f5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1452,7 +1452,7 @@ alpm_list_t *alpm_find_group_pkgs(alpm_list_t *dbs, const char *name); * Sync */ -alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync); +alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync, int usage); /** @addtogroup alpm_api_trans Transaction Functions * Functions to manipulate libalpm transactions diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 05f58fad..3443bd71 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -51,7 +51,7 @@ /** Check for new version of pkg in sync repos * (only the first occurrence is considered in sync) */ -alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync) +alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync, int usage) { alpm_list_t *i; alpm_pkg_t *spkg = NULL; @@ -61,7 +61,7 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn for(i = dbs_sync; !spkg && i; i = i->next) { alpm_db_t *db = i->data; - if(!(db->usage & ALPM_DB_USAGE_SEARCH)) { + if(!(db->usage & usage)) { continue; } diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..1679662f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -287,7 +287,8 @@ static int filter(alpm_pkg_t *pkg) } /* check if this pkg is outdated */ if(config->op_q_upgrade && (alpm_sync_newversion(pkg, - alpm_get_syncdbs(config->handle)) == NULL)) { + alpm_get_syncdbs(config->handle), + ALPM_DB_USAGE_ALL) == NULL)) { return 0; } return 1; @@ -325,10 +326,14 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { - alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + int usage; + alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle), ALPM_DB_USAGE_ALL); + alpm_db_t *db = alpm_pkg_get_db(newpkg); + alpm_db_get_usage(db, &usage); + printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); - if(alpm_pkg_should_ignore(config->handle, pkg)) { + if(alpm_pkg_should_ignore(config->handle, pkg) || !(usage & ALPM_DB_USAGE_UPGRADE)) { printf(" %s", _("[ignored]")); } } -- 2.20.0

2 3

[pacman-dev] [PATCH] makepkg: fix broken check for the fakeroot binary
by Eli Schwartz 04 Jan '19

04 Jan '19

In commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 we made use of fakeroot absolutely mandatory, and disabled a lot of the code which checked to see if this now-defunct BUILDENV option was set, before setting up the environment to use fakeroot. Unfortunately, we missed one spot. The check_software routine still checked to see if fakeroot was enabled, but due to the option being removed, thought that it was in fact disabled, and as a result this check would never run. Fix by unconditionally checking for the fakeroot binary. While in theory, users could be using --verifysource or --packagelist or --printsrcinfo without, strictly speaking, needing fakeroot, they are sure to be building the software too, anyway, so this use case is not one we need to support. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8b39ca9a..db71d044 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,11 +1000,9 @@ check_software() { fi # fakeroot - correct package file permissions - if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then - if ! type -p fakeroot >/dev/null; then - error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 - fi + if ! type -p fakeroot >/dev/null; then + error "$(gettext "Cannot find the %s binary.")" "fakeroot" + ret=1 fi # gpg - package signing -- 2.19.1

3 10

[pacman-dev] [PATCH] makepkg: Make pkgdir a local
by Allan McRae 04 Jan '19

04 Jan '19

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Rebase of https://patchwork.archlinux.org/patch/640/ . scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e3a392d4..237d1cdb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -739,7 +739,7 @@ create_debug_package() { return 0 fi - pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" + local pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then @@ -923,7 +923,7 @@ restore_package_variables() { } run_single_packaging() { - pkgdir="$pkgdirbase/$pkgname" + local pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" if [[ -n $1 ]] || (( PKGFUNC )); then run_package $1 -- 2.20.0

1 0

[pacman-dev] [PATCH] makepkg: Create a single-package packaging function
by Allan McRae 04 Jan '19

04 Jan '19

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> Merge the similar code handling unsplit PKGBUILDs and individual packages in a split PKGBUILD and make it a new function. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- FYI: rebase of https://patchwork.archlinux.org/patch/639/ .FYI Changed run_solo_packaging -> run_single_packaging because it seemed right. scripts/makepkg.sh.in | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 33b3a70e..e3a392d4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -922,20 +922,25 @@ restore_package_variables() { done } +run_single_packaging() { + pkgdir="$pkgdirbase/$pkgname" + mkdir "$pkgdir" + if [[ -n $1 ]] || (( PKGFUNC )); then + run_package $1 + fi + tidy_install + lint_package || exit $E_PACKAGE_FAILED + create_package +} + run_split_packaging() { local pkgname_backup=("${pkgname[@]}") backup_package_variables for pkgname in ${pkgname_backup[@]}; do - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" - run_package $pkgname - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package + run_single_packaging $pkgname restore_package_variables done pkgname=("${pkgname_backup[@]}") - create_debug_package } usage() { @@ -1337,18 +1342,12 @@ if (( INFAKEROOT )); then chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then - pkgdir="$pkgdirbase/$pkgname" - mkdir "$pkgdir" - if (( PKGFUNC )); then - run_package - fi - tidy_install - lint_package || exit $E_PACKAGE_FAILED - create_package - create_debug_package + run_single_packaging else run_split_packaging fi + + create_debug_package msg "$(gettext "Leaving %s environment.")" "fakeroot" exit $E_OK -- 2.20.0

1 0

[pacman-dev] [PATCH v2] makepkg: Only backup package variables once
by Allan McRae 04 Jan '19

04 Jan '19

From: "Jan Alexander Steffens (heftig)" <jan.steffens(a)gmail.com> We don't need to re-backup the variables we restored on the previous iteration. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Rebase of https://patchwork.archlinux.org/patch/638/ . Posting here as a FYI. 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 4449ccf7..33b3a70e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -924,10 +924,10 @@ restore_package_variables() { run_split_packaging() { local pkgname_backup=("${pkgname[@]}") + backup_package_variables for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" mkdir "$pkgdir" - backup_package_variables run_package $pkgname tidy_install lint_package || exit $E_PACKAGE_FAILED -- 2.20.0

1 0

[pacman-dev] [PATCH] repo-remove: fix removing packages with deltas
by Eli Schwartz 04 Jan '19

04 Jan '19

We have code in order to remove deltas when removing a package, but it is never run, since we try to remove the wrong file. This was broken in commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a which modified the internal layout we use to modify the db, changing "tree" to "db", but did not update all locations where it was used. This worked swimmingly well as long as only repo-add updates were handling the backup and restoral of the delta file, as the delta file therefore got backed up to the correct location (db) in the shared db_remove_entry() function. But later on in the repo-remove logic, we tried removing a different file that will never exist (tree). Fixes FS#53041 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index bccf2f37..1c7fb2f6 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -611,7 +611,7 @@ remove() { msg "$(gettext "Searching for package '%s'...")" "$pkgname" if db_remove_entry "$pkgname"; then - rm -f "$tmpdir/tree/$pkgname.deltas" + rm -f "$tmpdir/db/$pkgname.deltas" return 0 else error "$(gettext "Package matching '%s' not found.")" "$pkgname" -- 2.20.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-94-ge1fc2f90
by Allan McRae 04 Jan '19

04 Jan '19

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 e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e (commit) via 3a5a0d53bced32b42fd553952c2f74d52981d9ef (commit) from 984492b92f1b35534adddc24c2439fcdcb9885af (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 e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e Author: Michael Straube <michael.straube(a)posteo.de> Date: Fri Dec 14 21:44:25 2018 +0100 libalpm/add.c: move assignment into conditional in alpm_add_pkg While at it and for consistency move the assignment of the variable 'local' into the subsequent conditional. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a5a0d53bced32b42fd553952c2f74d52981d9ef Author: Michael Straube <michael.straube(a)posteo.de> Date: Fri Dec 14 21:44:24 2018 +0100 Move skipping of duplicate sync/remove targets into libalpm sync: As pointed out by Andrew Gregory there could be an error when adding duplicates if they are two separate packages with the same name. Add a check in alpm_add_pkg() to test whether the duplicate is actually the same package, and if so, log a debug message and return success to skip the package. If the duplicate is a different package return ALPM_ERR_TRANS_DUP_TARGET and treat that error just like any other error in pacman. remove: Change alpm_remove_pkg() to just log a debug message and return success to skip duplicates. Remove the handling of ALPM_ERR_TRANS_DUP_TARGET in pacman. Also fixes FS#49377. Suggested-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 11 ++++++++--- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 14 insertions(+), 21 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2 1/2] Move skipping of duplicate sync/remove targets into libalpm
by Michael Straube 04 Jan '19

04 Jan '19

sync: As pointed out by Andrew Gregory there could be an error when adding duplicates if they are two separate packages with the same name. Add a check in alpm_add_pkg() to test whether the duplicate is actually the same package, and if so, log a debug message and return success to skip the package. If the duplicate is a different package return ALPM_ERR_TRANS_DUP_TARGET and treat that error just like any other error in pacman. remove: Change alpm_remove_pkg() to just log a debug message and return success to skip duplicates. Remove the handling of ALPM_ERR_TRANS_DUP_TARGET in pacman. Also fixes FS#49377. Suggested-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- v1 -> v2 debug messages not translated moved assigments into conditionals lib/libalpm/add.c | 8 +++++++- lib/libalpm/remove.c | 3 ++- src/pacman/remove.c | 10 ++-------- src/pacman/sync.c | 11 ++--------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index e415bb17..c39f9ecf 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -53,6 +53,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) const char *pkgname, *pkgver; alpm_trans_t *trans; alpm_pkg_t *local; + alpm_pkg_t *dup; /* Sanity checks */ CHECK_HANDLE(handle, return -1); @@ -70,7 +71,12 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) _alpm_log(handle, ALPM_LOG_DEBUG, "adding package '%s'\n", pkgname); - if(alpm_pkg_find(trans->add, pkgname)) { + if((dup = alpm_pkg_find(trans->add, pkgname))) { + if(dup == pkg) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping duplicate target: %s\n", pkgname); + return 0; + } + /* error for separate packages with the same name */ RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 78ca5be7..50de4649 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -74,7 +74,8 @@ int SYMEXPORT alpm_remove_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg) pkgname = pkg->name; if(alpm_pkg_find(trans->remove, pkgname)) { - RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1); + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping duplicate target: %s\n", pkgname); + return 0; } _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s to the transaction remove list\n", diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2269ed8..9d44cf53 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -44,14 +44,8 @@ static int remove_target(const char *target) if((pkg = alpm_db_get_pkg(db_local, target)) != NULL) { if(alpm_remove_pkg(config->handle, pkg) == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), target); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); - return -1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", target, alpm_strerror(err)); + return -1; } config->explicit_removes = alpm_list_add(config->explicit_removes, pkg); return 0; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 57677a42..2406fed5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -521,15 +521,8 @@ static int process_pkg(alpm_pkg_t *pkg) if(ret == -1) { alpm_errno_t err = alpm_errno(config->handle); - if(err == ALPM_ERR_TRANS_DUP_TARGET) { - /* just skip duplicate targets */ - pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), alpm_pkg_get_name(pkg)); - return 0; - } else { - pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), - alpm_strerror(err)); - return 1; - } + pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", alpm_pkg_get_name(pkg), alpm_strerror(err)); + return 1; } config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); return 0; -- 2.20.0

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-92-g984492b9
by Allan McRae 04 Jan '19

04 Jan '19

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 984492b92f1b35534adddc24c2439fcdcb9885af (commit) via 4778f1318853ac9fc1f838d836dbe017fb6cbddc (commit) via 2d403709d97cca381873a9d56cd37f51c0f3eade (commit) via ecac357c1a20f3e09ae979397e5efd225b03f895 (commit) via d150b9719000ccafb39e8560120bb4f690ba8b50 (commit) via 33a8ced334f01c94086a5e7e77d11a9361264781 (commit) from 6b541404cc691b2aea3d373e663d9628fda15a2b (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 984492b92f1b35534adddc24c2439fcdcb9885af Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Dec 27 18:15:48 2018 -0500 repo-add: don't break if delta package sources contain epoch Our sed parser for xdelta3 headers will greedily match on ":" which coincidentally is also the character we use to define a version with an epoch. While we are at it, simply use sed for the whole pipeline, rather than using both grep and sed. Fixes FS#61195 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4778f1318853ac9fc1f838d836dbe017fb6cbddc Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Dec 26 22:58:26 2018 -0500 repo-remove: fix removing packages with deltas We have code in order to remove deltas when removing a package, but it is never run, since we try to remove the wrong file. This was broken in commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a which modified the internal layout we use to modify the db, changing "tree" to "db", but did not update all locations where it was used. This worked swimmingly well as long as only repo-add updates were handling the backup and restore of the delta file, as the delta file therefore got backed up to the correct location (db) in the shared db_remove_entry() function. But later on in the repo-remove logic, we tried removing a different file that will never exist (tree). Fixes FS#53041 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d403709d97cca381873a9d56cd37f51c0f3eade Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:41 2018 -0800 allow tests for disabled features to be skipped Previously, pacman's test suite would fail when compiled without signature support. Adds a require_capability method to pmtest objects. Currently recognized values are 'gpg', 'curl', and 'nls'; although only gpg is used presently. Missing features are indicated by running pactest with one of the --without-<feature> options. This modifies pmenv to run each case as independent tests. Previously, a single pmenv could run multiple tests, combining there output into a single TAP stream but making it impossible to properly skip an entire test case. This change does not affect running pactest.py with a single test (as both autotools and meson do), but will affect anybody manually running pactest.py with multiple tests at once. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ecac357c1a20f3e09ae979397e5efd225b03f895 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:40 2018 -0800 tap.py: add skip_all function Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d150b9719000ccafb39e8560120bb4f690ba8b50 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:39 2018 -0800 remove unused test summary code Unused since 12e00af5315135a29a66c9aaa01e141a32d4634b Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 33a8ced334f01c94086a5e7e77d11a9361264781 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 22 22:24:38 2018 -0800 silence warning when built without curl Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 6 ++++++ lib/libalpm/handle.c | 2 ++ scripts/repo-add.sh.in | 6 +++--- test/pacman/meson.build | 25 ++++++++++++++++--------- test/pacman/pactest.py | 15 ++++++++++++--- test/pacman/pmenv.py | 31 +++++++++++++++++-------------- test/pacman/pmtest.py | 8 +++++++- test/pacman/tap.py | 5 +++++ test/pacman/tests/sign001.py | 1 + 9 files changed, 69 insertions(+), 30 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] silence warning when built without curl
by Andrew Gregory 04 Jan '19

04 Jan '19

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index f912d2f5..c491d87c 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -876,6 +876,8 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, CHECK_HANDLE(handle, return -1); #ifdef HAVE_LIBCURL handle->disable_dl_timeout = disable_dl_timeout; +#else + (void)disable_dl_timeout; /* silence unused variable warnings */ #endif return 0; } -- 2.19.2

2 4

[pacman-dev] [PATCH] repo-add: Fix parsing xdelta output with epoch in version
by Nigel Kukard 27 Dec '18

27 Dec '18

Parsing using sed 's/.*: *//' cuts off the filename before the epoch causing invalid filenames in the $pkg/deltas file. Patch attached fixing the issue. -N

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.1.2, created. v5.1.2
by Andrew Gregory 25 Dec '18

25 Dec '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, v5.1.2 has been created at ad1baa4100a996a8c957fb42299ed194385114f7 (tag) tagging 0b36d8781783d7f4a0086e12eb7cae542e7f6bd7 (commit) replaces v5.1.1 tagged by Andrew Gregory on Tue Dec 25 01:57:46 2018 -0800 - Log ----------------------------------------------------------------- v5.1.2 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlwh/xoACgkQu9/8kjBr ESE+Twf/eRh/JmqTEhHuU296Kc1w9YcwBUgJE1cYVDm3rAaKsCxD8vQzExS6PP6f MkNWymbx7YjUb8CdHv47W3YONfDmbw55Io46D4jOLA0yrUZhP7HfY+L/jcHCAVi6 vsPG98QHWxWfSJOaXqEZSWw7Kjfgj8+MAyrDlm718mq2TBibcUHz2ElH2i78m/y1 rH1MVL/LAwONtQHYLXHxmepQ92eaoUbdKJ3I5aRP3im+uFFwrkRbHFxYolFFFMKt gMOdgDoJlu9YrmiQWfy0slfNCT3oGVJdoSULhtHmTq/fKs451xc7KN0egZnBOm5d WOKTY2fBq9G4IxcqMk/TVqmvYIkSVw== =IvGY -----END PGP SIGNATURE----- Allan McRae (1): Pull updated translations from Transifex Andrew Gregory (5): reset signal handlers before running scripts/hooks handle EINTR while polling scripts/hooks always allow explicit empty siglevel for sync dbs update NEWS for v5.1.2 Release v5.1.2 Eli Schwartz (2): pacman: check versioned optdepends in -Qi operation libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Michael Straube (1): libalpm/dload.c: add case for CURLE_COULDNT_RESOLVE_HOST Olivier Brunel (2): alpm: Do not raise SIGINT when filesize goes over limit alpm: Fix SIGINT handling re: aborting download morganamilo (1): pacman-conf: add missing DisableDownloadTimeout ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-86-g6b541404
by Andrew Gregory 25 Dec '18

25 Dec '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 6b541404cc691b2aea3d373e663d9628fda15a2b (commit) via 281cdb2e1c5b706177beba4a932a75322c1c2351 (commit) from b109d7096b3f3f3244b7bb3796be658393eff98a (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 6b541404cc691b2aea3d373e663d9628fda15a2b Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sun Dec 23 14:30:49 2018 -0800 update NEWS for v5.1.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> (cherry picked from commit f8c73464c9cf86d6b917542585d74514f150c67b) commit 281cdb2e1c5b706177beba4a932a75322c1c2351 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sat Jun 3 22:15:22 2017 -0400 update NEWS for v5.0.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> (cherry picked from commit fdf53393bc996a514bbfc9fcd6ea19a8bb2f02ed) ----------------------------------------------------------------------- Summary of changes: NEWS | 33 +++++++++++++++++++++++++++++++++ doc/index.asciidoc | 2 ++ 2 files changed, 35 insertions(+) hooks/post-receive -- The official pacman repository

1 0