- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Allow leading "local/" in query operations
by Allan McRae 19 May '12

19 May '12

I find that when copying the output of "pacman -Qs foo" into a "pacman -Qi" operation to get more information on the packages, I consistently copy the "local/" prefix. It is a minor usability improvement to strip this if present. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index a1cc1cf..07509fa 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -554,6 +554,11 @@ int pacman_query(alpm_list_t *targets) for(i = targets; i; i = alpm_list_next(i)) { const char *strname = i->data; + /* strip leading "local/" */ + if(strncmp(strname, "local/", 6) == 0) { + strname+=6; + } + if(config->op_q_isfile) { alpm_pkg_load(config->handle, strname, 1, 0, &pkg); } else { -- 1.7.10.2

1 0

[pacman-dev] [PATCH] pacman-key: test for content in keyring files
by Dave Reisner 13 May '12

13 May '12

Test for file content (-s) rather than just existance (-f). This fixes a bug that manifests itself in the case of an empty -revoked file. A zero element 'keys' array would be passed to gpg, forcing it to list and, subsequently, revoke all known keys. Bug introduced in d1240f67eab6. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I figured I should call this out on the list since a few people ran into it on IRC. Currently, running 'pacman-key --populate archlinux' with the archlinux-keyring package exhibits this bug. scripts/pacman-key.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index fb790f6..70117bb 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -287,7 +287,7 @@ populate_keyring() { # 40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:5: local -A trusted_ids for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then while IFS=: read key_id _; do # skip blank lines, comments; these are valid in this file [[ -z $key_id || ${key_id:0:1} = \# ]] && continue @@ -306,7 +306,7 @@ populate_keyring() { done msg "$(gettext "Importing owner trust values...")" for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then "${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted" fi done @@ -317,7 +317,7 @@ populate_keyring() { # guarantee of identification for the keys. local -A revoked_ids for keyring in "${KEYRINGIDS[@]}"; do - if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then mapfile -t keys < "${KEYRING_IMPORT_DIR}/${keyring}-revoked" while IFS=: read _ _ _ _ key_id _; do if [[ -n $key_id ]]; then -- 1.7.10.2

1 0

[pacman-dev] [PATCH] makepkg: Add CPPFLAGS support
by Allan McRae 08 May '12

08 May '12

Add CPPFLAGS support in addition to the current CFLAGS and CXXFLAGS. This keeps compiler flags split up in the same logical way done everywhere else. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This will allow a certian disrtibution to put -D_FORTIFY_SOURCE where it should be... doc/PKGBUILD.5.txt | 8 ++++---- doc/makepkg.conf.5.txt | 3 +++ etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index eefdbd4..384af7c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -254,10 +254,10 @@ A normal sync or upgrade will not use its value. with distcc. *buildflags*;; - Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS) - during build as specified in linkman:makepkg.conf[5]. More useful in - its negative form `!buildflags` with select packages that have problems - building with custom buildflags. + Allow the use of user-specific buildflags (CPPFLAGS, CFLAGS, CXXFLAGS, + LDFLAGS) during build as specified in linkman:makepkg.conf[5]. More + useful in its negative form `!buildflags` with select packages that + have problems building with custom buildflags. *makeflags*;; Allow the use of user-specific makeflags during build as specified diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 5970946..de2b4b4 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -51,6 +51,9 @@ Options A string such as ``i686-pc-linux-gnu'', do not touch unless you know what you are doing. This can be commented out by most users if desired. +**CPPFLAGS=**"cppflags":: + Flags used for the C preprocessor; see CFLAGS for more info. + **CFLAGS=**"cflags":: Flags used for the C compiler. This is a key part to the use of makepkg. Usually several options are specified, and the most common string resembles diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index d8117a3..51df493 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -27,6 +27,7 @@ CARCH="@CARCH@" CHOST="@CHOST@" #-- Compiler and Linker Flags +#CPPFLAGS="" #CFLAGS="-O2 -pipe" #CXXFLAGS="-O2 -pipe" #LDFLAGS="" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..c7baa97 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -955,7 +955,7 @@ run_function() { # clear user-specified buildflags if requested if check_option "buildflags" "n"; then - unset CFLAGS CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS fi # clear user-specified makeflags if requested @@ -967,7 +967,7 @@ run_function() { cd_safe "$srcdir" # ensure all necessary build variables are exported - export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST # save our shell options so pkgfunc() can't override what we need local shellopts=$(shopt -p) -- 1.7.10.1

3 3

[pacman-dev] [PATCH] Portability fixes for makepkg
by jhuntwork＠lightcubesolutions.com 08 May '12

08 May '12

From: Jeremy Huntwork <jhuntwork(a)lightcubesolutions.com> Update to last patch submitted to use a templated stat command instead of ls to collect inodes. 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> --- configure.ac | 5 +++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 46 +++++++++++++++++----------------------------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 15e93e7..5483ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,7 @@ GCC_VISIBILITY_CC GCC_GNU89_INLINE_CC # Host-dependant definitions +INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" STRIP_BINARIES="--strip-all" @@ -294,6 +295,7 @@ STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) + INODECMD="stat -f '%i %n'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; @@ -303,6 +305,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes + INODECMD="/usr/bin/stat -f '%i %n'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" STRIP_BINARIES="" @@ -314,6 +317,7 @@ esac AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) +AC_SUBST(INODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) @@ -487,6 +491,7 @@ ${PACKAGE_NAME}: Architecture : ${CARCH} Host Type : ${CHOST} + File inode command : ${INODECMD} Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index a1a4f36..8d1a9e5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -49,6 +49,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..7999760 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 @INODECMD@ '{}' + 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

4 4

[pacman-dev] [PATCH] asdeps flag passed from makepkg to pacman
by Daniel Wallace 07 May '12

07 May '12

From: Daniel Wallace <daniel.wallace12(a)gmail.com> add the asdeps flag for makepkg so that it does pacman -U --asdeps for when you have to make the dependencies as well because they are not in the repos Signed-off-by: Daniel Wallace <daniel.wallace12(a)gmail.com> --- contrib/bash_completion.in | 4 ++-- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 1b265e0..0bf6e39 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -75,8 +75,8 @@ _makepkg() { _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then opts=('allsource asroot check clean config force geninteg help holdver ignorearch - install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar - nosign pkg repackage rmdeps sign skipinteg source syncdeps' + install log nobuild nocheck nocolor noconfirm asdeps nodeps noextract + noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 2de47cd..e81257b 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -484,6 +484,7 @@ _makepkg_longopts=( '--skipinteg[do not perform any verification checks on source files]' '--skippgpcheck[Do not verify source files with PGP signatures]' '--noconfirm[do not ask for confirmation when resolving dependencies]' + '--asdeps[Install packages as non-explicitly installed]' '--noprogressbar[Do not show a progress bar when downloading files]' ) _makepkg(){ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 27875a3..b96d768 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -179,6 +179,10 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--asdeps*:: + (Passed to pacman) Install packages as non-explicitly installed (used + with -i / --install). + *\--noprogressbar*:: (Passed to pacman) Prevent pacman from displaying a progress bar; useful if you are redirecting makepkg output to file. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d36dbd6..e17dc0a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1969,6 +1969,7 @@ usage() { printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" @@ -2004,7 +2005,7 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean' 'nodeps' 'version' 'config:') # Pacman Options -OPT_LONG+=('noconfirm' 'noprogressbar') +OPT_LONG+=('noconfirm' 'asdeps' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION; @@ -2016,6 +2017,7 @@ while true; do case "$1" in # Pacman Options --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; + --asdeps) PACMAN_OPTS+=" --asdeps" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options -- 1.7.10.1

3 3

[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