- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v2] Option to enable running makepkg in
by Saul Tigh 16 Jan '20

16 Jan '20

Although running makepkg in root is frowned upon, there ae circumstances that one might need to do so. For example, during the bootstrap process of building my own toy gnu/linux distro, I need to run makepkg in root. This option is disabled by default. It can be enabled by setting 'ALLOWROOT' in makepkg to 1. --- scripts/makepkg.sh.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca3e7459..b2cd8ee4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -79,6 +79,7 @@ SIGNPKG='' SPLITPKG=0 SOURCEONLY=0 VERIFYSOURCE=0 +ALLOWROOT=0 if [[ -n $SOURCE_DATE_EPOCH ]]; then REPRODUCIBLE=1 @@ -1175,9 +1176,13 @@ fi if (( ! INFAKEROOT )); then if (( EUID == 0 )); then - error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ -catastrophic damage to your system.")" "makepkg" - exit $E_ROOT + if (( ALLOWROOT )); then + plain "Running as root is not recommended. Proceed with caution." + else + error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ + catastrophic damage to your system.")" "makepkg" + exit $E_ROOT + fi fi else if [[ -z $FAKEROOTKEY ]]; then @@ -1352,6 +1357,10 @@ if (( SOURCEONLY )); then check_source_integrity all cd_safe "$startdir" + # allow makepkg to run in root + if (( ALLOWROOT )); then + unset FAKEROOTKEY + fi enter_fakeroot if [[ $SIGNPKG = 'y' ]]; then -- 2.20.1

1 0

[pacman-dev] [PATCH] Remove unneeded ltmain patch
by Allan McRae 16 Jan '20

16 Jan '20

Many moons ago, libtool was bad - I mean worse than today! It gobbled all --as-needed and we ended up with an overlinked libalpm. This was annoying, particularly when dealing with soname bumps in libraries pacman/libalpm had no business linking to. Luckily we had a fix, stolen from GNOME I believe. And with that fix, we lived in harmony with libtool for many years. Until one day, unbeknownst to us, libtool was "fixed". We kept applying our patch, because it still applied, but it did worse than nothing. It gobbled up our other LDFLAGS, and our libalpm started missing out on RELRO and BIND_NOW. This made the Arch Security Team unhappy. We will make them happy again by stopping the patch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- autogen.sh | 6 ------ build-aux/ltmain-asneeded.patch | 33 --------------------------------- 2 files changed, 39 deletions(-) delete mode 100755 autogen.sh delete mode 100644 build-aux/ltmain-asneeded.patch diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 18fa641d..00000000 --- a/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -x - -autoreconf -i -patch -d build-aux -Np0 -i ltmain-asneeded.patch - -exit 0 diff --git a/build-aux/ltmain-asneeded.patch b/build-aux/ltmain-asneeded.patch deleted file mode 100644 index af5ae6b2..00000000 --- a/build-aux/ltmain-asneeded.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ltmain.sh.orig 2013-06-26 14:31:53.472627840 +1000 -+++ ltmain.sh 2013-06-26 14:30:56.137038936 +1000 -@@ -5800,6 +5800,14 @@ - arg=$func_stripname_result - ;; - -+ -Wl,*--as-needed*) -+ deplibs="$deplibs $wl--as-needed" -+ ;; -+ -+ -Wl,*--no-as-needed*) -+ deplibs="$deplibs $wl--no-as-needed" -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6160,6 +6168,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then -- 2.25.0

1 0

[pacman-dev] [PATCH] Increase meson test timeout
by Allan McRae 16 Jan '20

16 Jan '20

Running the testsuite using "PACTEST_VALGRIND=1 ninja test -C build", I ran into the following failure: 161/332 smoke001.py TIMEOUT 30.02 s I figure an i7 @ 3.10GHz should be enough to run our testsuite... so boost the meson test timeout to 120 seconds (which should be enough time for anyone...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- With this patch, I can run the test under valgrind. e.g. 161/332 smoke001.py OK 36.42 s test/pacman/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 4e87b4f3..9de4f5a1 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -352,5 +352,6 @@ foreach input : pacman_tests PYTHON, protocol : 'tap', args : args, + timeout: 120, depends : [pacman_bin]) endforeach -- 2.25.0

1 0

[pacman-dev] [PATCH] autotools: preserve LDFLAGS when building libalpm
by anthraxx＠archlinux.org 16 Jan '20

16 Jan '20

From: Levente Polyak <anthraxx(a)archlinux.org> Use AM_LDFLAGS for libalpm_la so defined LDFLAGS will not be ignored. Signed-off-by: anthraxx <anthraxx(a)archlinux.org> --- lib/libalpm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index e4f83223..06dc0e43 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -59,7 +59,7 @@ libalpm_la_SOURCES = \ util-common.h util-common.c \ version.c -libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) +libalpm_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ $(AM_CFLAGS) \ -- 2.25.0

2 2

[pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue
by Eli Schwartz 10 Jan '20

10 Jan '20

When file is called via fakeroot, it doesn't matter whether you use -z or not, it is still incompatible with seccomp. Fix by configuring it with FILECMD when used in the fakeroot 'tidy' run. Fixes FS#65100 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- For release/5.2.x only since the call site is gone in master. scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1bd810f0..876f00f0 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -111,7 +111,7 @@ tidy_strip() { local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do - case "$(file -bi "$binary")" in + case "$(@FILECMD@ -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) strip_flags="$STRIP_SHARED";; *application/x-archive*) # Libraries (.a) -- 2.24.1

1 0

[pacman-dev] [Usage] run pacman without root
by nly＠disroot.org 08 Jan '20

08 Jan '20

Is it possible to use pacman without root, and locally, say `~/pacman` instead of global `/usr'. I built and installed pacman from git sources. $ cd pacman && git checkout v5.2.1 $ autoreconf -vif $ ./configure --prefix=$HOME/pacman/usr/local --enable-static --with-libcurl --with-gpgme $ make $ make install Adding pacman to path, `.bashrc': source /home/nly/pacman/usr/local/etc/profile # (4.) $ pacman -Q nano warning: database file for 'core' does not exist (use '-Sy' to download) error: package 'nano' was not found $ pacman -Sy error: you cannot perform this operation unless you are root. I've linked to the etc/pacman.conf (3.) and etc/pacman.d/mirrorlist (2.). Thanks, Amar ---------------- 1. makepkg-conf: http://nly.info.tm/pacman/makepkg.conf 2. mirrorlist: http://nly.info.tm/pacman/mirrorlist 3. pacman-conf: http://nly.info.tm/pacman/pacman.conf 4. bash-profile: http://nly.info.tm/pacman/profile

1 0

[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

[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

[pacman-dev] [PATCH v2] pacman+libalpm: print version names for conflicting packages
by morganamilo 11 Dec '19

11 Dec '19

When ever pacman prints a conflict, it now prints pkgname-version, instead of just pkgname. alpm_conflict_t now carries pointers to alpm_pkg_t instead of just the names of each package. Fixes FS#12536 (point 2) --- v2: dupe each alpm_pkg_t diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 956284bd..b0aa0671 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -247,10 +247,8 @@ typedef struct _alpm_depmissing_t { /** Conflict */ typedef struct _alpm_conflict_t { - unsigned long package1_hash; - unsigned long package2_hash; - char *package1; - char *package2; + alpm_pkg_t *package1; + alpm_pkg_t *package2; alpm_depend_t *reason; } alpm_conflict_t; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 80827ed6..08ae86cb 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -49,11 +49,8 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, alpm_conflict_t *conflict; CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL); - - conflict->package1_hash = pkg1->name_hash; - conflict->package2_hash = pkg2->name_hash; - STRDUP(conflict->package1, pkg1->name, goto error); - STRDUP(conflict->package2, pkg2->name, goto error); + ASSERT(_alpm_pkg_dup(pkg1, &conflict->package1) == 0, goto error); + ASSERT(_alpm_pkg_dup(pkg2, &conflict->package2) == 0, goto error); conflict->reason = reason; return conflict; @@ -69,8 +66,8 @@ error: void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict) { ASSERT(conflict != NULL, return); - FREE(conflict->package2); - FREE(conflict->package1); + _alpm_pkg_free(conflict->package1); + _alpm_pkg_free(conflict->package2); FREE(conflict); } @@ -79,20 +76,7 @@ void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict) */ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict) { - alpm_conflict_t *newconflict; - CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL); - - newconflict->package1_hash = conflict->package1_hash; - newconflict->package2_hash = conflict->package2_hash; - STRDUP(newconflict->package1, conflict->package1, goto error); - STRDUP(newconflict->package2, conflict->package2, goto error); - newconflict->reason = conflict->reason; - - return newconflict; - -error: - alpm_conflict_free(newconflict); - return NULL; + return conflict_new(conflict->package1, conflict->package2, conflict->reason); } /** @@ -108,10 +92,10 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack) alpm_list_t *i; for(i = haystack; i; i = i->next) { alpm_conflict_t *conflict = i->data; - if(needle->package1_hash == conflict->package1_hash - && needle->package2_hash == conflict->package2_hash - && strcmp(needle->package1, conflict->package1) == 0 - && strcmp(needle->package2, conflict->package2) == 0) { + if(needle->package1->name_hash == conflict->package2->name_hash + && needle->package2->name_hash == conflict->package2->name_hash + && strcmp(needle->package1->name, conflict->package1->name) == 0 + && strcmp(needle->package2->name, conflict->package2->name) == 0) { return 1; } } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 97a351fe..d26a1323 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -510,21 +510,23 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(i = deps; i; i = i->next) { alpm_conflict_t *conflict = i->data; + const char *name1 = conflict->package1->name; + const char *name2 = conflict->package2->name; alpm_pkg_t *rsync, *sync, *sync1, *sync2; /* have we already removed one of the conflicting targets? */ - sync1 = alpm_pkg_find(trans->add, conflict->package1); - sync2 = alpm_pkg_find(trans->add, conflict->package2); + sync1 = alpm_pkg_find(trans->add, name1); + sync2 = alpm_pkg_find(trans->add, name2); if(!sync1 || !sync2) { continue; } _alpm_log(handle, ALPM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n", - conflict->package1, conflict->package2); + name1, name2); /* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */ - alpm_depend_t *dep1 = alpm_dep_from_string(conflict->package1); - alpm_depend_t *dep2 = alpm_dep_from_string(conflict->package2); + alpm_depend_t *dep1 = alpm_dep_from_string(name1); + alpm_depend_t *dep2 = alpm_dep_from_string(name2); if(_alpm_depcmp(sync1, dep2)) { rsync = sync2; sync = sync1; @@ -552,8 +554,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Prints warning */ _alpm_log(handle, ALPM_LOG_WARNING, - _("removing '%s' from target list because it conflicts with '%s'\n"), - rsync->name, sync->name); + _("removing '%s-%s' from target list because it conflicts with '%s-%s'\n"), + rsync->name, rsync->version, sync->name, sync->version); trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL); /* rsync is not a transaction target anymore */ trans->unresolvable = alpm_list_add(trans->unresolvable, rsync); @@ -574,16 +576,18 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) .conflict = i->data }; alpm_conflict_t *conflict = i->data; + const char *name1 = conflict->package1->name; + const char *name2 = conflict->package2->name; int found = 0; - /* if conflict->package2 (the local package) is not elected for removal, + /* if name2 (the local package) is not elected for removal, we ask the user */ - if(alpm_pkg_find(trans->remove, conflict->package2)) { + if(alpm_pkg_find(trans->remove, name2)) { found = 1; } for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; - if(alpm_pkg_find(spkg->removes, conflict->package2)) { + if(alpm_pkg_find(spkg->removes, name2)) { found = 1; } } @@ -592,14 +596,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } _alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", - conflict->package1, conflict->package2); + name1, name2); QUESTION(handle, &question); if(question.remove) { /* append to the removes list */ - alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1); - alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2); - _alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2); + alpm_pkg_t *sync = alpm_pkg_find(trans->add, name1); + alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, name2); + _alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", name2); sync->removes = alpm_list_add(sync->removes, local); } else { /* abort */ _alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n")); diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 08da4bb7..812b64e3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -393,18 +393,22 @@ void cb_question(alpm_question_t *question) { alpm_question_conflict_t *q = &question->conflict; /* print conflict only if it contains new information */ - if(strcmp(q->conflict->package1, q->conflict->reason->name) == 0 - || strcmp(q->conflict->package2, q->conflict->reason->name) == 0) { - q->remove = noyes(_("%s and %s are in conflict. Remove %s?"), - q->conflict->package1, - q->conflict->package2, - q->conflict->package2); + if(strcmp(alpm_pkg_get_name(q->conflict->package1), q->conflict->reason->name) == 0 + || strcmp(alpm_pkg_get_name(q->conflict->package2), q->conflict->reason->name) == 0) { + q->remove = noyes(_("%s-%s and %s-%s are in conflict. Remove %s?"), + alpm_pkg_get_name(q->conflict->package1), + alpm_pkg_get_version(q->conflict->package1), + alpm_pkg_get_name(q->conflict->package2), + alpm_pkg_get_version(q->conflict->package2), + alpm_pkg_get_name(q->conflict->package2)); } else { - q->remove = noyes(_("%s and %s are in conflict (%s). Remove %s?"), - q->conflict->package1, - q->conflict->package2, + q->remove = noyes(_("%s-%s and %s-%s are in conflict (%s). Remove %s?"), + alpm_pkg_get_name(q->conflict->package1), + alpm_pkg_get_version(q->conflict->package1), + alpm_pkg_get_name(q->conflict->package2), + alpm_pkg_get_version(q->conflict->package2), q->conflict->reason->name, - q->conflict->package2); + alpm_pkg_get_name(q->conflict->package2)); } } break; diff --git a/src/pacman/database.c b/src/pacman/database.c index 378edc8c..db8ed2de 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -157,7 +157,7 @@ static int check_db_local_package_conflicts(alpm_list_t *pkglist) for(i = data; i; i = i->next) { alpm_conflict_t *conflict = i->data; pm_printf(ALPM_LOG_ERROR, "'%s' conflicts with '%s'\n", - conflict->package1, conflict->package2); + alpm_pkg_get_name(conflict->package1), alpm_pkg_get_name(conflict->package2)); ret++; } alpm_list_free_inner(data, (alpm_list_fn_free)alpm_conflict_free); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4bdeff7b..73e0496e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -777,12 +777,19 @@ int sync_prepare_execute(void) alpm_conflict_t *conflict = i->data; /* only print reason if it contains new information */ if(conflict->reason->mod == ALPM_DEP_MOD_ANY) { - colon_printf(_("%s and %s are in conflict\n"), - conflict->package1, conflict->package2); + colon_printf(_("%s-%s and %s-%s are in conflict\n"), + alpm_pkg_get_name(conflict->package1), + alpm_pkg_get_version(conflict->package1), + alpm_pkg_get_name(conflict->package2), + alpm_pkg_get_version(conflict->package2)); } else { char *reason = alpm_dep_compute_string(conflict->reason); - colon_printf(_("%s and %s are in conflict (%s)\n"), - conflict->package1, conflict->package2, reason); + colon_printf(_("%s-%s and %s-%s are in conflict (%s)\n"), + alpm_pkg_get_name(conflict->package1), + alpm_pkg_get_version(conflict->package1), + alpm_pkg_get_name(conflict->package2), + alpm_pkg_get_version(conflict->package2), + reason); free(reason); } alpm_conflict_free(conflict); -- 2.24.0

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-26-gb7f61aa5
by Allan McRae 11 Dec '19

11 Dec '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 b7f61aa55755d95d2e3a6dd7058971c68276c369 (commit) from 0428f6213bcb5586d4ec9feb18af9a883c463793 (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 b7f61aa55755d95d2e3a6dd7058971c68276c369 Author: morganamilo <morganamilo(a)archlinux.org> Date: Wed Nov 27 17:45:20 2019 +0000 pacman: print error when -Fx is given invalid regex When processing the targets for -Fx, compile all the regex ahead of time, printing an error for each that failed to compile. Then, if they all compiled successfully, continue with printing files. Signed-off-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/files.c | 57 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] util: Add _alpm_access_flags
by Ryan Gonzalez 02 Dec '19

02 Dec '19

This changes _alpm_access* to use faccessat, which allows behavior flags to be passed. Signed-off-by: Ryan Gonzalez <rymg19(a)gmail.com> --- lib/libalpm/util.c | 18 ++++++++++++------ lib/libalpm/util.h | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index a4d62c7c..8d653b16 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1333,16 +1333,22 @@ alpm_time_t _alpm_parsedate(const char *line) return (alpm_time_t)result; } -/** Wrapper around access() which takes a dir and file argument +int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode) { + return _alpm_access_flags(handle, dir, file, amode, 0); +} + +/** Wrapper around faccessat() which takes a dir and file argument * separately and generates an appropriate error message. * If dir is NULL file will be treated as the whole path. * @param handle an alpm handle * @param dir directory path ending with and slash * @param file filename - * @param amode access mode as described in access() - * @return int value returned by access() + * @param amode access mode as described in faccessat() + * @param flags flags to pass as described in faccessat() + * @return int value returned by faccessat() */ -int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode) +int _alpm_access_flags(alpm_handle_t *handle, const char *dir, const char *file, int amode, + int flags) { size_t len = 0; int ret = 0; @@ -1354,11 +1360,11 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a CALLOC(check_path, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(check_path, len, "%s%s", dir, file); - ret = access(check_path, amode); + ret = faccessat(AT_FDCWD, check_path, amode, flags); free(check_path); } else { dir = ""; - ret = access(file, amode); + ret = faccessat(AT_FDCWD, file, amode, flags); } if(ret != 0) { diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 71dadc2c..1af79571 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -143,6 +143,8 @@ alpm_time_t _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode); +int _alpm_access_flags(alpm_handle_t *handle, const char *dir, const char *file, int amode, + int flags); int _alpm_fnmatch_patterns(alpm_list_t *patterns, const char *string); int _alpm_fnmatch(const void *pattern, const void *string); void *_alpm_realloc(void **data, size_t *current, const size_t required); -- 2.23.0

2 2

[pacman-dev] [PATCH v2] pacman: print error when -Fx is given invalid regex
by morganamilo 02 Dec '19

02 Dec '19

When processing the targets for -Fx, compile all the regex ahead of time, printing an error for each that failed to compile. Then, if they all compiled successfully, continue with printing files. Signed-off-by: morganamilo <morganamilo(a)archlinux.org> --- v2: Add comment about why we don't free targ Fix whitespace error I have vim set to display trialing whitespace so normally I catch it. Not sure why I didn't this time. Also I agree that running all the regex against each target before moving on to the next is a good improvement. This patch is already kinda long though, so I'll do it another time. diff --git a/src/pacman/files.c b/src/pacman/files.c index 3b6dc23b..6fcc6e9b 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -94,17 +94,27 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, in } } +struct filetarget { + char *targ; + int exact_file; + regex_t reg; +}; + +static void filetarget_free(struct filetarget *ftarg) { + regfree(&ftarg->reg); + /* we don't own ftarg->targ so don't free it */ + free(ftarg); +} + static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; - alpm_list_t *t; + alpm_list_t *t, *filetargs = NULL; for(t = targets; t; t = alpm_list_next(t)) { char *targ = t->data; - alpm_list_t *s; - int found = 0; - regex_t reg; size_t len = strlen(targ); int exact_file = strchr(targ, '/') != NULL; + regex_t reg; if(exact_file) { while(len > 1 && targ[0] == '/') { @@ -115,11 +125,33 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - /* TODO: error message */ - goto notfound; + pm_printf(ALPM_LOG_ERROR, + _("invalid regular expression '%s'\n"), targ); + ret = 1; + continue; } } + struct filetarget *ftarg = malloc(sizeof(struct filetarget)); + ftarg->targ = targ; + ftarg->exact_file = exact_file; + ftarg->reg = reg; + + filetargs = alpm_list_add(filetargs, ftarg); + } + + if(ret != 0) { + goto cleanup; + } + + for(t = filetargs; t; t = alpm_list_next(t)) { + struct filetarget *ftarg = t->data; + char *targ = ftarg->targ; + regex_t *reg = &ftarg->reg; + int exact_file = ftarg->exact_file; + alpm_list_t *s; + int found = 0; + for(s = syncs; s; s = alpm_list_next(s)) { alpm_list_t *p; alpm_db_t *repo = s->data; @@ -135,7 +167,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if (regex) { for(size_t f = 0; f < files->count; f++) { char *c = files->files[f].name; - if(regexec(&reg, c, 0, 0, 0) == 0) { + if(regexec(reg, c, 0, 0, 0) == 0) { match = alpm_list_add(match, files->files[f].name); found = 1; } @@ -151,7 +183,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { char *c = strrchr(files->files[f].name, '/'); if(c && *(c + 1)) { if(regex) { - m = regexec(&reg, (c + 1), 0, 0, 0); + m = regexec(reg, (c + 1), 0, 0, 0); } else { m = strcmp(c + 1, targ); } @@ -170,16 +202,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { } } - if(regex) { - regfree(&reg); - } - -notfound: if(!found) { ret = 1; } } +cleanup: + alpm_list_free_inner(filetargs, (alpm_list_fn_free) filetarget_free); + alpm_list_free(filetargs); + return ret; } -- 2.24.0

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-25-g0428f621
by Allan McRae 27 Nov '19

27 Nov '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 0428f6213bcb5586d4ec9feb18af9a883c463793 (commit) via 1e23b4585146b5c2bced10293c0f3486e53d51ed (commit) via 3073752bcd9718b243661dd727e8f8bc18035938 (commit) via 49a8e90bc78c17600eb4903ba00be26341df9161 (commit) via 349c22d043290ccd0cce9f30981f5415e295442a (commit) via 55233b69c74a087ff405d3f768e5303dacaf8129 (commit) via 8846574eda51cb48b3c3a462abb8bb9b61b7e10b (commit) via eaa2770c80f8f3b168b99021e4258d696523d38a (commit) via 6fb233d0eed9de2bf2f511001bb27a9c934ae8f9 (commit) via e6a6d3079315ce722fec39604fddbab1c7ac79b3 (commit) from b9faf652735c603d1bdf849a570185eb721f11c1 (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 0428f6213bcb5586d4ec9feb18af9a883c463793 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Nov 15 09:32:12 2019 -0500 makepkg: add the $startdir to package .BUILDINFO This value is needed for reproducible builds. The reason is because $BUILDDIR changes its behavior depending on whether it is the same as $startdir, and the result is that we cannot know whether $srcdir (the path that is potentially embedded into the final package) is actually "$BUILDDIR/src" or "$BUILDDIR/$pkgbase/src". Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e23b4585146b5c2bced10293c0f3486e53d51ed Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 26 11:37:32 2019 +1000 Fix documentation of alpm_mtree_next and remove libarchive exposure The documentation of the return types of alpm_mtree_next was incorrect. This extended into the relevant function in be_local.c. Also, return explicit integer values, rather than the ARCHIVE_xxx values, to avoid unnecessarily exposing frontends to libarchive internals (even though it makes no functional difference). Original-work-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3073752bcd9718b243661dd727e8f8bc18035938 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Nov 25 19:26:44 2019 -0500 pactest: add environment option to run tests with valgrind In autotools, if we wanted to run tests with valgrind, we used some Make magic which passed arguments to pactest.py, but that doesn't work in meson, because all arguments are encoded at configure time. Instead, let's short-circuit the build runner logic entirely, and teach pactest to default to running valgrind, when it detects an environment variable set independent of the build system. To run the tests with valgrind, we can now use: PACTEST_VALGRIND=1 meson test -C builddir/ or PACTEST_VALGRIND=1 make check It is also possible, but confusing/inconsistent, to use make check PY_LOG_FLAGS=--valgrind We *could* add a meson option -Dvalgrind=true, but that is annoying to reconfigure between test runs, and overall the consensus is it seems simpler to opt in each time we want to run valgrind, as was already the case. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49a8e90bc78c17600eb4903ba00be26341df9161 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 12 01:34:30 2019 -0500 meson: make non-symlink scripts install for real, and use a better wrapper We now generate the scripts using their real name, install them using meson's builtin facility instead of an install_script, and generate the wrapper scripts in the root of the build directory, instead of a subdirectory. This gets us closer to resolving FS#64394. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 349c22d043290ccd0cce9f30981f5415e295442a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Nov 25 19:07:56 2019 -0500 makepkg: fix regression that broke extraction of file:// sources In commit 9c817b654996249b8022e189ee7e2692f4668431 we made these sources extendable, and heuristically determined the correct extraction functions to use. But our fallback for protos that didn't have an exact extract_* function didn't take into account that 'extract_file' matches an actual proto... so we passed the netfile in while the function expected a file. Solution: the function should expect a netfile too, thereby allowing us to delay an attempted resolution of netfile -> file, to the one case where it is actually used. This makes us slightly more efficient in the non-file case, makes our functions a bit more consistent, and makes file:// extraction work again. Fixes FS#64648 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 55233b69c74a087ff405d3f768e5303dacaf8129 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 22 09:35:31 2019 +1000 Improved documentation for alpm_db_search() parameters Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8846574eda51cb48b3c3a462abb8bb9b61b7e10b Author: Allan McRae <allan(a)archlinux.org> Date: Thu Nov 21 22:38:59 2019 +1000 Fix leak in _alpm_db_search on error condition commit eaa2770c80f8f3b168b99021e4258d696523d38a Author: Daniel T. Borelli <danieltborelli(a)gmail.com> Date: Sat Nov 16 15:14:30 2019 +1000 Dereference double pointer before assigning NULL Daniel T. Borelli <danieltborelli(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6fb233d0eed9de2bf2f511001bb27a9c934ae8f9 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Nov 16 00:14:34 2019 +1000 Add Eli to current maintainers Also retire Dan into past major contributors. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e6a6d3079315ce722fec39604fddbab1c7ac79b3 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 15 23:29:20 2019 +1000 Handle .part files that are the size of the correct package In rare cases, likely due to a well timed Ctrl+C, but possibly due to a broken mirror, a ".part" file may have size at least that of the correct package size. When encountering this issue, currently pacman fails in different ways depending on where the package falls in the list to download. If last, "wrong or NULL argument passed" error is reported, or a "invalid or corrupt package" issue if not. Capture these .part files, and remove the extension. This lets pacman either use the package if valid, or offer to remove it if it fails checksum or signature verification. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - build-aux/meson-install-script.sh | 6 ------ doc/BUILDINFO.5.asciidoc | 3 +++ doc/footer.asciidoc | 3 ++- lib/libalpm/alpm.h | 5 +++-- lib/libalpm/be_local.c | 18 +++++++++++++++-- lib/libalpm/db.c | 5 ++++- lib/libalpm/dload.c | 6 ++++++ lib/libalpm/signing.c | 4 ++-- lib/libalpm/sync.c | 14 +++++++++++-- meson.build | 16 ++++++++++++++- scripts/libmakepkg/source.sh.in | 3 +-- scripts/libmakepkg/source/file.sh.in | 3 ++- scripts/makepkg.sh.in | 3 ++- scripts/meson.build | 38 ++++++++++++++++-------------------- src/pacman/check.c | 2 +- test/pacman/pactest.py | 2 +- 17 files changed, 87 insertions(+), 45 deletions(-) delete mode 100644 build-aux/meson-install-script.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Patches from bug tracker
by Allan McRae 26 Nov '19

26 Nov '19

2 1