bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore libarchive 2.8.x compatibility

Browse source 
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>
This commit is contained in:
Dan McGee 2013-01-29 13:22:42 +10:00 • committed by Allan McRae
parent e1e4bbb79d
commit 3aece8f0ee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/be_local.c
View file

@ -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))) {

2
src/pacman/check.c
View file

@ -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"),