- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] build: link vercmp staticly with libalpm
by Dave Reisner 11 Feb '19

11 Feb '19

This makes the meson-built vercmp equivalent to the autotools build. Employ an intermediate archive of libalpm which our generic library rule can slurp in. Other alpm-only binaries (specifically we care about vercmp) can then link this in for alpm functionality without caring exactly where the function is defined. meson passes the right flags to ensure that unused data is stripped out of the executable. ref: FS#61719 --- meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..5c1efd73 100644 --- a/meson.build +++ b/meson.build @@ -354,12 +354,21 @@ libcommon = static_library( include_directories : includes, install : false) +libalpm_a = static_library( + 'alpm_a', + libalpm_sources, + version : libalpm_version, + include_directories : includes, + dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_with : [libcommon], + install : true) + libalpm = library( 'alpm', - libalpm_sources, version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_whole : [libalpm_a], link_with : [libcommon], install : true) @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-132-gdb102c67
by Allan McRae 06 Feb '19

06 Feb '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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (commit) via 714a1b4e4eaf7ffde5f30eccb476f59979fac44e (commit) from 04e77591d6333002815e9276ca08c01230fcf212 (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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 Author: Mark Ulrich <mark.ulrich.86(a)gmail.com> Date: Wed Feb 6 08:36:51 2019 -0600 libalpm: prevent 301 redirect loop from hanging the process If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 714a1b4e4eaf7ffde5f30eccb476f59979fac44e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 4 10:32:50 2019 +1000 I blame everyone but me for this Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- lib/libalpm/dload.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: prevent 301 redirect loop from hanging the process
by Mark Ulrich 06 Feb '19

06 Feb '19

If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 36ae4ee1..d04a5e46 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -259,6 +259,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 1L); curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); -- 2.20.1

3 4

[pacman-dev] Pacman failing with existing symlinks on the install path
by Peter Kehl 04 Feb '19

04 Feb '19

Dear Pacman maintainers, On current 4.19.16-1-MANJARO x64, I had /opt as symlink to /share/opt. I went to install current Google Chrome 72.0.3626.81-1 from https://aur.archlinux.org/packages/google-chrome (either by GNOME's Add/Remove Software, or by sudo pacman -U google-chrome-72.0.3626.81-1- x86_64.pkg.tar.xz). It failed with: error: failed to commit transaction (conflicting files) google-chrome: /opt exists in filesystem Knut Ahlers, the maintainer of AUR Google Chrome package, responded that the package doesn't check for the symlinks. Hence it's probably pacman. Have you/would you consider supporting existing symlinks on the install paths, please? Thanks in advance, -Peter Kehl Vancouver, B.C., Canada

3 3

[pacman-dev] [PATCH] libalpm: Check cachedir access before re-creating
by David Phillips 04 Feb '19

04 Feb '19

If users have mounted a filesystem such as sshfs or NFS that doesn't allow root access by default for security reasons, _alpm_filecache_setup will blindly try and re-create the components of the cachedir path, eating EACCES (to be liek mkdir -p). Then, it will return this path as if it is valid when it may not be readable by root, causing alpm_check_downloadspace to trigger a FPE since it assumes the cachedir is R/W and uses fsinfo which may be zero. This patch adds a check before trying to re-create the cachedir in order to determine if creating it will result in EACCES, and outputs a warning if so. It also discards the current cachedir from being considered. This causes a more meaningful and graceful failure than a FPE. --- lib/libalpm/util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d33eef2a..d4375593 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -849,12 +849,16 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) for(i = handle->cachedirs; i; i = i->next) { cachedir = i->data; if(stat(cachedir, &buf) != 0) { - /* cache directory does not exist.... try creating it */ - _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), - cachedir); - if(_alpm_makepath(cachedir) == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); - return cachedir; + if (errno == EACCES) { + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to stat %s: %s\n"), cachedir, strerror(errno)); + } else { + /* cache directory does not exist.... try creating it */ + _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), + cachedir); + if(_alpm_makepath(cachedir) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + return cachedir; + } } } else if(!S_ISDIR(buf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, -- 2.20.1

3 2

[pacman-dev] [PATCH] I blame everyone for this
by Allan McRae 04 Feb '19

04 Feb '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 6ae93a9d..ce39e0c5 100644 --- a/NEWS +++ b/NEWS @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - read missing newline on -Qi/-Si output (FS#11331) + - re-add missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function -- 2.20.1

1 0

[pacman-dev] [PATCH] fix various typos
by morganamilo 04 Feb '19

04 Feb '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index a182d65e..6ae93a9d 100644 --- a/NEWS +++ b/NEWS @@ -167,7 +167,7 @@ VERSION DESCRIPTION - fix triggering of Install hooks (FS#47996) - fix handling of stdin scripts called by pacman - hook activity is logged - - documentataion updates for alpm-hooks (FS#48080) + - documentation updates for alpm-hooks (FS#48080) - makepkg: - increase robustness of variable array checks - makepkg -g does not perform current architecture checks @@ -259,9 +259,9 @@ VERSION DESCRIPTION - Fix removal of static libraries when the shared library uses the absolute path in symbolic links (FS#43395) - Improve Bazaar cloning (FS#43448) - - Fix issues with architecture dependant checksum + - Fix issues with architecture dependent checksum verification (FS#43192) - - Fix .SRCINFO file with architecture dependant fields + - Fix .SRCINFO file with architecture dependent fields (FS#43247) - Fix compatibility with older bash versions - Allow git checkouts to be downloaded into directory ending @@ -351,7 +351,7 @@ VERSION DESCRIPTION - checkupdates: rename CHECKUPDATE_DB to CHECKUPDATES_DB - pacdiff: add a "Quit" option, and many other improvements - pacsysclean is removed -4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitary +4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitrary file overwrites from malicious databases - makepkg: - restrict package name from starting with a dot @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - readd missing newline on -Qi/-Si output (FS#11331) + - read missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function @@ -1262,7 +1262,7 @@ VERSION DESCRIPTION external download utility like wget - added a license field to package meta-data - add url support to -A and -U operations (download packages) - - -Ss now searches thru provides fields + - -Ss now searches through provides fields - added --dbonly option to -R 2.7.6 - added --print-uris option - fixed an http download bug (FS#667) diff --git a/configure.ac b/configure.ac index 6f336022..415ed3cb 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ if test "x$CFLAGS" = "x"; then CFLAGS="" fi -# Set subsitution values for version stuff in Makefiles and anywhere else, +# Set substitution values for version stuff in Makefiles and anywhere else, # and put LIB_VERSION in config.h AC_SUBST(LIB_VERSION) AC_SUBST(LIB_VERSION_INFO) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index f12effde..32668adc 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -60,8 +60,8 @@ systems (see below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is a postive integer, with an optional subrelease level - specified by adding another postive integer separated by a period + variable is a positive integer, with an optional subrelease level + specified by adding another positive integer separated by a period (i.e. in the form x.y). *epoch*:: diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b11d5dda..fbcde266 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -38,7 +38,7 @@ /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package initialization (such as used by the file backend). Each - * backend is free to define a stuct containing pointers to a specific + * backend is free to define a struct containing pointers to a specific * implementation of these methods. Some backends may find using the * defined default_pkg_ops struct to work just fine for their needs. */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index df7ac6ca..92598b0e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -182,7 +182,7 @@ static int init_gpgme(alpm_handle_t *handle) #endif /* NOTE: * The GPGME library installs a SIGPIPE signal handler automatically if - * the default signal hander is in use. The only time we set a handler + * the default signal handler is in use. The only time we set a handler * for SIGPIPE is in dload.c, and we reset it when we are done. Given that * we do this, we can let GPGME do its automagic. However, if we install * a library-wide SIGPIPE handler, we will have to be careful. diff --git a/meson_options.txt b/meson_options.txt index 422a9ae4..bf3fc22d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,7 +2,7 @@ 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') + description : 'if true, build statically linked binaries') # directories and filenames option('root-dir', type : 'string', value : '/', diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index 867dc928..ab069a45 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -1,6 +1,6 @@ #!/usr/bin/bash # -# strip.sh - Confirm presense of strip binary +# strip.sh - Confirm presence of strip binary # # Copyright (c) 2011-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 298275a8..4163805d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -38,7 +38,7 @@ array_build() { # it's an error to try to copy a value which doesn't exist. declare -p "$2" &>/dev/null || return 1 - # Build an array of the indicies of the source array. + # Build an array of the indices of the source array. eval "keys=(\"\${!$2[@]}\")" # Clear the destination array diff --git a/src/pacman/util.c b/src/pacman/util.c index 74e1037d..8f6290db 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1359,7 +1359,7 @@ static int multiselect_parse(char *array, int count, char *response) len--; include = 0; } else if(str) { - /* if first token is including, we unselect all targets */ + /* if first token is including, we deselect all targets */ memset(array, 0, count); } -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-130-g04e77591
by Allan McRae 04 Feb '19

04 Feb '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 04e77591d6333002815e9276ca08c01230fcf212 (commit) from 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e (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 04e77591d6333002815e9276ca08c01230fcf212 Author: morganamilo <morganamilo(a)gmail.com> Date: Sat Feb 2 19:01:05 2019 +0000 fix various typos Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Parallel downloads
by Dávid Bíró 01 Feb '19

01 Feb '19

Dear Pacman Devs I want to add a parallel download feature for Pacman. Is it a wanted feature? Should I do it? If yes, could you provide some docs for the code? David Judge dbiro97(a)gmail.com

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-129-g11bc315c
by Allan McRae 31 Jan '19

31 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 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e (commit) via 14755df06f4727f261a8174502754acd7243ab75 (commit) from 75aae126c423dcc9b215aef57daff9e7bd8f5f6b (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 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e Author: morganamilo <morganamilo(a)gmail.com> Date: Thu Jan 31 02:07:09 2019 +0000 libmakepkg: lint disallowed architecture specific variables Variables such as 'pkgdesc_x86_64' are invalid, instead of ignoring them raise an error. This also disallows using 'any' as an architecture specific variable Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 14755df06f4727f261a8174502754acd7243ab75 Author: morganamilo <morganamilo(a)gmail.com> Date: Thu Jan 31 02:04:56 2019 +0000 libmakepkg: lint disallowed variables in package() makepkg will now error if disallowed variables are set inside of the package function. Disallowed variables are variables that do exist, like 'makedepends' and 'pkgver' but can not be set inside of a package function. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/Makefile.am | 2 + .../libmakepkg/lint_pkgbuild/arch_specific.sh.in | 82 ++++++++++++++++++++++ scripts/libmakepkg/lint_pkgbuild/meson.build | 2 + .../lint_pkgbuild/package_function_variable.sh.in | 62 ++++++++++++++++ scripts/libmakepkg/util/pkgbuild.sh.in | 9 +++ 5 files changed, 157 insertions(+) create mode 100644 scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in create mode 100644 scripts/libmakepkg/lint_pkgbuild/package_function_variable.sh.in hooks/post-receive -- The official pacman repository

1 0