- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 4/7] add alpm_logaction to API updates
by Andrew Gregory 13 Feb '13

13 Feb '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index b4c9978..35074d8 100644 --- a/README +++ b/README @@ -464,6 +464,7 @@ API CHANGES BETWEEN 4.0 AND 4.1 - alpm_depend_t - additional desc member - alpm_filelist_t - additional resolved_path member - alpm_pgpkey_t - added members length, revoked, pubkey_algo +- alpm_logaction - added caller identifier argument - function renaming: - alpm_option_get_localdb -> alpm_get_localdb - alpm_option_get_syncdbs -> alpm_get_syncdbs -- 1.8.1.3

1 0

[pacman-dev] [PATCH 3/7] fix alpm_validation_t comment
by Andrew Gregory 13 Feb '13

13 Feb '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 14443bb..5037859 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -68,7 +68,7 @@ typedef enum _alpm_pkgfrom_t { ALPM_PKG_FROM_SYNCDB } alpm_pkgfrom_t; -/** Location a package object was loaded from. */ +/** Method used to validate a package. */ typedef enum _alpm_pkgvalidation_t { ALPM_PKG_VALIDATION_UNKNOWN = 0, ALPM_PKG_VALIDATION_NONE = (1 << 0), -- 1.8.1.3

1 0

[pacman-dev] [PATCH 2/7] fix style violations
by Andrew Gregory 13 Feb '13

13 Feb '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_package.c | 5 +++-- lib/libalpm/signing.c | 3 ++- lib/libalpm/sync.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 5361893..3b43ed8 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -542,18 +542,19 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful alpm_siglevel_t level, alpm_pkg_t **pkg) { alpm_pkgvalidation_t validation = 0; + char *sigpath; CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); - char *sigpath = _alpm_sigpath(handle, filename); + sigpath = _alpm_sigpath(handle, filename); if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) { if(level & ALPM_SIG_PACKAGE) { alpm_list_t *keys = NULL; int fail = 0; unsigned char *sig = NULL; - int len = read_sigfile(sigpath, &sig); + if(len == -1) { _alpm_log(handle, ALPM_LOG_ERROR, _("failed to read signature file: %s\n"), sigpath); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 41d2e36..c653e45 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -382,7 +382,8 @@ gpg_error: * @param fpr the fingerprint key ID to import * @return 0 on success, -1 on error */ -int _alpm_key_import(alpm_handle_t *handle, const char *fpr) { +int _alpm_key_import(alpm_handle_t *handle, const char *fpr) +{ int answer = 0, ret = -1; alpm_pgpkey_t fetch_key; memset(&fetch_key, 0, sizeof(fetch_key)); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index be55500..f7b956c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -539,10 +539,11 @@ 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; + int doremove = 0; + int found = 0; /* if conflict->package2 (the local package) is not elected for removal, we ask the user */ - int found = 0; for(j = trans->add; j && !found; j = j->next) { alpm_pkg_t *spkg = j->data; if(alpm_pkg_find(spkg->removes, conflict->package2)) { @@ -556,13 +557,12 @@ 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); - alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1); - alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2); - int doremove = 0; QUESTION(handle, ALPM_QUESTION_CONFLICT_PKG, conflict->package1, conflict->package2, conflict->reason->name, &doremove); if(doremove) { /* 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); sync->removes = alpm_list_add(sync->removes, local); } else { /* abort */ -- 1.8.1.3

1 0

[pacman-dev] [PATCH 1/2] makepkg.conf.5: fix bulletted list item formatting
by Dave Reisner 13 Feb '13

13 Feb '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- doc/makepkg.conf.5.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 34748de..f00ad58 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -240,8 +240,10 @@ Options This value is used when querying a package to see who was the builder. It is recommended you change this to your name and email address. -**COMPRESSGZ=**"(gzip -c -f -n)", **COMPRESSBZ2=**"(bzip2 -c -f)", -**COMPRESSXZ=**"(xz -c -z -)", **COMPRESSLRZ=**"(lrzip -q)", +**COMPRESSGZ=**"(gzip -c -f -n)":: +**COMPRESSBZ2=**"(bzip2 -c -f)":: +**COMPRESSXZ=**"(xz -c -z -)":: +**COMPRESSLRZ=**"(lrzip -q)":: **COMPRESSZ=**"(compress -c -f)":: Sets the command and options used when compressing compiled or source packages in the named format. -- 1.8.1.3

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-570-g8fe8233
by allan＠archlinux.org 13 Feb '13

13 Feb '13

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 8fe8233dfa9c7827371168158784311cffb97556 (commit) via 87ffc648b7bce35dcc55dd43dce832669f83e894 (commit) via 1d0a69c655ccdeb1b87e0d2ebbe401acd7925351 (commit) via 3fa2830829de2e3aa4bb916f164ae2fd75542ef3 (commit) via 05b0d7e799416b48bb8b40ea199896e2b988698c (commit) via 42b492b2fd04ed33cfe95a0a3883d78e82ddec90 (commit) via bafee395a661ae69e2987cf1d84d864013bbbf80 (commit) via 572b1a5de7a2e44bc269733870fbf0bfc5e6b5e7 (commit) from 390b08f18b4ef550230f9f4749fb52254ccba6e5 (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 8fe8233dfa9c7827371168158784311cffb97556 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 11 14:19:27 2013 +1000 Fix registering database with non-gpgme builds We record whether the default SigLevel is set in order to add upon it for the *FileSigLevel entries. When using the only valid value of "SigLevel = Never" with non-gpgme builds, we need to ignore the ALPM_SIG_PACKAGE_SET flag when determining if we have a valid value for the database SigLevel. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87ffc648b7bce35dcc55dd43dce832669f83e894 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 11 13:39:57 2013 +1000 Fix --without-gpgme build Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1d0a69c655ccdeb1b87e0d2ebbe401acd7925351 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 11 13:28:04 2013 +1000 Fix gpgme detection The gpgme detection had a couple of issues which are fixed: 1) In some cases it would not error out when gpgme was missing and --with-gpgme was passed. 2) In some cases, the CFLAGS/LDFLAGS etc would not be properly restored. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3fa2830829de2e3aa4bb916f164ae2fd75542ef3 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 10 16:47:39 2013 +1000 Add format attributes to all required functions Fixes all clang warnings with -Wformat-literal. Also, fix genuine formating issue discovered once adding these attributes and add a cast to prevent a gcc warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05b0d7e799416b48bb8b40ea199896e2b988698c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 10 11:55:04 2013 +1000 Fix --enable-warningflags gcc gives an error on an unknown warning flag, but clang just gives a warning. Upgrade the warning in clang to an error by activating -Werror=unknown-warning-option if available. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 42b492b2fd04ed33cfe95a0a3883d78e82ddec90 Author: William Giokas <1007380(a)gmail.com> Date: Sat Feb 9 12:57:39 2013 -0600 makepkg: fix -r and --needed conflict In makepkg, passing -sr --needed causes there to be a conflict when pacman goes to remove the dependencies, as the --needed flag is not an option for pacman -R. This patch makes --needed not get added to the PACMAN_OPTS array, but it acts like ASDEPS, and is only added to an install function. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bafee395a661ae69e2987cf1d84d864013bbbf80 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 10 11:08:36 2013 +1000 Fix compilation error on clang This also lead me to notice that in _alpm_gpgme_checksig many things were not being cleaned up. Fix this by having CHECK_ERR goto gpg_error and make the required adjustments. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 572b1a5de7a2e44bc269733870fbf0bfc5e6b5e7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 10 01:04:21 2013 +1000 makepkg: add lrzip compression support Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 +++++---- doc/makepkg.conf.5.txt | 8 +++++--- lib/libalpm/alpm.h | 3 ++- lib/libalpm/be_sync.c | 2 +- lib/libalpm/log.c | 4 ++-- lib/libalpm/signing.c | 16 ++++++++-------- lib/libalpm/sync.c | 2 ++ lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.h | 5 ++++- m4/acinclude.m4 | 4 ++++ scripts/makepkg.sh.in | 16 ++++++++++------ src/pacman/callback.h | 1 + src/pacman/util.c | 5 +++-- src/pacman/util.h | 6 +++--- src/util/cleanupdelta.c | 1 + src/util/testdb.c | 1 + src/util/testpkg.c | 1 + 17 files changed, 55 insertions(+), 33 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: never attempt to remove a mountpoint
by Allan McRae 13 Feb '13

13 Feb '13

From: Dave Reisner <dreisner(a)archlinux.org> Arch Linux typically runs into this with /sys when upgrading the filesystem package in build chroots, but LXC users might also run into this, since their /sys is shared from the host and must, for security reasons, be mounted RO. I've neglected to add any tests for this because they would require root in order to run. Current tests all pass with this patch and I've confirmed the desired behavior in a VM. Incidentally, the first hunk of this patch (skipping can_remove_file checks for directories) resolves the case of API mountpoints being removed since they eventually fall into unlink_file and fail with "contains files". However, this patch should still be the Right Thing To Do™, as we can't possibly remove a directory that is also a mountpoint. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> [Allan] Do not skip checking if directories can be removed. Instead test if directories are mountpoints in can_remove_file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is an updated version of Dave's original patch. Instead of skipping all directory checks which could result in us trying to remove empty directories on read-only file systems, test all directories to see if they are a mountpoint during can_remove_file. This is hugely inefficient... it results in two stat calls per directory, but it fixes the current issue. A better fix would require completely rewriting the pre-removal checks to be done globally and not on a per package basis. lib/libalpm/remove.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 50fc93c..64888c5 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -267,6 +267,37 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) return 0; } +static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, + const struct stat *stbuf) +{ + char parent_dir[PATH_MAX]; + struct stat parent_stbuf; + dev_t dir_st_dev; + + if(stbuf == NULL) { + struct stat dir_stbuf; + if(stat(directory, &dir_stbuf) < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "failed to stat directory %s: %s", + directory, strerror(errno)); + return 0; + } + dir_st_dev = dir_stbuf.st_dev; + } else { + dir_st_dev = stbuf->st_dev; + } + + snprintf(parent_dir, PATH_MAX, "%s..", directory); + if(stat(parent_dir, &parent_stbuf) < 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "failed to stat parent of %s: %s: %s", + directory, parent_dir, strerror(errno)); + return 0; + } + + return dir_st_dev != parent_stbuf.st_dev; +} + /** * @brief Check if alpm can delete a file. * @@ -286,6 +317,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, return 1; } + if(file->name[strlen(file->name) - 1] == '/' && + dir_is_mountpoint(handle, file->name, NULL)) { + /* we do not remove mountpoints */ + return 1; + } + snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ @@ -427,6 +464,9 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (in new package)\n", file); + } else if(dir_is_mountpoint(handle, file, &buf)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "keeping directory %s (mountpoint)\n", file); } else { /* one last check- does any other package own this file? */ alpm_list_t *local, *local_pkgs; -- 1.8.1.3

2 1

[pacman-dev] [PATCH] Fix registering database with non-gpgme builds
by Allan McRae 11 Feb '13

11 Feb '13

We record whether the default SigLevel is set in order to add upon it for the *FileSigLevel entries. When using the only valid value of "SigLevel = Never" with non-gpgme builds, we need to ignore the ALPM_SIG_PACKAGE_SET flag when determining if we have a valid value for the database SigLevel. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 92be949..1cbe055 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -651,7 +651,7 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename); #ifndef HAVE_LIBGPGME - if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + if((level &= ~ALPM_SIG_PACKAGE_SET) != 0 && level != ALPM_SIG_USE_DEFAULT) { RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); } #endif -- 1.8.1.3

1 0

[pacman-dev] [PATCH] Fix --without-gpgme build
by Allan McRae 11 Feb '13

11 Feb '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This just fixes the build... something is very wrong there: Total = 278 Pass = 161 ( 57.91%) Expected Fail = 8 ( 2.88%) Unexpected Pass = 3 ( 1.08%) Fail = 106 ( 38.13%) lib/libalpm/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index c76b502..be55500 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -969,6 +969,7 @@ finish: return errors; } +#ifdef HAVE_LIBGPGME static int check_keyring(alpm_handle_t *handle) { size_t current = 0, numtargs; @@ -1038,6 +1039,7 @@ static int check_keyring(alpm_handle_t *handle) return 0; } +#endif /* HAVE_LIBGPGME */ static int check_validity(alpm_handle_t *handle, size_t total, size_t total_bytes) -- 1.8.1.3

1 0

[pacman-dev] [PATCH] Fix gpgme detection
by Allan McRae 11 Feb '13

11 Feb '13

The gpgme detection had a couple of issues which are fixed: 1) In some cases it would not error out when gpgme was missing and --with-gpgme was passed. 2) In some cases, the CFLAGS/LDFLAGS etc would not be properly restored. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a7364ba..1e1c37c 100644 --- a/configure.ac +++ b/configure.ac @@ -246,13 +246,14 @@ AS_IF([test "x$with_gpgme" != "xno"], unset GPGME_CFLAGS] AS_IF([test "x$with_gpgme" = "xyes"], [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) - )], - [with_gpgme=no])] - [LIBS="$LIBS_save" + ) + + LIBS="$LIBS_save" CPPFLAGS="$CPPFLAGS_save" CFLAGS="$CFLAGS_save" unset CPPFLAGS_save - unset CFLAGS_save]) + unset CFLAGS_save],)]) + AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes], [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])]) AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"]) -- 1.8.1.3

1 0

[pacman-dev] [PATCH 1/2] Fix --enable-warningflags
by Allan McRae 10 Feb '13

10 Feb '13

gcc gives an error on an unknown warning flag, but clang just gives a warning. Upgrade the warning in clang to an error by activating -Werror=unknown-warning-option if available. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Tested with clang and gcc. Both give the right result. m4/acinclude.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e601f0e..294507e 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -114,6 +114,10 @@ AC_DEFUN([CFLAGS_ADD], [AS_VAR_PUSHDEF([my_cflags], [cflags_cv_warn_$1])dnl AC_CACHE_CHECK([whether compiler handles $1], [my_cflags], [ save_CFLAGS="$CFLAGS" + CFLAGS="${CFLAGS} -Werror=unknown-warning-option" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [], + [CFLAGS="$save_CFLAGS"]) CFLAGS="${CFLAGS} $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AS_VAR_SET([my_cflags], [yes])], -- 1.8.1.3

1 0