- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] makepkg: Pass --stream to `hg clone` when creating the working copy
by Luke Shumaker 20 Sep '18

20 Sep '18

From: Luke Shumaker <lukeshu(a)parabola.nu> Without --stream, `hg clone` reencodes+recompresses the entire repository, to the storage settings of the host. But download_hg() already did that on the initial network clone, and it is 100% pointless duplicated work for the local clone. The work that this saves is CPU-bound (not disk-bound), and is restricted to a single core. The --stream flag has only existed since Mercurial 4.4 (2017-11-01). Prior to that, it was named --uncompressed. --uncompressed still exists as a compatibility alias for --stream, and marked deprecated, though there is currently no schedule for its removal. --- scripts/libmakepkg/source/hg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in index ae9aed3b..7346e1e3 100644 --- a/scripts/libmakepkg/source/hg.sh.in +++ b/scripts/libmakepkg/source/hg.sh.in @@ -94,7 +94,7 @@ extract_hg() { plain "$(gettext "Aborting...")" exit 1 fi - elif ! hg clone -u "$ref" "$dir" "${dir##*/}"; then + elif ! hg clone -u "$ref" --stream "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" plain "$(gettext "Aborting...")" exit 1 -- 2.18.0

2 2

[pacman-dev] [PATCH] makepkg: lint_pkgver: Run even if PKGVERFUNC
by Luke Shumaker 20 Sep '18

20 Sep '18

From: Luke Shumaker <lukeshu(a)parabola.nu> lint_pkgver returns 0 if PKGVERFUNC, since it's likely that update_pkgver() will change the value of pkgver anyway, and there's no point in linting the old value. update_pkgver() will call check_pkgver() itself to validate the new value. However, that "optimization" only holds if we're definitely going to call update_pkgver() later; and that's way more complicated than if (( PKGVERFUNC )); then it's more like: if (( !GENINTEG && !PACKAGELIST && !PRINTSRCINFO && !SOURCEONLY && !REPKG && PKGVERFUNC )); then Which is to say: If I have a PKGBUILD with pkgver(): * if I run `makepkg -g` I expect it to lint pkgver, but it won't * if I run `makepkg -R` I expect it to lint pkgver, but it won't * ... So let's fix that. Rather than try to keep a huge list of conditions in sync with the flow of makepkg.sh.in, let's just drop it. As far as I can tell, the only thing that skipping lint_pkgver() really enables is letting the PKGBUILD author write `pkgver=` in the initial version, and letting pkgver() fill it in. They can just start writing `pkgver=0` for that workflow. --- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 65216b64..e9b1566f 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -44,10 +44,5 @@ check_pkgver() { } lint_pkgver() { - if (( PKGVERFUNC )); then - # defer check to after getting version from pkgver function - return 0 - fi - check_pkgver "$pkgver" } -- 2.18.0

3 2

[pacman-dev] [PATCH 0/4][WIP] makepkg test suite
by Andrew Gregory 20 Sep '18

20 Sep '18

The long-awaited makepkg test suite is finally here, or at least the start of it. The tests can be run via `make check` or they can also be run directly. Included so far are a few tests for package generation and a single libmakepkg test for some of the util/pkgbuild functions. I made some small changes to the lib in order to make it easier to use and to allow stricter error checking in the test suite (set -u). Andrew Gregory (4): util/pkgbuild: guard against unset variable util/pkgbuild: manually set extglob util/pkgbuild: fix broken indentation add basic makepkg test Makefile.am | 6 +- configure.ac | 2 + scripts/libmakepkg/util/pkgbuild.sh.in | 23 +++--- test/makepkg/Makefile.am | 9 +++ test/makepkg/README | 15 ++++ test/makepkg/test_functions.sh | 143 +++++++++++++++++++++++++++++++++ test/makepkg/tests/Makefile.am | 7 ++ test/makepkg/tests/TESTS | 4 + test/makepkg/tests/dbfiles.sh | 35 ++++++++ test/makepkg/tests/dotfiles.sh | 33 ++++++++ test/makepkg/tests/pkgbuild.sh | 53 ++++++++++++ test/makepkg/tests/util-pkgbuild.sh | 35 ++++++++ 12 files changed, 355 insertions(+), 10 deletions(-) create mode 100644 test/makepkg/Makefile.am create mode 100644 test/makepkg/README create mode 100644 test/makepkg/test_functions.sh create mode 100644 test/makepkg/tests/Makefile.am create mode 100644 test/makepkg/tests/TESTS create mode 100755 test/makepkg/tests/dbfiles.sh create mode 100755 test/makepkg/tests/dotfiles.sh create mode 100755 test/makepkg/tests/pkgbuild.sh create mode 100755 test/makepkg/tests/util-pkgbuild.sh -- 2.11.1

5 13

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-35-g7afe5117
by Allan McRae 20 Sep '18

20 Sep '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 7afe51171fe063bf3031cc68fc8c7ac914a01de2 (commit) via bae74c8e9e69b4f4e1a235eef21b9b27fb14aff0 (commit) via cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563 (commit) via 192d6166e9cb2a8f26d7256690e0158bd5a5d226 (commit) via b54b33d816cdc3d1aab3b80f4eb94c5bad56c889 (commit) via 3d5a056452fe897e533edfac2ddbe2d1ca702a6e (commit) via 961ef1a4c8cfc0fa7b8da4e6cb77d8327934e32f (commit) via 2bec380e108536f5e5f728ef66223ed3fabf5ab1 (commit) via 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5 (commit) via ba2984db3e83e0627c29897e28982e9f4cf24a5d (commit) via 58c76daf5e9116dd044f73958b67163549d0e795 (commit) via d03409ccde5a995f19e40a12d61b22be9d4c3af7 (commit) via 62eef5bbdb025d9557a1609760b42d7fbac16ad2 (commit) via 5b2ff51c399a906fd70df62ca179e2a696ea3860 (commit) via 16f6aae33087ec04c1dc90aa84f7d3dde4333046 (commit) via 48c8f9f2a24632dabe5b1c74a474e3940ddd8748 (commit) via 0696307a3b2e0cbde7d208eb78bbad6a9c8b336f (commit) via 3370c08a29a60e1cd1227d43652c22738c8e4f6e (commit) via 3e9a62e72139a71cb7c41a5e4bd896d22943cd7b (commit) via 9fde55c0c71f473d32fb638eb4f251041e3b3ffa (commit) via 8b2f3323b84a34d1d104136e455302dc32892b9a (commit) via 2d8d8af915d352b61178a981603360c27a3899f2 (commit) from 7d05ffceaf9161a6572505d25b5017e1eb33bf0e (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 7afe51171fe063bf3031cc68fc8c7ac914a01de2 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Oct 30 14:15:19 2017 -0400 repo-add: add support for the zst format Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bae74c8e9e69b4f4e1a235eef21b9b27fb14aff0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Oct 30 14:15:18 2017 -0400 makepkg: add support for the zst format Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563 Author: Luke Shumaker <lukeshu(a)parabola.nu> Date: Thu Aug 9 13:42:37 2018 -0400 makepkg: lint_pkgver: Run even if PKGVERFUNC lint_pkgver returns 0 if PKGVERFUNC, since it's likely that update_pkgver() will change the value of pkgver anyway, and there's no point in linting the old value. update_pkgver() will call check_pkgver() itself to validate the new value. However, that "optimization" only holds if we're definitely going to call update_pkgver() later; and that's way more complicated than if (( PKGVERFUNC )); then it's more like: if (( !GENINTEG && !PACKAGELIST && !PRINTSRCINFO && !SOURCEONLY && !REPKG && PKGVERFUNC )); then Which is to say: If I have a PKGBUILD with pkgver(): * if I run `makepkg -g` I expect it to lint pkgver, but it won't * if I run `makepkg -R` I expect it to lint pkgver, but it won't * ... So let's fix that. Rather than try to keep a huge list of conditions in sync with the flow of makepkg.sh.in, let's just drop it. As far as I can tell, the only thing that skipping lint_pkgver() really enables is letting the PKGBUILD author write `pkgver=` in the initial version, and letting pkgver() fill it in. They can just start writing `pkgver=0` for that workflow. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 192d6166e9cb2a8f26d7256690e0158bd5a5d226 Author: David Phillips <david(a)sighup.nz> Date: Wed Sep 19 14:30:37 2018 +1200 User-visible log when validity check fails due to access Currently, if checking the validity of packages fails due to an access error on one or more packages, the user must sift through debug output in order to find the culprit package(s). This patch adds a call to _alpm_log in such a case to make the culprits more easily visible. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b54b33d816cdc3d1aab3b80f4eb94c5bad56c889 Author: David Phillips <david(a)sighup.nz> Date: Wed Sep 19 14:28:35 2018 +1200 Change if-else chain to switch Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d5a056452fe897e533edfac2ddbe2d1ca702a6e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 21 12:39:21 2018 -0400 makepkg: reject PKGBUILDs with both split and non-split package functions We accept package_foo() in non-split packages, because it's easier to switch to/from a split package just by removing a pkgname element. But it makes no sense to have both in one PKGBUILD. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 961ef1a4c8cfc0fa7b8da4e6cb77d8327934e32f Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Sep 4 14:47:44 2018 +0100 Show group status during file search When doing "pacman -Fs", show the "(groupname)" message just like "pacman -Ss". And refactor group printing to its own function. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2bec380e108536f5e5f728ef66223ed3fabf5ab1 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 4 15:17:54 2018 -0400 libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3318039e3b1530396b0e3ced49ea6fe5b6ea00c5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 10:08:37 2018 -0400 pacman: check versioned optdepends in -Qi operation Fixes FS#60106 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba2984db3e83e0627c29897e28982e9f4cf24a5d Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Sun Jul 29 21:57:15 2018 +0200 doc: Remove double spaces Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 58c76daf5e9116dd044f73958b67163549d0e795 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Sep 18 09:42:42 2018 -0400 scripts: deduplicate localized copyright messages We don't need to translate the "Copyright YEAR AUTHOR" part, no part of it should probably be translated and it definitely shouldn't turn every single license terms notice into a separate translation just because the author/year is different. Fixes FS#58452 Also consistently add a blank line after the copyright and before the license terms. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d03409ccde5a995f19e40a12d61b22be9d4c3af7 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Aug 29 02:49:29 2018 -0400 Revert "makepkg: add whirlpool to the list of hashing algorithms" This reverts commit 9cdfd18739cc4b0e2b2efeb9a92a3ea612c8505f. We've never documented whirlpoolsums support in the manpage and no one really seems to have realized we support it, let alone use it -- except for a few parabola packages, being the contributor's motivation for adding support. The problem is that for two years the code has been broken. In commit 577701250d645d1fc1a505cde34aedbeb3208ea5 we moved to coreutils to provide checksum commands, rather than openssl, but there is no whirlpoolsums binary. Properly fixing this would require re-adding a dependency on openssl, independent of the libalpm crypto backend -- which defeats the purpose of moving to coreutils in the general case. nettle-hash does not provide a whirlpool algorithm any more than it does base64 (the original reason for moving to coreutils). Therefore, we should just drop support for this again. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 62eef5bbdb025d9557a1609760b42d7fbac16ad2 Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Sep 10 22:41:07 2018 +0100 pacman-conf: add missing DisableDownloadTimeout Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b2ff51c399a906fd70df62ca179e2a696ea3860 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Aug 29 01:10:21 2018 -0400 makepkg: don't print status for run_function when in a subshell It's most likely a case where output is being captured, so we shouldn't be interleaving status messages with function output regardless. Setting the pkgver() status message (the one time we use it in a subshell) separately also makes it safe to change whether message.sh functions write to stdout or stderr. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 16f6aae33087ec04c1dc90aa84f7d3dde4333046 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 13 21:20:58 2018 -0400 makepkg: fix pkgver() function not aborting on errors `run_function_safe pkgver` is evaluated in a subshell and therefore does not abort when it should. Explicitly check the return outside of the subshell and abort if necessary. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48c8f9f2a24632dabe5b1c74a474e3940ddd8748 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Aug 13 21:20:57 2018 -0400 makepkg: don't save the same shopts twice Both run_function and run_function_safe will save and restore `shopt -p` but the former is only called from the latter. It makes sense to save this as part of a "safe" runner, so let's just do it in one place, there where we save and restore everything else too. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0696307a3b2e0cbde7d208eb78bbad6a9c8b336f Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Aug 17 05:41:00 2018 +0100 Show install status during file search When doing "pacman -Fs", show the "[installed: version]" message just like "pacman -Ss". Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3370c08a29a60e1cd1227d43652c22738c8e4f6e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jul 5 10:42:41 2018 -0400 pacman/conf: Remove unused include Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3e9a62e72139a71cb7c41a5e4bd896d22943cd7b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:02 2018 -0400 doc: use more implicit rules to build manpages Use implicit dependency rules to translate asciidoc inputs to HTML and manpage outputs. We should only have to declare explicit dependencies for odd cases, e.g. the PKGBUILD documentation has an additional include file and isn't a 1:1 conversion. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9fde55c0c71f473d32fb638eb4f251041e3b3ffa Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:01 2018 -0400 Remove unused checks for strcoll and mktime We don't use these. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b2f3323b84a34d1d104136e455302dc32892b9a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 19 17:43:00 2018 -0400 common/ini: Depend on util-common, not util Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d8d8af915d352b61178a981603360c27a3899f2 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 07:28:51 2018 -0400 scripts: pass on options such as set -x to child processes When re-running makepkg for fakeroot, if `bash -x makepkg` was used this is lost. Fix by encoding the current set of options explicitly in the invocation, both for makepkg and for the wrapper used to test scripts inside the source tree. Also change to use ${BASH_SOURCE[0]} instead of $0 as the latter can be anything the parent process wants, while the former is explicitly set by bash itself to the filepath of the script. See http://mywiki.wooledge.org/BashFAQ/028 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 -- doc/Makefile.am | 34 +++++++------------- doc/makepkg.conf.5.asciidoc | 3 +- doc/pacman.conf.5.asciidoc | 2 +- doc/submitting-patches.asciidoc | 2 +- etc/makepkg.conf.in | 1 + lib/libalpm/sync.c | 33 ++++++++++++------- scripts/libmakepkg/lint_config/variable.sh.in | 4 +-- .../lint_pkgbuild/package_function.sh.in | 9 +++++- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 --- scripts/libmakepkg/util/compress.sh.in | 1 + scripts/makepkg.sh.in | 22 +++++++------ scripts/pacman-db-upgrade.sh.in | 3 +- scripts/pacman-key.sh.in | 3 +- scripts/pkgdelta.sh.in | 3 +- scripts/repo-add.sh.in | 4 ++- scripts/wrapper.sh.in | 2 +- src/common/ini.c | 2 +- src/pacman/conf.c | 1 - src/pacman/files.c | 7 +++- src/pacman/package.c | 37 ++++++++++++---------- src/pacman/package.h | 1 + src/pacman/pacman-conf.c | 3 ++ 23 files changed, 104 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] during -Qu add [ignored] for repos without Usage = Upgrade
by morganamilo 19 Sep '18

19 Sep '18

Fixes FS#59854 Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/query.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 00c39638..faa06e60 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -325,10 +325,14 @@ static int display(alpm_pkg_t *pkg) colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); if(config->op_q_upgrade) { + int usage; alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + 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.18.0

3 5