- Pacman-dev - lists.archlinux.org

[pacman-dev] [Build-Requirement] In configure.ac 'File3.8' with Seccomp is required.
by nly＠disroot.org 08 Jan '20

08 Jan '20

Steps: # Checkout source git clone <pacman-git> cd pacman git checkout v5.2.1 # Build <setup the build env> autoreconf -vif && ./configure --> Fail configure fails to find the latest versoin, 3.8, of `file'. This version 3.8 of `file' is not even available in the official Arch packages. Is it possible to build with an earlier version of `file'? File version 3.8 was released about a month ago. thanks, Amar

3 12

[pacman-dev] [PATCH] Include trailing slash in _alpm_mkdtemp
by Allan McRae 08 Jan '20

08 Jan '20

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e4c8e404..50d80866 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -358,9 +358,9 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, } /* either extract or copy the scriptlet */ - len += strlen("/.INSTALL"); + len += strlen(".INSTALL"); MALLOC(scriptfn, len, free(tmpdir); RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(scriptfn, len, "%s/.INSTALL", tmpdir); + snprintf(scriptfn, len, "%s.INSTALL", tmpdir); if(is_archive) { if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) { retval = 1; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 514681d1..dacabdad 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -154,9 +154,10 @@ int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) ASSERT(tmpdir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, 0)); - len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX/") + 1; MALLOC(*tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, 0)); snprintf(*tmpdir, len, "%stmp/", handle->root); + if(access(*tmpdir, F_OK) != 0) { _alpm_makepath_mode(*tmpdir, 01777); } @@ -167,6 +168,9 @@ int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) return 0; } + (*tmpdir)[len - 2] = '/'; + (*tmpdir)[len - 1] = '\0'; + return len; } -- 2.24.1

2 4

[pacman-dev] [PATCH] Move creating a temporary directory into a utility function
by Allan McRae 08 Jan '20

08 Jan '20

--- This will be used for downloading sync directories into a temporary location so they can be validated before replacing exisiting sync dbs. lib/libalpm/trans.c | 11 +---------- lib/libalpm/util.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 14f7d5e3..e4c8e404 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -353,16 +353,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, strcpy(arg1, "-c"); /* create a directory in $root/tmp/ for copying/extracting the scriptlet */ - len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; - MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(tmpdir, len, "%stmp/", handle->root); - if(access(tmpdir, F_OK) != 0) { - _alpm_makepath_mode(tmpdir, 01777); - } - snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); - if(mkdtemp(tmpdir) == NULL) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); - free(tmpdir); + if((len = _alpm_mkdtemp(handle, &tmpdir)) == 0) { return 1; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d12a4403..0ec9f650 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -142,6 +142,34 @@ done: return ret; } + +/** Creates a temporary directory of form /$root/tmp/alpm_XXXXXX. + * @param handle the context handle + * @param tmpdir pointer to storage of created directory path + * @return path length on success, 0 on error + */ +int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) +{ + size_t len; + + ASSERT(tmpdir, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, 0)); + + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + MALLOC(*tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, 0)); + snprintf(*tmpdir, len, "%stmp/", handle->root); + if(access(*tmpdir, F_OK) != 0) { + _alpm_makepath_mode(*tmpdir, 01777); + } + snprintf(*tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); + if(mkdtemp(*tmpdir) == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); + free(tmpdir); + return 0; + } + + return len; +} + /** Copies a file. * @param src file path to copy from * @param dest file path to copy to diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 71dadc2c..12c7fbc7 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -111,6 +111,7 @@ struct archive_read_buffer { int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); +int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir); int _alpm_copyfile(const char *src, const char *dest); size_t _alpm_strip_newline(char *str, size_t len); -- 2.24.1

1 1

[pacman-dev] [PATCH] tests: Fix typo in test description
by Allan McRae 08 Jan '20

08 Jan '20

--- .../tests/sync-update-package-removing-required-provides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pacman/tests/sync-update-package-removing-required-provides.py b/test/pacman/tests/sync-update-package-removing-required-provides.py index 19bfd922..2254e112 100644 --- a/test/pacman/tests/sync-update-package-removing-required-provides.py +++ b/test/pacman/tests/sync-update-package-removing-required-provides.py @@ -1,4 +1,4 @@ -self.description = "Upgrade a package that loose a provides entry which moves to a dedicated package" +self.description = "Upgrade a package that loses a provides entry which moves to a dedicated package" lp1 = pmpkg("pkg1", "1-1") lp1.provides = ["feature=1"] -- 2.24.1

1 0

[pacman-dev] [PATCH v2] Attempt to free lock on failure in alpm_db_update()
by Allan McRae 07 Jan '20

07 Jan '20

Also fixes a memory leak under an error condition. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: Move "cleanup:" higher Clarify comment about pm_errno being set 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 07d2b4ae..f1caddd8 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; @@ -230,9 +230,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); @@ -248,8 +248,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 is set by _alpm_sigpath */ ret = -1; - break; + goto cleanup; } unlink(sigpath); free(sigpath); @@ -275,9 +276,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; } ); @@ -305,6 +306,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } } +cleanup: if(updated) { /* Cache needs to be rebuilt */ _alpm_db_free_pkgcache(db); -- 2.24.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-32-gacaed30e
by Allan McRae 07 Jan '20

07 Jan '20

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 acaed30e243ff139b5549fd51dc3cb5472415b0a (commit) via ee8b4e92836cc52dec873342464d8316800523cd (commit) via 435f5fc20484d3728d8877eea15c7a8653da6d10 (commit) via 9883015be2b2010ad541fd02b6856bfdb28fb35d (commit) via ffb69c700abd6eb3b86e79e09b135029ff9104b4 (commit) via 56e0763c6d1d248b986ac22836de5ede0a805cfb (commit) from b7f61aa55755d95d2e3a6dd7058971c68276c369 (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 acaed30e243ff139b5549fd51dc3cb5472415b0a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Dec 24 21:59:58 2019 -0500 doc: reformat intro to VCS sources to distinguish the grammar It's difficult to find it embedded inside a prose paragraph. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ee8b4e92836cc52dec873342464d8316800523cd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Dec 24 21:59:57 2019 -0500 doc: clarify the format of a PKGBUILD source fragment 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 435f5fc20484d3728d8877eea15c7a8653da6d10 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 5 16:04:21 2020 -0500 autotools: emit error message when autoconf-archive is missing Forbid the AX_COMPARE_VERSION macro from being found in the output configure script. If autoconf-archive is not installed when autoreconf is run, the following error message is emitted: configure.ac:231: error: possibly undefined macro: AX_COMPARE_VERSION If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. autoreconf: /usr/bin/autoconf failed with exit status: 1 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9883015be2b2010ad541fd02b6856bfdb28fb35d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 24 10:28:11 2019 -0500 Use c99 struct initialization to avoid memset calls This is guaranteed less error prone than calling memset and hoping the human gets the argument order correct. commit ffb69c700abd6eb3b86e79e09b135029ff9104b4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 24 07:40:53 2019 -0500 Ensure regex object is always initialized This avoids a crash in filetarget_free() when regex support isn't requested in files_search(). commit 56e0763c6d1d248b986ac22836de5ede0a805cfb Author: Ethan Sommer <e5ten.arch(a)gmail.com> Date: Tue Nov 26 16:29:56 2019 -0500 libmakepkg: use readelf instead of file for finding ELF file types Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + doc/PKGBUILD.5.asciidoc | 18 ++++++++++-------- lib/libalpm/be_local.c | 5 +---- lib/libalpm/be_package.c | 7 ++----- lib/libalpm/be_sync.c | 7 ++----- lib/libalpm/dload.c | 13 ++++++------- lib/libalpm/signing.c | 23 +++++++---------------- lib/libalpm/util.c | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 26 ++++++++++++-------------- src/pacman/conf.c | 3 +-- src/pacman/files.c | 2 +- 11 files changed, 44 insertions(+), 63 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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