- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Check file types match before comparing properties
by Allan McRae 07 May '12

07 May '12

Bail early in file validation checks if the file type given in the mtree file does not match that in the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/check.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index e9ccdc8..229776e 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -43,6 +43,23 @@ static int check_file_exists(const char *pkgname, const char * filepath, return 0; } +static int check_file_type(const char *pkgname, const char *filepath, + struct stat *st, struct archive_entry *entry) +{ + mode_t archive_type = archive_entry_filetype(entry); + mode_t file_type = st->st_mode; + + if((archive_type == AE_IFREG && !S_ISREG(file_type)) || + (archive_type == AE_IFDIR && !S_ISDIR(file_type)) || + (archive_type == AE_IFLNK && !S_ISLNK(file_type))) { + pm_printf(ALPM_LOG_WARNING, "%s: %s (File type mismatch)\n", + pkgname, filepath); + return 1; + } + + return 0; +} + static int check_file_permissions(const char *pkgname, const char *filepath, struct stat *st, struct archive_entry *entry) { @@ -97,7 +114,6 @@ static int check_file_time(const char *pkgname, const char *filepath, static int check_file_link(const char *pkgname, const char *filepath, struct stat *st, struct archive_entry *entry) { - /* TODO - fail early if file is not a symlink */ size_t length = st->st_size + 1; char link[length]; @@ -257,6 +273,11 @@ int check_pkg_full(alpm_pkg_t *pkg) continue; } + if(check_file_type(pkgname, filepath, &st, entry) == 1) { + errors++; + continue; + } + file_errors += check_file_permissions(pkgname, filepath, &st, entry); if(type != AE_IFDIR) { -- 1.7.10.1

1 1

[pacman-dev] [PATCH] Check "install" and "changelog" files for changes
by Allan McRae 07 May '12

07 May '12

The "install" and "changelog" entries for a package in the local database are now checked for changes with -Qkk. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/check.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index be84dd6..e9ccdc8 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -221,8 +221,19 @@ int check_pkg_full(alpm_pkg_t *pkg) mode_t type; size_t file_errors = 0; - /* TODO: ignoring special files for the moment */ - if(*path == '.') { + if(strcmp(path, ".INSTALL") == 0) { + char filename[PATH_MAX]; + snprintf(filename, PATH_MAX, "%slocal/%s-%s/install", + alpm_option_get_dbpath(config->handle) + 1, + pkgname, alpm_pkg_get_version(pkg)); + archive_entry_set_pathname(entry, filename); + } else if(strcmp(path, ".CHANGELOG") == 0) { + char filename[PATH_MAX]; + snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog", + alpm_option_get_dbpath(config->handle) + 1, + pkgname, alpm_pkg_get_version(pkg)); + archive_entry_set_pathname(entry, filename); + } else if(*path == '.') { continue; } -- 1.7.10.1

1 0

[pacman-dev] [PATCH 0/8] Package file validation using mtree data
by Allan McRae 05 May '12

05 May '12

This patchset still has a bit of polish needed (there are a few TODOs scattered throughout). But it is now working quite well, so I think a bit of a review would be useful. The following fields are checked for each file: Directory: uid, gid, mode File: uid, gid, mode, size, (m)time Symbolic Link: uid, gid, mode, link, (m)time The main issus so far is that libarchive does not read any checksums from the mtree file. I will approach the libarchive devs to see how we can improve this situation. Allan McRae (8): makepkg: add mtree file into package Extract .MTREE file into local package database Add internal functions for reading mtree file from local db Add public functions for accessing mtree data Move check function into its own file Separate checking a files existence into a function Basic running of pacman -Qkk to check mtree files Perform full checking of files with -Qkk lib/libalpm/add.c | 5 + lib/libalpm/alpm.h | 12 ++ lib/libalpm/be_local.c | 57 ++++++++++ lib/libalpm/package.c | 44 ++++++++ lib/libalpm/package.h | 8 ++ scripts/makepkg.sh.in | 10 +- src/pacman/Makefile.am | 1 + src/pacman/check.c | 285 ++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/check.h | 30 +++++ src/pacman/pacman.c | 2 +- src/pacman/query.c | 62 +---------- 11 files changed, 457 insertions(+), 59 deletions(-) create mode 100644 src/pacman/check.c create mode 100644 src/pacman/check.h -- 1.7.10.1

1 8

[pacman-dev] [PATCH] doc: remove --recursive documentation for non-remove operations
by Dan McGee 04 May '12

04 May '12

This documentation was added in commit 857357f9 so was not caught in the removal of this option in commit 85712814. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman.8.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 1ec5e7c..6233599 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -232,13 +232,6 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up to date. -*\--recursive*:: - Recursively reinstall all dependencies of the targets. This forces upgrades - or reinstalls of all dependencies without requiring explicit version - requirements. This is most useful in combination with the '\--needed' flag, - which will induce a deep dependency upgrade without any unnecessary - reinstalls. - Query Options[[QO]] ------------------- -- 1.7.10.1

1 0

[pacman-dev] [PATCH] Ensure pre_upgrade scriptlet gets old package version
by Dan McGee 04 May '12

04 May '12

This was accidentally broken in the refactor done in commit 73139ccb. Fixes FS#29371. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6c2f0cb..c49d99b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; - _alpm_runscriptlet(handle, pkgfile, - scriptlet_name, newpkg->version, NULL, 1); + + _alpm_runscriptlet(handle, pkgfile, scriptlet_name, + newpkg->version, oldpkg ? oldpkg->version : NULL, 1); } /* we override any pre-set reason if we have alldeps or allexplicit set */ -- 1.7.10.1

1 0

[pacman-dev] [PATCH] Allow makepkg to work correctly with busybox find
by jhuntwork＠lightcubesolutions.com 04 May '12

04 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Allow makepkg to work correctly when used with find from busybox. The switches -empty, -samefile and -lname are not available. To replace -samefile, it is required to collect inode information and compare. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..307d1c1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,38 +1057,26 @@ tidy_install() { if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local file files inode link + while read -rd ' ' inode; do + read file + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [[ "${file}" -ef "${link}" ]] ; then rm -f "$link" "${link}.gz" ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - IFS=$'\n' read -rd '' -a hardlinks < \ - <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \ - 2>/dev/null || true) || true - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done fi + done + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + gzip -9 -f "$file" + else + rm -f "$file" + ln "${files[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" fi - done + done < <(find ${MAN_DIRS[@]} -type f \! -name "*.gz" \! -name "*.bz2" \ + -exec ls -i '{}' + 2>/dev/null) fi if check_option "strip" "y"; then @@ -1116,7 +1104,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -mindepth 1 -depth -type d -exec rmdir '{}' + 2>/dev/null fi if check_option "upx" "y"; then -- 1.7.2.2

1 0

[pacman-dev] [PATCH] Allow makepkg to use busybox find
by jhuntwork＠lightcubesolutions.com 03 May '12

03 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> This is an updated version to the previous patch which had a misplaced -o option and a misformatted line. Allow makepkg to work correctly when used with find from busybox. The switches -empty, -samefile and -lname are not available. It is easy to work around -empty with rmdir, and -lname with readlink. However, -samefile functionality requires tracking and storing inodes to ensure hard links are re-created correctly. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 53 ++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..acf9c99 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,37 +1057,32 @@ tidy_install() { if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local manpages inode files link + # the '|| true' part keeps the script from bailing on the EOF returned + # by read at the end of the find output + IFS=$'\n' read -rd '' -a files < \ + <(find ${MAN_DIRS[@]} \! -name "*.bz2" \! -name "*.gz" \ + -type f 2>/dev/null || true) || true + for file in ${files[@]} ; do + # Track inodes so hard links can be identified and removed + inode=`stat -c %i ${file}` + if [ -z ${manpages[$inode]} ] ; then + manpages[$inode]="$file" + gzip -9 "$file" + else + rm -f "$file" + ln "${manpages[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" + fi + # update any symlinks to this manpage + file="${file##*/}" + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [ "${file}" = "`readlink ${link}`" ] ; then rm -f "$link" "${link}.gz" ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - IFS=$'\n' read -rd '' -a hardlinks < \ - <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \ - 2>/dev/null || true) || true - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done fi - fi + done done fi @@ -1116,7 +1111,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -depth -mindepth 1 -type d -exec rmdir --ignore-fail-on-non-empty '{}' + fi if check_option "upx" "y"; then -- 1.7.2.2

4 8

[pacman-dev] Broken readline after pacman -Su
by Philippe LUC 03 May '12

03 May '12

Hello, I did an upgrade today, which completed correctly (according to the log), but the readline library seems wrongly installed. I am posting here as it might be a pacman issue, that might worth reporting. If you prefer me to open a proper bug report in flyspray, let me know. If the root cause has nothing to do with pacman, sorry ;-) Command: sudo pacman -Su k3b (because I also wanted to install k3b at the same time) (I did a pacman -Sy a few minutes ago) Status after the upgrade : - distrib broken, bash and sh complain that : sh: symbol lookup error: sh: undefined symbol: rl_filename_rewrite_hook This message appeared during the upgrade process - in /lib, I only have: /lib/libreadline.so.6 which is linked to /lib/libreadline.so.5 (libreadline.so.5 doesn't contain rl_filename_rewrite_hook, which explains the bash error) Before the upgrade, by looking at the content indexed by mlocate, it looks like I had in the filesystem before the upgrade : /lib/libreadline.so.5 /lib/libreadline.so.6 /lib/libreadline.so.6.2 My previous upgrade was made in February the 13th, and upgraded amongst other these packages: readline (6.2.001-3 -> 6.2.002-1) pacman (3.5.4-4 -> 4.0.1-4) This today upgrade have upgraded : readline (6.2.002-1 -> 6.2.002-2) pacman (4.0.1-4 -> 4.0.3-1) My install is a i686, and the package readline-6.2.002-1-i686.pkg.tar.xz I downloaded does contain libreadline.so, libreadline.so.6, libreadline.so.6.2 I can provide more logs and details if that can be helpful to find the root cause of the issue. Let me know if I am not writing to the correct place anyway. Thanks for your support, best regards, -- Philippe

3 3

[pacman-dev] [PATCH] Allow makepkg to use busybox find
by jhuntwork＠lightcubesolutions.com 03 May '12

03 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Allow makepkg to work correctly when used with find from busybox. The switches -empty, -samefile and -lname are not available. It is easy to work around -empty with rmdir, and -lname with readlink. However, -samefile functionality requires tracking and storing inodes to ensure hard links are re-created correctly. Signed-off-by: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> --- scripts/makepkg.sh.in | 53 ++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 29 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..9bcb41f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1057,37 +1057,32 @@ tidy_install() { if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" - local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | - while read manpage ; do - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do + local manpages inode files link + # the '|| true' part keeps the script from bailing on the EOF returned + # by read at the end of the find output + IFS=$'\n' read -rd '' -a files < \ + <(find ${MAN_DIRS[@]} \! -name "*.bz2" -type f \ + -o \! -name "*.gz" -type f 2>/dev/null || true) || true + for file in ${files[@]} ; do + # Track inodes so hard links can be identified and removed + inode=`stat -c %i ${file}` + if [ -z ${manpages[$inode]} ] ; then + manpages[$inode]="$file" + gzip -9 "$file" + else + rm -f "$file" + ln "${manpages[$inode]}.gz" "${file}.gz" + chmod 644 "${file}.gz" + fi + # update any symlinks to this manpage + file="${file##*/}" + find ${MAN_DIRS[@]} -type l 2>/dev/null | + while read link ; do + if [ "${file}" = "`readlink ${link}`" ] ; then rm -f "$link" "${link}.gz" ln -s -- "${file}.gz" "${link}.gz" - done - - # check file still exists (potentially already compressed due to hardlink) - if [[ -f ${manpage} ]]; then - # find hard links and remove them - # the '|| true' part keeps the script from bailing on the EOF returned - # by read at the end of the find output - IFS=$'\n' read -rd '' -a hardlinks < \ - <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \ - 2>/dev/null || true) || true - rm -f "${hardlinks[@]}" - # compress the original - gzip -9 "$manpage" - # recreate hard links removed earlier - for hl in "${hardlinks[@]}"; do - ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz - done fi - fi + done done fi @@ -1116,7 +1111,7 @@ tidy_install() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -empty -delete + find . -depth -mindepth 1 -type d -exec rmdir --ignore-fail-on-non-empty '{}' + fi if check_option "upx" "y"; then -- 1.7.2.2

1 0

[pacman-dev] [PATCH 1/3] diskspace: dedupe code for loading FS usage
by Dave Reisner 02 May '12

02 May '12

add mount_point_load_fsinfo() for platforms using getmntent(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is just code movement for the following patches. lib/libalpm/diskspace.c | 52 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index daee244..f3f9092 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -69,6 +69,23 @@ static void mount_point_list_free(alpm_list_t *mount_points) FREELIST(mount_points); } +static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint) +{ +#ifdef HAVE_GETMNTENT + /* grab the filesystem usage */ + if(statvfs(mountpoint->mount_dir, &(mountpoint->fsp)) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information for %s: %s\n"), + mountpoint->mount_dir, strerror(errno)); + return -1; + } + + mountpoint->read_only = mountpoint->fsp.f_flag & ST_RDONLY; +#endif + + return 0; +} + static alpm_list_t *mount_point_list(alpm_handle_t *handle) { alpm_list_t *mount_points = NULL, *ptr; @@ -86,24 +103,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((mnt = getmntent(fp))) { - struct statvfs fsp; - if(!mnt) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information\n")); - continue; - } - if(statvfs(mnt->mnt_dir, &fsp) != 0) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information for %s: %s\n"), - mnt->mnt_dir, strerror(errno)); - continue; - } - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); mp->mount_dir_len = strlen(mp->mount_dir); - memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); - mp->read_only = fsp.f_flag & ST_RDONLY; + if(mount_point_load_fsinfo(handle, mp) < 0) { + free(mp->mount_dir); + free(mp); + continue; + } mount_points = alpm_list_add(mount_points, mp); } @@ -122,19 +129,14 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((ret = getmntent(fp, &mnt)) == 0) { - struct statvfs fsp; - if(statvfs(mnt->mnt_mountp, &fsp) != 0) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not get filesystem information for %s: %s\n"), - mnt->mnt_mountp, strerror(errno)); - continue; - } - CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_mountp); mp->mount_dir_len = strlen(mp->mount_dir); - memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); - mp->read_only = fsp.f_flag & ST_RDONLY; + if(mount_point_load_fsinfo(handle, mp) < 0) { + free(mp->mount_dir); + free(mp); + continue; + } mount_points = alpm_list_add(mount_points, mp); } -- 1.7.10.1

1 2