- Pacman-dev - lists.archlinux.org

[pacman-dev] Git repo location change
by Allan McRae 04 May '16

04 May '16

Due to some maintenance at the Arch Linux end, the git repo has changed locations: Old url = git://projects.archlinux.org/pacman.git New url = git://git.archlinux.org/pacman.git A

1 0

[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

[pacman-dev] [PATCH v2] Report local file URL for -Sp operations if package is in cache
by Allan McRae 19 Apr '16

19 Apr '16

When using "pacman -Sp" operation to get URLs of packages to download, it is useful to know which packages are already in the file cache and do not need downloaded. Print packages in the cache with a file:// prefix. e.g $ pacman -Sp glibc file:///var/cache/pacman/glibc-2.23-1-x86_64.pkg.tar.xz Also reordered the case statements so that appropriate output is printed if an impossible fallthrough occurs in the sync case. Fixes FS#15868 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: - move "servers =" block in case PM_OP_SYNC out of else block - move PM_OP_SYNC below PM_OP_UPGRADE as technically a fallthrough could happen and that should go to the default output. src/pacman/util.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index d924bf3..ed21bc8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1026,15 +1026,35 @@ static char *pkg_get_location(alpm_pkg_t *pkg) alpm_list_t *servers; char *string = NULL; switch(config->op) { + case PM_OP_UPGRADE: + return strdup(alpm_pkg_get_filename(pkg)); + case PM_OP_SYNC: + if(alpm_pkg_download_size(pkg) == 0) { + /* file is already in the package cache */ + alpm_list_t *i; + const char *pkgfile = alpm_pkg_get_filename(pkg); + char path[PATH_MAX]; + struct stat buf; + + for(i = alpm_option_get_cachedirs(config->handle); i; i = i->next) { + snprintf(path, PATH_MAX, "%s%s", (char *)i->data, pkgfile); + if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { + pm_asprintf(&string, "file://%s", path); + return string; + } + } + } + servers = alpm_db_get_servers(alpm_pkg_get_db(pkg)); if(servers) { pm_asprintf(&string, "%s/%s", (char *)(servers->data), alpm_pkg_get_filename(pkg)); return string; } - case PM_OP_UPGRADE: - return strdup(alpm_pkg_get_filename(pkg)); + + /* fallthrough should never occur */ + default: pm_asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); return string; -- 2.7.4

2 1

[pacman-dev] [PATCH] makepkg: Add DEBUGDEST for a pkgtype of debug
by Earnestly 18 Apr '16

18 Apr '16

Fixes FS#48902. This patch piggybacks on makepkg's internal knowledge of the package name to move packages of type "debug" (more on this later) to a user defined directory. The goal is to make moving only debug packages to a debug repo in a reliable manner without using globbing to try and guess if a package is a debug package or not. This concept patch adds a new global variable called "pkgtype" which defines the kind of package it is, currently the only pkgtype is "debug". I've left non-debug pkgtypes to indicate a normal package but it may be potentially expanded with different types of package in future. Currently pkg_file is updated based on the variable and prefers DEBUGDEST if it is defined otherwise falling back on PKGDEST which essentially treats debug packages as normal packages if DEBUGDEST is not configured. Signed-off-by: Earnestly <zibeon(a)gmail.com> --- doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 3 +++ scripts/makepkg.sh.in | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 5bd3472..53502d6 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -224,6 +224,11 @@ Options like to keep all their packages in one place so this option allows for this behavior. A common location is ``/home/packages''. +**DEBUGDEST**"/path/to/directory":: + If this value is not set, debug packages will by default honor `PKGDEST`. + This allows people to configure a directory where debug packages will be + placed. + **SRCDEST=**"/path/to/directory":: If this value is not set, downloaded source files will only be stored in the current directory. Many people like to keep all source files in diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index efac16a..78220f8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -108,6 +108,9 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) # #-- Destination: specify a fixed directory where all packages will be placed #PKGDEST=/home/packages +#-- Destination: specify a fixed directory where all debug packages will be +# placed, uses PKGDEST if not set +#DEBUGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources #-- Source packages: specify a fixed directory where all src packages will be placed diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f80e37a..4afa4f2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1106,6 +1106,13 @@ create_package() { done # tar it up + case $pkgtype in + # If the user hasn't configured DEBUGDEST then we need to fall back on + # PKGDEST so the package has somewhere to go. + debug) PKGDEST=${DEBUGDEST:-$PKGDEST} ;; + *) PKGDEST=$PKGDEST ;; + esac + local fullver=$(get_full_version) local pkg_file="$PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT}" local ret=0 @@ -1174,6 +1181,7 @@ create_debug_package() { fi pkgdir="${pkgdir}-@DEBUGSUFFIX@" + pkgtype=debug # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then -- 2.8.0

2 2