summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-01-29 13:22:42 +1000
committerAllan McRae <allan@archlinux.org>2013-01-29 13:37:32 +1000
commit3aece8f0eedd703349bcd7bd6bf4b221d9f5775c (patch)
tree2afa7ee74edee5d0e5ee6062f2306c95fab086df
parente1e4bbb79ddd23e46b8d3a01168f4eb410308d5b (diff)
Restore libarchive 2.8.x compatibility
We still call some of these 'deprecated' methods elsewhere, so this shouldn't present a problem. When we decide 2.x support is to be dropped, we should update all of the code to not call deprecated methods. Allan: Adjusted with respect to previous patches adding libarchive compatibilty layer. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/be_local.c2
-rw-r--r--src/pacman/check.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 564e1097..49b1c742 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -239,7 +239,7 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg)
goto error;
}
- archive_read_support_filter_gzip(mtree);
+ _alpm_archive_read_support_filter_all(mtree);
archive_read_support_format_mtree(mtree);
if((r = _alpm_archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) {
diff --git a/src/pacman/check.c b/src/pacman/check.c
index 92ce05c9..d7fe2d66 100644
--- a/src/pacman/check.c
+++ b/src/pacman/check.c
@@ -90,7 +90,7 @@ static int check_file_permissions(const char *pkgname, const char *filepath,
/* mode */
fsmode = st->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
- if(fsmode != archive_entry_perm(entry)) {
+ if(fsmode != (~AE_IFMT & archive_entry_mode(entry))) {
errors++;
if(!config->quiet) {
pm_printf(ALPM_LOG_WARNING, _("%s: %s (Permissions mismatch)\n"),