December 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] Alternatives system
by Allan McRae 07 Dec '20

07 Dec '20

Hi all, I plan to finish implementing an alternatives system for pacman post 5.2 release: https://wiki.archlinux.org/index.php/User:Allan/Alternatives Any comments or suggestions? Thanks, Allan

6 7

[pacman-dev] [PATCH] libmakepkg: when stripping split debug symbols, warn on duplicate paths
by Eli Schwartz 03 Feb '20

03 Feb '20

Trying to strip multiple files installed to the same filepath (in different components of a split package) can produce surprising results if those files are built using different options. Per FS#63356 this is not a supported PKGBUILD configuration. Instead, warn about such cases when producing debug packages. Fixes FS#63366 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 5937e13c..eaa764b7 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -46,7 +46,13 @@ strip_file() { if check_option "debug" "y"; then local bid=$(build_id "$binary") - # has this file already been stripped + # has this filepath been stripped before under a different Build Id + if [[ -f "$dbgdir/$binary.debug" ]]; then + if [[ -n $bid && $bid != $(build_id "$dbgdir/$binary.debug") ]]; then + warning "Split package with multiple copies of the file '%s' have different Build Ids" "$binary" + fi + fi + # has this file's hardlink already been stripped if [[ -n "$bid" ]]; then if [[ -f "$dbgdir/.build-id/${bid:0:2}/${bid:2}.debug" ]]; then return -- 2.22.0

2 4

[pacman-dev] [PATCH] makepkg: make source tarballs work with per-package files containing '$pkgname'
by Eli Schwartz 19 Jan '20

19 Jan '20

Extracting function variables containing arbitrarily scoped variables of arbitrary nature is a disaster, but let's at least cover the common case of using the actual '$pkgname' in an install/changelog file. It's the odd case of actually being basically justified use of disambiguating between the same variable used in multiple different split packages and is even recommended in the PKGBUILD(5) documentation... ... and also, --printsrcinfo already uses and overwrites the variable 'pkgname' in pkgbuild_extract_to_srcinfo, so this "works" in .SRCINFO but doesn't work in .src.tar.gz Fixes FS#64932 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca3e7459..674e0d87 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -784,13 +784,14 @@ create_srcpackage() { fi done - local i + local pkgname_backup=(${pkgname[@]}) + local i pkgname for i in 'changelog' 'install'; do local file files [[ ${!i} ]] && files+=("${!i}") - for name in "${pkgname[@]}"; do - if extract_function_variable "package_$name" "$i" 0 file; then + for pkgname in "${pkgname_backup[@]}"; do + if extract_function_variable "package_$pkgname" "$i" 0 file; then files+=("$file") fi done @@ -802,6 +803,7 @@ create_srcpackage() { fi done done + pkgname=(${pkgname_backup[@]}) local fullver=$(get_full_version) local pkg_file="$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" -- 2.24.1

2 3

[pacman-dev] [PATCHv2 1/2] Ensure regex object is always initialized
by Dave Reisner 06 Jan '20

06 Jan '20

This avoids a crash in filetarget_free() when regex support isn't requested in files_search(). --- v2: Use {0} instead of {}. The former is c99, the latter is a GNU extension. src/pacman/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 7b0c884b..cae7130d 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -114,7 +114,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { char *targ = t->data; size_t len = strlen(targ); int exact_file = strchr(targ, '/') != NULL; - regex_t reg; + regex_t reg = {0}; if(exact_file) { while(len > 1 && targ[0] == '/') { -- 2.24.1

3 3

[pacman-dev] [PATCH 1/2] doc: clarify the format of a PKGBUILD source fragment
by Eli Schwartz 25 Dec '19

25 Dec '19

Currently, it could be misread to say that a fragment is literally 'commit', rather than 'commit=somehash'. Anecdotally this does not seem to be obvious to everyone, and rewording it certainly doesn't hurt. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/PKGBUILD.5.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index bc5aa011..27d56a67 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -496,9 +496,9 @@ The source URL is divided into four components: *fragment*:: (optional) Allows specifying a revision number or branch for makepkg to checkout - from the VCS. For example, to checkout a given revision, the source line would - have the format `source=(url#revision=123)`. The available fragments depends on - the VCS being used: + from the VCS. A fragment has the form `type=value`, for example to checkout a + given revision the source line would be `source=(url#revision=123)`. The + available types depends on the VCS being used: *bzr*;; revision (see `'bzr help revisionspec'` for details) -- 2.24.1

1 1

[pacman-dev] [PATCH] Ensure regex object is always initialized
by Dave Reisner 24 Dec '19

24 Dec '19

This avoids a crash in filetarget_free() when regex support isn't requested in files_search(). --- src/pacman/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 7b0c884b..29b593be 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -114,7 +114,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { char *targ = t->data; size_t len = strlen(targ); int exact_file = strchr(targ, '/') != NULL; - regex_t reg; + regex_t reg = {}; if(exact_file) { while(len > 1 && targ[0] == '/') { -- 2.24.1

1 0

[pacman-dev] [PATCH 1/2] Attempted to free lock on failure in alpm_db_update()
by Allan McRae 19 Dec '19

19 Dec '19

Also fixes a memory leak under an error condition. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 041b2266..5502d92d 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -215,7 +215,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1); } - dbext = db->handle->dbext; + dbext = handle->dbext; for(i = db->servers; i; i = i->next) { const char *server = i->data, *final_db_url = NULL; @@ -232,9 +232,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) len = strlen(server) + strlen(db->treename) + strlen(dbext) + 2; MALLOC(payload.fileurl, len, { - free(syncpath); - umask(oldmask); - RET_ERR(handle, ALPM_ERR_MEMORY, -1); + handle->pm_errno = ALPM_ERR_MEMORY; + ret = -1; + goto cleanup; } ); snprintf(payload.fileurl, len, "%s/%s%s", server, db->treename, dbext); @@ -250,8 +250,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* an existing sig file is no good at this point */ char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db)); if(!sigpath) { + /* pm_errno should be set */ ret = -1; - break; + goto cleanup; } unlink(sigpath); free(sigpath); @@ -277,9 +278,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) MALLOC(payload.fileurl, len, { - free(syncpath); - umask(oldmask); - RET_ERR(handle, ALPM_ERR_MEMORY, -1); + handle->pm_errno = ALPM_ERR_MEMORY; + ret = -1; + goto cleanup; } ); @@ -324,6 +325,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } } +cleanup: if(ret == -1) { /* pm_errno was set by the download code */ _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n", -- 2.24.1

3 7

[pacman-dev] Adding an expiry time to repo databases
by Allan McRae 13 Dec '19

13 Dec '19

Hi all, I have made a start at adding an expiry time to repo databases. See the three patches here: https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/ My question is, what should we do once a database is determined to be expired? Follow the example of a bad signature, and refuse to load it at all? Just refuse to install anything from it, but still enable searching etc? Just deciding "bad repo, don't use" will be much easier to implement... Comments? A

5 8

[pacman-dev] [PATCH 1/2] Add function to set and get expiry time for a repo database
by Allan McRae 13 Dec '19

13 Dec '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 14 ++++++++++++++ lib/libalpm/db.c | 14 ++++++++++++++ lib/libalpm/db.h | 2 ++ 3 files changed, 30 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 956284bd..0a4d7fe7 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1026,6 +1026,20 @@ int alpm_db_set_usage(alpm_db_t *db, int usage); */ int alpm_db_get_usage(alpm_db_t *db, int *usage); + +/** Sets the expiry time of a database. + * @param db pointer to the package database to set the status for + * @param expiry number of days old a database can be before expiry + * @return 0 on success, or -1 on error + */ +int alpm_db_set_expiry(alpm_db_t *db, int expiry); + +/** Gets the expiry time of a database. + * @param db pointer to the package database to get the status of + * @return expiry time + */ +int alpm_db_get_expiry(alpm_db_t *db); + /** @} */ /** @addtogroup alpm_api_packages Package Functions diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 43ca1fc8..a4fd4353 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -325,6 +325,20 @@ int SYMEXPORT alpm_db_get_usage(alpm_db_t *db, int *usage) return 0; } +/** Sets the expiry time for a repo */ +int SYMEXPORT alpm_db_set_expiry(alpm_db_t *db, int expiry) +{ + ASSERT(db != NULL, return -1); + db->expiry = expiry; + return 0; +} + +/** Gets the expiry time for a repo */ +int SYMEXPORT alpm_db_get_expiry(alpm_db_t *db) +{ + ASSERT(db != NULL, return -1); + return db->expiry; +} /** @} */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index e7ad98f5..76947247 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -79,6 +79,8 @@ struct __alpm_db_t { int siglevel; /* alpm_db_usage_t */ int usage; + + int expiry; }; -- 2.24.1

1 1

[pacman-dev] [PATCH 1/3] libmakepkg: use extraction commands instead of file to find archive type
by Ethan Sommer 11 Dec '19

11 Dec '19

Previously, to determine which command we should use to extract an archive, we would run file and match the output against our list of possible extraction commands Instead, run the archive through each extraction command's -t (--test) flag, if this succeeds then we know that the command is able to extract the file and is the one to use Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/libmakepkg/source/file.sh.in | 39 ++++++++-------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 7297a1c6..faace79b 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -96,35 +96,18 @@ extract_file() { fi # do not rely on extension for file type - local file_type=$(@FILECMD@ -bizL -- "$file") - local ext=${file##*.} local cmd='' - case "$file_type" in - *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar" ;; - *application/x-gzip*|*application/gzip*) - case "$ext" in - gz|z|Z) cmd="gzip" ;; - *) return;; - esac ;; - *application/x-bzip*) - case "$ext" in - bz2|bz) cmd="bzip2" ;; - *) return;; - esac ;; - *application/x-xz*) - case "$ext" in - xz) cmd="xz" ;; - *) return;; - esac ;; - *) - # See if bsdtar can recognize the file - if bsdtar -tf "$file" -q '*' &>/dev/null; then - cmd="bsdtar" - else - return 0 - fi ;; - esac + if bsdtar -tf "$file" -q '*'; then + cmd='bsdtar' + elif gzip -t "$file"; then + cmd='gzip' + elif bzip2 -t "$file"; then + cmd='bzip2' + elif xz -t "$file"; then + cmd='xz' + else + return 0 + fi &>/dev/null local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" -- 2.23.0

3 8