- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] add --overwrite option to ignore file conflicts
by Andrew Gregory 10 Apr '17

10 Apr '17

Allows for safer, more fine-grained control for overwriting files than --force's all-or-nothing approach. Implements FS#31549. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.8.txt | 12 ++++++++++++ lib/libalpm/alpm.h | 5 +++++ lib/libalpm/conflict.c | 14 ++++++++++---- lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 2 ++ src/pacman/conf.h | 2 ++ src/pacman/pacman.c | 6 ++++++ test/pacman/tests/TESTS | 3 +++ test/pacman/tests/overwrite-files-match-negated.py | 13 +++++++++++++ test/pacman/tests/overwrite-files-match.py | 13 +++++++++++++ test/pacman/tests/overwrite-files-nonmatch.py | 13 +++++++++++++ 12 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/overwrite-files-match-negated.py create mode 100644 test/pacman/tests/overwrite-files-match.py create mode 100644 test/pacman/tests/overwrite-files-nonmatch.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index f940d05c..19b959b1 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -266,6 +266,18 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up-to-date. +*\--overwrite* <glob>:: + Bypass file conflict checks and overwrite conflicting files. If the + package that is about to be installed contains files that are already + installed and match 'glob', this option will cause all those files to be + overwritten. Using '\--overwrite' will not allow overwriting a directory + with a file or installing packages with conflicting files and directories. + Multiple patterns can be specified by separating them with a comma. May be + specified multiple times. Patterns can be negated, such that files + matching them will not be overwritten, by prefixing them with an + exclamation mark. Subsequent matches will override previous ones. A leading + literal exclamation mark or backslash needs to be escaped. + Query Options (apply to '-Q')[[QO]] ----------------------------------- diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 49cf200a..de0adc1e 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -830,6 +830,11 @@ int alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir); int alpm_option_remove_hookdir(alpm_handle_t *handle, const char *hookdir); /** @} */ +alpm_list_t *alpm_option_get_overwrite_files(alpm_handle_t *handle); +int alpm_option_set_overwrite_files(alpm_handle_t *handle, alpm_list_t *globs); +int alpm_option_add_overwrite_file(alpm_handle_t *handle, const char *glob); +int alpm_option_remove_overwrite_file(alpm_handle_t *handle, const char *glob); + /** Returns the logfile name. */ const char *alpm_option_get_logfile(alpm_handle_t *handle); /** Sets the logfile name. */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b1666dfe..0e37419f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -385,6 +385,12 @@ static alpm_list_t *alpm_db_find_file_owners(alpm_db_t* db, const char *path) return owners; } +static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) +{ + return handle->trans->flags & ALPM_TRANS_FLAG_FORCE + || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0; +} + /** * @brief Find file conflicts that may occur during the transaction. * @@ -448,8 +454,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* can skip file-file conflicts when forced * * checking presence in p2_files detects dir-file or file-dir * conflicts as the path from p1 is returned */ - if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && - alpm_filelist_contains(p2_files, filename)) { + if(_alpm_can_overwrite_file(handle, filename) + && alpm_filelist_contains(p2_files, filename)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s exists in both '%s' and '%s'\n", filename, p1->name, p2->name); @@ -654,8 +660,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } /* skip file-file conflicts when being forced */ - if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && - !S_ISDIR(lsbuf.st_mode)) { + if(!S_ISDIR(lsbuf.st_mode) + && _alpm_can_overwrite_file(handle, filestr)) { _alpm_log(handle, ALPM_LOG_DEBUG, "conflict with file on filesystem being forced\n"); resolved_conflict = 1; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5a5cd448..9f1b179a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -283,6 +283,12 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle) return handle->ignoregroup; } +alpm_list_t SYMEXPORT *alpm_option_get_overwrite_files(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->overwrite_files; +} + alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -657,6 +663,21 @@ int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char * return _alpm_option_strlist_rem(handle, &(handle->ignoregroup), grp); } +int SYMEXPORT alpm_option_add_overwrite_file(alpm_handle_t *handle, const char *glob) +{ + return _alpm_option_strlist_add(handle, &(handle->overwrite_files), glob); +} + +int SYMEXPORT alpm_option_set_overwrite_files(alpm_handle_t *handle, alpm_list_t *globs) +{ + return _alpm_option_strlist_set(handle, &(handle->overwrite_files), globs); +} + +int SYMEXPORT alpm_option_remove_overwrite_file(alpm_handle_t *handle, const char *glob) +{ + return _alpm_option_strlist_rem(handle, &(handle->overwrite_files), glob); +} + int SYMEXPORT alpm_option_add_assumeinstalled(alpm_handle_t *handle, const alpm_depend_t *dep) { alpm_depend_t *depcpy; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index e096bfb3..4c9a0759 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -83,6 +83,7 @@ struct __alpm_handle_t { char *gpgdir; /* Directory where GnuPG files are stored */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ alpm_list_t *hookdirs; /* Paths to hook directories */ + alpm_list_t *overwrite_files; /* Paths that may be overwritten */ /* package lists */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 52151c56..cd68aff8 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -781,6 +781,8 @@ static int setup_libalpm(void) alpm_option_set_cachedirs(handle, config->cachedirs); } + alpm_option_set_overwrite_files(handle, config->overwrite_files); + alpm_option_set_default_siglevel(handle, config->siglevel); config->localfilesiglevel = merge_siglevel(config->siglevel, diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 636fec61..e6ab8379 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -122,6 +122,7 @@ typedef struct __config_t { alpm_list_t *assumeinstalled; alpm_list_t *noupgrade; alpm_list_t *noextract; + alpm_list_t *overwrite_files; char *xfercommand; /* our connection to libalpm */ @@ -171,6 +172,7 @@ enum { OP_GPGDIR, OP_DBONLY, OP_FORCE, + OP_OVERWRITE_FILES, OP_COLOR, OP_DBPATH, OP_CASCADE, diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index a459cf00..2e31fcfc 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -190,6 +190,8 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: addlist(_(" --force force install, overwrite conflicting files\n")); + addlist(_(" --overwrite <path>\n" + " overwrite conflicting files (can be used more than once)\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -703,6 +705,9 @@ static int parsearg_upgrade(int opt) case OP_FORCE: config->flags |= ALPM_TRANS_FLAG_FORCE; break; + case OP_OVERWRITE_FILES: + parsearg_util_addlist(&(config->overwrite_files)); + break; case OP_ASDEPS: config->flags |= ALPM_TRANS_FLAG_ALLDEPS; break; @@ -924,6 +929,7 @@ static int parseargs(int argc, char *argv[]) {"assume-installed", required_argument, 0, OP_ASSUMEINSTALLED}, {"debug", optional_argument, 0, OP_DEBUG}, {"force", no_argument, 0, OP_FORCE}, + {"overwrite", required_argument, 0, OP_OVERWRITE_FILES}, {"noprogressbar", no_argument, 0, OP_NOPROGRESSBAR}, {"noscriptlet", no_argument, 0, OP_NOSCRIPTLET}, {"ask", required_argument, 0, OP_ASK}, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 11d1c38c..eadb63b4 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -80,6 +80,9 @@ TESTS += test/pacman/tests/mode001.py TESTS += test/pacman/tests/mode002.py TESTS += test/pacman/tests/mode003.py TESTS += test/pacman/tests/noupgrade-inverted.py +TESTS += test/pacman/tests/overwrite-files-match-negated.py +TESTS += test/pacman/tests/overwrite-files-match.py +TESTS += test/pacman/tests/overwrite-files-nonmatch.py TESTS += test/pacman/tests/pacman001.py TESTS += test/pacman/tests/pacman002.py TESTS += test/pacman/tests/pacman003.py diff --git a/test/pacman/tests/overwrite-files-match-negated.py b/test/pacman/tests/overwrite-files-match-negated.py new file mode 100644 index 00000000..42b1be2d --- /dev/null +++ b/test/pacman/tests/overwrite-files-match-negated.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file matching a negated --overwrite pattern" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foobar --overwrite=!foo* %s" % p.filename() + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=foobar") diff --git a/test/pacman/tests/overwrite-files-match.py b/test/pacman/tests/overwrite-files-match.py new file mode 100644 index 00000000..004155c3 --- /dev/null +++ b/test/pacman/tests/overwrite-files-match.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file matching an --overwrite pattern" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foobar %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("FILE_MODIFIED=foobar") diff --git a/test/pacman/tests/overwrite-files-nonmatch.py b/test/pacman/tests/overwrite-files-nonmatch.py new file mode 100644 index 00000000..38932d5f --- /dev/null +++ b/test/pacman/tests/overwrite-files-nonmatch.py @@ -0,0 +1,13 @@ +self.description = "Install a package with an existing file not matching --overwrite patterns" + +p = pmpkg("dummy") +p.files = ["foobar"] +self.addpkg(p) + +self.filesystem = ["foobar*"] + +self.args = "-U --overwrite=foo %s" % p.filename() + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +self.addrule("!FILE_MODIFIED=foobar") -- 2.12.1

1 1

[pacman-dev] [PATCH] libalpm: Use archive_read_extract2
by Armin K 09 Apr '17

09 Apr '17

archive_read_extract() forces resolution of uid/gid to names when extracting the tarball. This can lead to wrong file ownership when using pacman with -r option and when uid/gid differ in the host and in the chroot. archive_read_extract2() uses uid's and gid's only. See also: https://lists.archlinux.org/pipermail/pacman-dev/2017-March/021912.html Signed-off-by: Armin K <krejzi(a)email.com> --- lib/libalpm/add.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c5bed817..0beed01c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -110,6 +110,7 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, const char *filename) { int ret; + struct archive *archive_writer; const int archive_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME | @@ -118,7 +119,20 @@ static int perform_extraction(alpm_handle_t *handle, struct archive *archive, archive_entry_set_pathname(entry, filename); - ret = archive_read_extract(archive, entry, archive_flags); + archive_writer = archive_write_disk_new(); + if (archive_writer == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("cannot allocate disk archive object")); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "error: cannot allocate disk archive object"); + return 1; + } + + archive_write_disk_set_options(archive_writer, archive_flags); + + ret = archive_read_extract2(archive, entry, archive_writer); + + archive_write_free(archive_writer); + if(ret == ARCHIVE_WARN && archive_errno(archive) != ENOSPC) { /* operation succeeded but a "non-critical" error was encountered */ _alpm_log(handle, ALPM_LOG_WARNING, _("warning given when extracting %s (%s)\n"), -- 2.12.0

3 2

[pacman-dev] [PATCH] makepkg: add flag 'recvkeys' to retrieve PGP keys from 'validpgpkeys' in PKGBUILDs
by alzeih＠gmail.com 04 Apr '17

04 Apr '17

This makes automating PGP keys for verifying source file signatures possible. This may make it easier for package users and maintainers to obtain PGP keys used in PKGBUILDs. Signed-off-by: Alli <alzeih(a)gmail.com> --- doc/makepkg.8.txt | 4 ++++ scripts/libmakepkg/integrity.sh.in | 2 ++ .../libmakepkg/integrity/verify_signature.sh.in | 22 ++++++++++++++++++++++ scripts/makepkg.sh.in | 15 +++++++++++++-- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 2dff1b19..88b709f4 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -171,6 +171,10 @@ Options *\--noprepare*:: Do not run the prepare() function in the PKGBUILD. +*\--recvkeys*:: + Retrieve PGP signing keys used in the PKGBUILD for verifying source + integrity into the gpg keyring. + *\--sign*:: Sign the resulting package with gpg, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/libmakepkg/integrity.sh.in b/scripts/libmakepkg/integrity.sh.in index 3a77ef16..3d3d071b 100644 --- a/scripts/libmakepkg/integrity.sh.in +++ b/scripts/libmakepkg/integrity.sh.in @@ -34,11 +34,13 @@ check_source_integrity() { warning "$(gettext "Skipping all source file integrity checks.")" elif (( SKIPCHECKSUMS )); then warning "$(gettext "Skipping verification of source file checksums.")" + get_pgpsigs "$@" check_pgpsigs "$@" elif (( SKIPPGPCHECK )); then warning "$(gettext "Skipping verification of source file PGP signatures.")" check_checksums "$@" else + get_pgpsigs "$@" check_checksums "$@" check_pgpsigs "$@" fi diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index b5577523..e8890932 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -26,6 +26,28 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" +get_pgpsigs() { + ! source_has_signatures && return 0 + (( ! RECVKEYS )) && return 0 + + msg "$(gettext "Receiving PGP keys for verifying source file signatures with %s...")" "gpg" + + local key + local errors=0 + + for key in "${validpgpkeys[@]}"; do + gpg --recv-keys "$key" + if [ $? != 0 ]; then + errors=1 + fi + done + + if (( errors )); then + error "$(gettext "One or more PGP keys could not be retrieved!")" + exit 1 + fi +} + check_pgpsigs() { (( SKIPPGPCHECK )) && return 0 ! source_has_signatures && return 0 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29408929..1a6ca831 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -78,6 +78,7 @@ NOEXTRACT=0 PKGFUNC=0 PKGVERFUNC=0 PREPAREFUNC=0 +RECVKEYS=0 REPKG=0 RMDEPS=0 SKIPCHECKSUMS=0 @@ -1044,6 +1045,14 @@ check_software() { fi fi + # gpg - receive source verification keys + if (( RECVKEYS )) && source_has_signatures; then + if ! type -p gpg >/dev/null; then + error "$(gettext "Cannot find the %s binary required for receiving keys for verifying source files.")" "gpg" + ret=1 + fi + fi + # checksum operations if (( GENINTEG || ! SKIPCHECKSUMS )); then local integlist @@ -1218,6 +1227,7 @@ usage() { printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" + printf -- "$(gettext " --recvkeys Receive PGP Keys used for verifying source integrity")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -1263,8 +1273,8 @@ OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist' - 'printsrcinfo' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' - 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') + 'printsrcinfo' 'recvkeys' 'repackage' 'rmdeps' 'sign' 'skipchecksums' + 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -1309,6 +1319,7 @@ while true; do -p) shift; BUILDFILE=$1 ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; --printsrcinfo) PRINTSRCINFO=1 IGNOREARCH=1;; + --recvkeys) RECVKEYS=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; -- 2.12.1

4 8

[pacman-dev] [PATCH] Replace @SIZECMD@ with POSIX-compatible command
by Drew DeVault 04 Apr '17

04 Apr '17

Now uses wc -c $file | cut -d' ' -f1, which works using only POSIX commands and removes the need for any platform-specific usages. Signed-off-by: Drew DeVault <sir(a)cmpwn.com> --- configure.ac | 5 ----- scripts/pkgdelta.sh.in | 4 ++-- scripts/repo-add.sh.in | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 825b29b9..ab8f53df 100644 --- a/configure.ac +++ b/configure.ac @@ -348,7 +348,6 @@ DEFAULT_DUFLAGS=" -sk --apparent-size" INODECMD="stat -c '%i %n'" OWNERCMD="stat -c '%u:%g'" MODECMD="stat -c '%a'" -SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" @@ -358,7 +357,6 @@ case "${host_os}" in INODECMD="stat -f '%i %N'" OWNERCMD="stat -f '%u:%g'" MODECMD="stat -f '%Lp'" - SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" DEFAULT_DUFLAGS=" -sk" ;; @@ -367,7 +365,6 @@ case "${host_os}" in INODECMD="/usr/bin/stat -f '%i %N'" OWNERCMD="/usr/bin/stat -f '%u:%g'" MODECMD="/usr/bin/stat -f '%Lp'" - SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" DEFAULT_DUFLAGS=" -sk" STRIP_BINARIES="" @@ -380,7 +377,6 @@ AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) AC_SUBST(OWNERCMD) AC_SUBST(MODECMD) -AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) @@ -570,7 +566,6 @@ ${PACKAGE_NAME}: File inode command : ${INODECMD} File owner command : ${OWNERCMD} File mode command : ${MODECMD} - Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} libalpm version : ${LIB_VERSION} diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 9f87185b..4500dd75 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -119,7 +119,7 @@ create_xdelta() newver="$pkgver" newarch="$arch" - pkgsize="$(@SIZECMD@ -L "$newfile")" + pkgsize="$(wc -c "$newfile" | cut -d' ' -f1)" if ((pkgsize < min_pkg_size)); then msg "$(gettext "Skipping delta creation for small package: %s - size %s")" "$newname" "$pkgsize" @@ -151,7 +151,7 @@ create_xdelta() return 1 fi - deltasize="$(@SIZECMD@ -L "$deltafile")" + deltasize="$(wc -c "$deltafile" | cut -d' ' -f1)" if ((max_delta_size * pkgsize / 100 < deltasize)); then msg "$(gettext "Delta package larger than maximum size. Removing.")" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 6333f6a2..68edbf4b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -153,7 +153,7 @@ db_write_delta() { # get md5sum and compressed size of package md5sum=$(md5sum "$deltafile") md5sum=${md5sum%% *} - csize=$(@SIZECMD@ -L "$deltafile") + csize=$(wc -c "$deltafile" | cut -d' ' -f1) oldfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (source)" | sed 's/.*: *//') newfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (output)" | sed 's/.*: *//') @@ -368,7 +368,7 @@ db_write_entry() { error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 fi - pgpsigsize=$(@SIZECMD@ -L "$pkgfile.sig") + pgpsigsize=$(wc -c "$pkgfile.sig" | cut -d' ' -f1) if (( pgpsigsize > 16384 )); then error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig" return 1 @@ -377,7 +377,7 @@ db_write_entry() { pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n') fi - csize=$(@SIZECMD@ -L "$pkgfile") + csize=$(wc -c "$pkgfile" | cut -d' ' -f1) # compute checksums msg2 "$(gettext "Computing checksums...")" -- 2.12.0

3 3

[pacman-dev] [PATCH 1/2] add alpm_list_append_strdup
by Andrew Gregory 04 Apr '17

04 Apr '17

Makes error detection and handling easier for a common operation. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm_list.c | 20 ++++++++++++++++++++ lib/libalpm/alpm_list.h | 1 + 2 files changed, 21 insertions(+) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 36b01c71..0f1b819c 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -132,6 +132,26 @@ alpm_list_t SYMEXPORT *alpm_list_append(alpm_list_t **list, void *data) } /** + * @brief Duplicate and append a string to a list. + * + * @param list the list to append to + * @param data the string to duplicate and append + * + * @return the newly added item + */ +alpm_list_t SYMEXPORT *alpm_list_append_strdup(alpm_list_t **list, const char *data) +{ + alpm_list_t *ret; + char *dup; + if((dup = strdup(data)) && (ret = alpm_list_append(list, dup))) { + return ret; + } else { + free(dup); + return NULL; + } +} + +/** * @brief Add items to a list in sorted order. * * @param list the list to add to diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index d7306cc5..1cb237d0 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -58,6 +58,7 @@ void alpm_list_free_inner(alpm_list_t *list, alpm_list_fn_free fn); /* item mutators */ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data); alpm_list_t *alpm_list_append(alpm_list_t **list, void *data); +alpm_list_t *alpm_list_append_strdup(alpm_list_t **list, const char *data); alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second); alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn); -- 2.11.1

2 3

[pacman-dev] [PATCH] pactest: add --review option
by Andrew Gregory 04 Apr '17

04 Apr '17

Opens the test file(s), test output, and any log files in the test environment in an editor after the tests run for review. Simplifies debugging tests by avoiding the need to use --keep-root and manually opening the relevant files. The editor used can be set with --editor or $EDITOR, falling back to vim. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pactest.py | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index db61233d..b5f6d4d7 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -23,6 +23,8 @@ import shutil import sys import tempfile +import glob +import subprocess import pmenv import tap @@ -31,6 +33,30 @@ __author__ = "Aurelien FORET" __version__ = "0.4" +# writer to send output to multiple destinations simultaneously +class MultiWriter(): + def __init__(self, *outputs): + self.outputs = outputs + + def write(self, message): + for op in self.outputs: + op.write(message) + +# duplicate stdout/stderr to a temporary file +class OutputSaver(): + def __init__(self): + self.save_file = tempfile.NamedTemporaryFile(prefix='pactest-output-') + + def __enter__(self): + sys.stdout = MultiWriter(sys.stdout, self.save_file) + sys.stderr = MultiWriter(sys.stderr, self.save_file) + return self.save_file + + def __exit__(self, type, value, traceback): + sys.stdout = sys.__stdout__ + sys.stderr = sys.__stderr__ + self.save_file.flush() + def create_parser(): usage = "usage: %prog [options] <path/to/testfile.py>..." description = "Runs automated tests on the pacman binary. Tests are " \ @@ -71,6 +97,12 @@ def create_parser(): parser.add_option("--ldconfig", type = "string", dest = "ldconfig", default = "/sbin/ldconfig", help = "specify path to ldconfig") + parser.add_option("--review", action = "store_true", + dest = "review", default = False, + help = "review test files, test output, and saved logs") + parser.add_option("--editor", action = "store", + dest = "editor", default = os.getenv('EDITOR', 'vim'), + help = "editor to use for viewing files") return parser @@ -114,7 +146,14 @@ def create_parser(): sys.exit(2) # run tests - env.run() + if not opts.review: + env.run() + else: + # save output in tempfile for review + with OutputSaver() as save_file: + env.run() + files = [save_file.name] + args + glob.glob(root_path + "/var/log/*") + subprocess.call([opts.editor] + files) if not opts.keeproot: shutil.rmtree(root_path) -- 2.12.1

2 1

[pacman-dev] [PATCH] Ignore comments in INSTALL files (FS#51916)
by Michael Straube 04 Apr '17

04 Apr '17

If a comment in an INSTALL file contains the name of a valid INSTALL file function but the function itself is not present, pacman tries to execute that function. That leads to an error. Ignore comments in the grep function in libalpm/trans.c to avoid such erros. Signed-off-by: Michael Straube <straubem(a)gmx.de> --- lib/libalpm/trans.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 60114882..7689079b 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -305,6 +305,7 @@ void _alpm_trans_free(alpm_trans_t *trans) static int grep(const char *fn, const char *needle) { FILE *fp; + char *ptr; if((fp = fopen(fn, "r")) == NULL) { return 0; @@ -314,6 +315,9 @@ static int grep(const char *fn, const char *needle) if(safe_fgets(line, sizeof(line), fp) == NULL) { continue; } + if((ptr = strchr(line, '#')) != NULL) { + *ptr = '\0'; + } /* TODO: this will not work if the search string * ends up being split across line reads */ if(strstr(line, needle)) { -- 2.12.1

2 1

[pacman-dev] Non-existing user/group ownership and chroot
by Armin K. 06 Mar '17

06 Mar '17

Hi all. I'm using pacman for my LFS install, and as part of that, I also use hooks used by Arch for, say, systemd-sysusers, systemd-tmpfiles, etc. Some packages require that certain files/directories are owned by a certain user/group after install. This is somehow hard to achieve with .install file when systemd-sysuser hook is used (see [1] for an example). Since this is a LFS, it's "bootstrapped" from an already existing linux distro (doesn't have to be arch, it has its own temporary pacman). I use pacman -U -r /path/to/lfs to install packages from the host system. The issue I'm having is when an user isn't created and chown is ran in PKGBUILD's with statically assigned id's (ie, chown 20:20, where 20 will be an UID for the created user), pacman chowns those files/directories to something else entirely. I did however notice that on my host (Arch, of course), those missleading uids/gids correspond to the uids/gids of the users that are going to be created in LFS. So, if I have user/group named:named with uid:gid 20:20, and host system (Arch) has same user:group, with with uid:gid 40:40, the files that I explicitly chowned to 20:20 in PKGBUILD will be chown-ed to 40:40 instead when pacman -U -r ... is ran. So, how do I solve this problem? I suppose it's an issue in pacman -U with -r option. I can use chown 20:20 in .install file (before the user:groups have been created), and the file will be created with proper ownership. Thanks in advance. [1] https://bugs.archlinux.org/task/52680

3 12

[pacman-dev] [PATCH 0/2] Deprecate md5sums, show sha256sums as an example-by-default.
by Mike Swanson 26 Feb '17

26 Feb '17

Both the MD5 and SHA-1 hash functions have known collision attacks, providing an attack vector for malicious hosts and MITMs to provide tampered code without being detected by md5, or sha1, hashing. We should move to sha256-by-default, and encourage their use by changing the documentation and example files to follow suit. The SHA-2 family of hashes are currently secure against normal attacks (even at the scale of having Facebook's or Google's datacenters). Int the future, pacman should gain SHA-3 support though, because SHA-2 itself has some theoretical preimage attacks and possible collision attacks. Mike Swanson (2): proto: Encourage the use of sha256sums by example. doc, makepkg.conf: Deprecate md5sums, show examples using sha256sums. doc/PKGBUILD-example.txt | 4 ++-- doc/PKGBUILD.5.txt | 31 +++++++++++++++++++------------ doc/makepkg-template.1.txt | 2 +- etc/makepkg.conf.in | 2 +- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD-vcs.proto | 2 +- proto/PKGBUILD.proto | 2 +- 7 files changed, 26 insertions(+), 19 deletions(-) -- 2.11.1

6 19

[pacman-dev] [PATCH 1/1] split repository and package with VerbosePkgLists
by Christian Hesse 14 Feb '17

14 Feb '17

From: Christian Hesse <mail(a)eworm.de> Acting on packages from lots of different repositories makes the view look cluttered. So split repository and package with VerbosePkgLists. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/util.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 64ea8c57..92fac07a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -806,9 +806,11 @@ static alpm_list_t *create_verbose_header(size_t count) alpm_list_t *ret = NULL; char *header; - pm_asprintf(&header, "%s (%zu)", _("Package"), count); + add_table_cell(&ret, _("Repository"), CELL_TITLE); + pm_asprintf(&header, "%s (%zu)", _("Package"), count); add_table_cell(&ret, header, CELL_TITLE | CELL_FREE); + add_table_cell(&ret, _("Old Version"), CELL_TITLE); add_table_cell(&ret, _("New Version"), CELL_TITLE); add_table_cell(&ret, _("Net Change"), CELL_TITLE); @@ -830,11 +832,16 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) if(target->install) { const alpm_db_t *db = alpm_pkg_get_db(target->install); if(db) { - pm_asprintf(&str, "%s/%s", alpm_db_get_name(db), alpm_pkg_get_name(target->install)); + pm_asprintf(&str, "%s", alpm_db_get_name(db)); } else { - pm_asprintf(&str, "%s", alpm_pkg_get_name(target->install)); + str = NULL; } + add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); + + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->install)); } else { + add_table_cell(&ret, NULL, CELL_NORMAL | CELL_FREE); + pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); } add_table_cell(&ret, str, CELL_NORMAL | CELL_FREE); -- 2.11.0

3 2