April 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Added the --bell switch.
by Eric Toombs 26 Jun '16

26 Jun '16

This switch rings the terminal bell when user input is required. Obviously, it has no effect if --noconfirm is also passed. --- doc/pacman.8.txt | 3 +++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 3 +++ src/pacman/util.c | 15 +++++++++------ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 514f559..6e0617a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -148,6 +148,9 @@ Options *\--arch* <arch>:: Specify an alternate architecture. +*\--bell*:: + Sound the terminal bell when input is required. + *\--cachedir* <dir>:: Specify an alternative package cache location (a typical default is +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 7a7e9cf..463ae48 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short bell; double deltaratio; char *arch; char *print_format; @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_BELL }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 94685a7..07282e7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -221,6 +221,7 @@ static void usage(int op, const char * const myname) addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); addlist(_(" --confirm always ask for confirmation\n")); + addlist(_(" --bell sound the terminal bell when input is required\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -480,6 +481,7 @@ static int parsearg_global(int opt) case OP_CONFIRM: config->noconfirm = 0; break; + case OP_BELL: config->bell = 1; break; case OP_DBPATH: case 'b': free(config->dbpath); @@ -981,6 +983,7 @@ static int parseargs(int argc, char *argv[]) {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, + {"bell", no_argument, 0, OP_BELL}, {0, 0, 0, 0} }; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e8..9183047 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1396,13 +1396,14 @@ int multiselect_question(char *array, int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, response_len, stdin)) { @@ -1463,13 +1464,14 @@ int select_question(int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a number (default=%d)"), preset); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, sizeof(response), stdin)) { @@ -1517,13 +1519,14 @@ static int question(short preset, const char *format, va_list args) } fputs(config->colstr.nocolor, stream); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); return preset; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fd_in); if(safe_fgets(response, sizeof(response), stdin)) { -- 2.6.2

3 8

[pacman-dev] Proposal to split out makepkg integrity methods
by Ashley Whetter 18 May '16

18 May '16

Hello everyone, I'm looking to split some makepkg methods out into a of makepkg.sh.in and into a new libmakepkg module. My plan is to have an "integrity" folder in libmakepkg. In this folder there would be a "generate.sh" file with the `generate_checksums`, `generate_one_checksum`, and `create_signature` methods. Another file, "check.sh" would contain `check_source_integrity`and it's dependencies; namely `check_checksums`, `check_pgpsigs`, `parse_gpg_statusfile`, `verify_integrity_sums`, and `verify_integrity_one`. "integrity" would depend on "util/pkgbuild.sh" as `check_checksums` and `verify_integrity_sum` both call `array_build`, and `check_pgpsigs` calls `get_all_sources` and `get_all_sources_for_arch`. I also plan on moving `get_integlist` into "util/pkgbuild.sh", or maybe into an "integrity/util.sh" file (but "util/pkgbuild.sh" makes more sense to me). Another option would be to have an "integrity.sh" file under "integrity" (or maybe some other name) and also a "signature.sh" file, and to split the methods by whether they are related to strictly integrity checking or signature checking. Are there any thoughts or suggestions on this plan of attack? Ashley

2 5

[pacman-dev] [PATCH] makepkg: ignore the architecture for --printsrcinfo
by Alastair Hughes 05 May '16

05 May '16

Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- It appears that SRCINFO files should be independent of architecture, however makepkg will currently fail if the SRCINFO file is being generated on a machine with a different architecture. This is in the same vein as c72ca3d5; I believe that creating source tarballs would be the only other candidate, but IGNOREARCH gets set later in that case. scripts/makepkg.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f80e37a..5487884 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1707,7 +1707,8 @@ while true; do -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; - --printsrcinfo) PRINTSRCINFO=1 ;; + # generating a srcinfo does not depend on architecture + --printsrcinfo) PRINTSRCINFO=1 IGNOREARCH=1;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; -- 2.8.0

2 1

[pacman-dev] [PATCH libmakepkg 1/2] git: perform a shallow clone
by Eric Engestrom 01 May '16

01 May '16

This can considerably speed up the cloning process, as makepkg won't have to download the whole history. Signed-off-by: Eric Engestrom <eric(a)engestrom.ch> --- scripts/libmakepkg/source/git.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index cc27663..ad31c34 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -42,7 +42,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --depth 1 --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.8.0

4 6

[pacman-dev] [PATCH libalpm] fix spelling mistakes
by Eric Engestrom 29 Apr '16

29 Apr '16

Signed-off-by: Eric Engestrom <eric(a)engestrom.ch> --- contrib/zsh_completion.in | 6 +++--- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/package.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 3ef4b8d..f74fa29 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -103,7 +103,7 @@ _pacman_opts_files=( {-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages' {-o,--owns}'[Query the package that owns]:files:_files' {-s,--search}'[Search package file names for matching strings]:files:_files' - {-x,--regex}'[Enable searching using regluar expressions]:regex:' + {-x,--regex}'[Enable searching using regular expressions]:regex:' {-y,--refresh}'[Download fresh files databases from the server]' '--machinereadable[Produce machine-readable output]' {-q,--quiet}'[Show less information for query and search]' @@ -505,7 +505,7 @@ _key_shortopts=( '-a[Add the specified keys (empty for stdin)]: :_files' '-d[Remove the Specified keyids]:*: :_keys' '-e[Export the specified or all keyids]:*: :_keys' - '-f[List fingreprint for specidied or all keyids]:*: :_keys' + '-f[List fingerprint for specified or all keyids]:*: :_keys' '-l[List the specified or all keys]:*: :_keys' '-r[Fetch the specified keyids]:*: :_keys' '-u[Update the trustdb of pacman]' @@ -518,7 +518,7 @@ _key_longopts=( '--add[Add the specified keys (empty for stdin)]: :_files' '--delete[Remove the Specified keyids]:*: :_keys' '--export[Export the specified or all keyids]:*: :_keys' - '--finger[List fingreprint for specidied or all keyids]:*: :_keys' + '--finger[List fingerprint for specified or all keyids]:*: :_keys' '--list-keys[List the specified or all keys]:*: :_keys' '--recv-keys[Fetch the specified keyids]:*: :_keys' '--updatedb[Update the trustdb of pacman]' diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index aa57d51..9b8166f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -464,7 +464,7 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_HOOK_DONE, /** A hook is starting */ ALPM_EVENT_HOOK_RUN_START, - /** A hook has finnished runnning */ + /** A hook has finished running */ ALPM_EVENT_HOOK_RUN_DONE } alpm_event_type_t; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 247715e..c9ed770 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -356,7 +356,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, } /** - * Handle the existance of simple paths for _alpm_load_pkg_internal() + * Handle the existence of simple paths for _alpm_load_pkg_internal() * @param pkg package to change * @param path path to examine * @return 0 if path doesn't match any rule, 1 if it has been handled diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1fe7cd9..c35a275 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -432,7 +432,7 @@ int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep) } /** - * @param dep dependency to check agains the provision list + * @param dep dependency to check against the provision list * @param provisions provision list * @return 1 if provider is found, 0 otherwise */ diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 9fea356..31add9a 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -37,7 +37,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 intialization (such as used by the file backend). Each + * as lazy package initialization (such as used by the file backend). Each * backend is free to define a stuct 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. -- 2.8.0

1 0

[pacman-dev] Fwd: What is passed to a hook's Action?
by Eric Schultz 29 Apr '16

29 Apr '16

I've looked at the docs for alpm-hooks. I even tried looking at the code but I'm not a C programmer so a lot didn't make sense to me. What I'm wondering is what gets passed to the command in Exec of a hook? And how is it passed? Are there variables we can put on the command line to be passed as parameters? Does everything come through stdin? Or nothing at all? Looking at andrewgregory's pachooks github repository, info-install.hook in particular, I get the impression things are passed via stdin. But I'm looking for some official docs or word from the developers to go on. Thanks, -- Headed for the second star to the right and straight on 'til morning... Eric Schultz

2 1

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

Re: [pacman-dev] [arch-dev-public] Hooks rebuild #1
by Bruno Pagani 27 Apr '16

27 Apr '16

Le 27/04/2016 à 14:36, Allan McRae a écrit : > We are ready to start the first hooks rebuild. This rebuild covers > packages using these hooks: > > update-desktop-database > update-mime-database > install-info > glib-compile-schemes > gtk-update-icon-cacne/xdg-icon-resource > gconf > gio-querymodules > > Each rebuild requires the install file updated to remove these commands. > > No need to use staging/testing for this rebuild (except [core] packages). > > GO! I’m not sure whether there has been anything done in that direction, but this probably means namcap should be updated to detect dependencies to this based on something else than call in .install. Maybe just use the same things than hook (i.e. files detection). Bruno

2 2

[pacman-dev] [PATCH] pacman_query: move error messages into relevant if statements
by Allan McRae 19 Apr '16

19 Apr '16

This ensures any additions to these test do not have to rely on the correct error condition being set by libalpm. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0cc12e6..1d102a9 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -460,27 +460,27 @@ int pacman_query(alpm_list_t *targets) if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); + + if(pkg == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("could not load package '%s': %s\n"), strname, + alpm_strerror(alpm_errno(config->handle))); + } } else { pkg = alpm_db_get_pkg(db_local, strname); + + if(pkg == NULL) { + pm_printf(ALPM_LOG_ERROR, + _("package '%s' was not found\n"), strname); + if(!config->op_q_isfile && access(strname, R_OK) == 0) { + pm_printf(ALPM_LOG_WARNING, + _("'%s' is a file, you might want to use %s.\n"), + strname, "-p/--file"); + } + } } if(pkg == NULL) { - switch(alpm_errno(config->handle)) { - case ALPM_ERR_PKG_NOT_FOUND: - pm_printf(ALPM_LOG_ERROR, - _("package '%s' was not found\n"), strname); - if(!config->op_q_isfile && access(strname, R_OK) == 0) { - pm_printf(ALPM_LOG_WARNING, - _("'%s' is a file, you might want to use %s.\n"), - strname, "-p/--file"); - } - break; - default: - pm_printf(ALPM_LOG_ERROR, - _("could not load package '%s': %s\n"), strname, - alpm_strerror(alpm_errno(config->handle))); - break; - } ret = 1; continue; } -- 2.7.4

2 3

[pacman-dev] [PATCH] Handle bad .part files when encountered
by Allan McRae 19 Apr '16

19 Apr '16

We can end up with .part files downloaded that are unable to be used by pacman in two ways: 1) a well timed ctrl+c right at the rename of the download file can leave a complete download with a .part extension, or 2) for some reason (bad mirror) a .part file can be larger than the file to be downloaded. In both cases, pacman fails with a very cryptic error message. When these files are encountered by libalpm, they are now either renamed to remove the if .part suffix if the download is complete, or deleted if the download file is too large. Fixes FS#35789 and FS#39257. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 00b68d0..95e34f8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -337,7 +337,27 @@ static int compute_download_size(alpm_pkg_t *newpkg) /* subtract the size of the .part file */ _alpm_log(handle, ALPM_LOG_DEBUG, "using (package - .part) size\n"); size = newpkg->size - st.st_size; - size = size < 0 ? 0 : size; + if(size < 0) { + /* we have a bad .part file - delete it */ + _alpm_log(handle, ALPM_LOG_DEBUG, "deleting invalid .part file\n"); + unlink(fpath); + size = newpkg->size; + goto finish; + } else if (size == 0) { + /* the .part file is complete, but needs renamed */ + char *newpath; + size_t fpathlen = strlen(fpath); + + _alpm_log(handle, ALPM_LOG_DEBUG, "renaming complete .part file\n"); + + CALLOC(newpath, fpathlen + 1, sizeof(char), return -1); + strcpy(newpath, fpath); + newpath[fpathlen - 5] = '\0'; + rename(fpath, newpath); + FREE(newpath); + + goto finish; + } } /* tell the caller that we have a partial */ -- 2.7.4

3 3