- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove SHA224 support
by Allan McRae 25 Sep '16

25 Sep '16

This was included due to use of PolarSSL's implementation for our internal SHA2 support. As our internal checksum calculations are now removed, we can also remove this unused code path. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 3b7c3bc..7ef4bf3 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -897,14 +897,12 @@ static int md5_file(const char *path, unsigned char output[16]) return 0; } -/* third param is so we match the PolarSSL definition */ -/** Compute the SHA-224 or SHA-256 message digest of a file. - * @param path file path of file to compute SHA2 digest of - * @param output string to hold computed SHA2 digest - * @param is224 use SHA-224 instead of SHA-256 +/** Compute the SHA-256 message digest of a file. + * @param path file path of file to compute SHA256 digest of + * @param output string to hold computed SHA256 digest * @return 0 on success, 1 on file open error, 2 on file read error */ -static int sha2_file(const char *path, unsigned char output[32], int is224) +static int sha256_file(const char *path, unsigned char output[32]) { SHA256_CTX ctx; unsigned char *buf; @@ -919,21 +917,13 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) return 1; } - if(is224) { - SHA224_Init(&ctx); - } else { - SHA256_Init(&ctx); - } + SHA256_Init(&ctx); while((n = read(fd, buf, ALPM_BUFFER_SIZE)) > 0 || errno == EINTR) { if(n < 0) { continue; } - if(is224) { - SHA224_Update(&ctx, buf, n); - } else { - SHA256_Update(&ctx, buf, n); - } + SHA256_Update(&ctx, buf, n); } close(fd); @@ -943,11 +933,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) return 2; } - if(is224) { - SHA224_Final(output, &ctx); - } else { - SHA256_Final(output, &ctx); - } + SHA256_Final(output, &ctx); return 0; } #endif @@ -1005,7 +991,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) ASSERT(filename != NULL, return NULL); - if(sha2_file(filename, output, 0) > 0) { + if(sha256_file(filename, output) > 0) { return NULL; } -- 2.9.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-76-g0d2ba87
by allan＠archlinux.org 25 Sep '16

25 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 0d2ba870c96d1b4b3d5fabfabe303bc6b1c989fd (commit) via ae56a32273df8a36f4e84e0f37ce1f34e84f15a3 (commit) via 5fcc054421a4ec4f1928f2598beb4ef54bb75fbc (commit) via 130c0d54969e686731b9002b3cf3f52052677c73 (commit) via 8f4a67bda976f24a88aec5112cdb7f71dde5fc78 (commit) via c7da5a6ef2e7b4a410b7175b04d68499e26c2160 (commit) via 3a00bc31f293e3bbba0b1047e23682914215d217 (commit) via 5c549b0e1df1ff13a94fbf3849391c1b7e2ac7fb (commit) via 52ec8dfffee862511d07bbd98293c605ac075656 (commit) via 7568928e7152d0de4728fbb8b44b444e5affbfcb (commit) via 45b6a3074a482ed752b44b6d6cee635c05fb7f9b (commit) via 6a5156eedc378057eb2ced2c6e6191c50286b1e1 (commit) via 85171807c15fb5907d8337af2a50ab79392e1b8c (commit) via 34f3f1e7a640488c4c32a3a825813afc1ad2ed68 (commit) via 07d1e0441b53fffd4a600babe479e278a2fc50ee (commit) via 900a22b90c8f8c76b6d5acde9c1d55d7ba65afdb (commit) via 38e229e4dbcfe2aacbf9c5414432407f4f73bfc1 (commit) via fac4831a091eda447780d5d1e1e572b14ebb0338 (commit) via d560a9aecd4027bf23e3d5caf556624797e8f939 (commit) via 1dbfef7b1c7d104f2ca6c40060aa3cc18d2dc61a (commit) via e28c5803bba8242ae98979700c5a034d3790255e (commit) via 1e2b39840660eabb393162cd2fb79423793ee36d (commit) from 406c9b66b4f2cc54ea59e57de92db6566e59c4e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0d2ba870c96d1b4b3d5fabfabe303bc6b1c989fd Author: Ivy Foster <ivy.foster(a)gmail.com> Date: Sat Sep 3 22:14:49 2016 -0500 Do not #define _RESERVED_IDENTIFIERS Signed-off-by: Ivy Foster <ivy.foster(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ae56a32273df8a36f4e84e0f37ce1f34e84f15a3 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:06 2016 +0200 bacman: add manual page Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5fcc054421a4ec4f1928f2598beb4ef54bb75fbc Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:04 2016 +0200 bacman: add option to alter the output directory Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 130c0d54969e686731b9002b3cf3f52052677c73 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:03 2016 +0200 bacman: add option to print fewer status updates Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8f4a67bda976f24a88aec5112cdb7f71dde5fc78 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:02 2016 +0200 bacman: quote pkg_pkger variable Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c7da5a6ef2e7b4a410b7175b04d68499e26c2160 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:01 2016 +0200 bacman: code structuring Adding and clarifying comments. Adding and removing some new lines. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a00bc31f293e3bbba0b1047e23682914215d217 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:14:00 2016 +0200 bacman: rewrite usage function Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c549b0e1df1ff13a94fbf3849391c1b7e2ac7fb Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:13:59 2016 +0200 bacman: proper option handling Switch to parseopts instead of merely checking the first argument. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 52ec8dfffee862511d07bbd98293c605ac075656 Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:13:57 2016 +0200 bacman: handle SIGHUP, SIGINT, SIGTERM signals Trap SIGHUP, SIGINT, SIGTERM and remove working directories accordingly. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7568928e7152d0de4728fbb8b44b444e5affbfcb Author: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Date: Sun Sep 4 18:13:56 2016 +0200 bacman: allow for multiple packages as arguments To enable the creation of multiple packages with one command move the assembly process into its own function. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45b6a3074a482ed752b44b6d6cee635c05fb7f9b Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sat Sep 24 19:16:24 2016 +1200 Add missing newline in paclog-pkglist help output Add missing newline in paclog-pkglist help output Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6a5156eedc378057eb2ced2c6e6191c50286b1e1 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Thu Sep 22 20:00:01 2016 +0200 Change type of count in be_sync Making it size_t matches the return value of alpm_list_count() and avoids the implicit cast to int. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 85171807c15fb5907d8337af2a50ab79392e1b8c Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Thu Sep 22 20:00:00 2016 +0200 Return boolean from db_populate Since the number of packages is not used anywhere, just return a boolean to avoid the implicit cast from size_t to int in be_local.c. Use 0 as success to be consistent with db_validate. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 34f3f1e7a640488c4c32a3a825813afc1ad2ed68 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Sat Sep 17 17:13:51 2016 +0200 Fix gcc strict-overflow error Recent gcc (tested with 6.2.1) produces the following error when compiling with both --enable-warningflags and --enable-debug. In particular, it seems it is the combination of GCC_STACK_PROTECT_LIB and -Wstrict-overflow=5 produces the error. be_local.c:609:4: error: assuming signed overflow does not occur when simplifying conditional [-Werror=strict-overflow] if(count > 0) { Fix this by changing the type of count from int to size_t, which is fine since count is never negative. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 07d1e0441b53fffd4a600babe479e278a2fc50ee Author: Fabio Castell <webreg(a)vbsimple.net> Date: Fri Sep 9 15:39:37 2016 +1000 repo-add: fix error in directories with a space in their name Fixes FS#50285 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 900a22b90c8f8c76b6d5acde9c1d55d7ba65afdb Author: Ivy Foster <ivy.foster(a)gmail.com> Date: Thu Sep 8 21:03:50 2016 -0500 lib/libalpm/be_sync.c: Close memory leaks when mallocing while out of memory Signed-off-by: Ivy Foster <ivy.foster(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 38e229e4dbcfe2aacbf9c5414432407f4f73bfc1 Author: Eli Schwartz <eschwartz93(a)gmail.com> Date: Thu Sep 1 23:40:26 2016 -0400 bash-completion: fix leaking "files" array into shell environment Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fac4831a091eda447780d5d1e1e572b14ebb0338 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 3 20:13:35 2016 +1000 Fix memory leak in remove_notify_needed_optdepends Also add pactest which captures this leak when run under valgrind. Reported-by: Sergey Petrenko Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d560a9aecd4027bf23e3d5caf556624797e8f939 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 1 13:55:28 2016 +1000 Fix typo in pacman-db-upgrade usage message Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1dbfef7b1c7d104f2ca6c40060aa3cc18d2dc61a Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Wed Aug 31 13:13:37 2016 +1200 Remove AC_FUNC_MALLOC check. We weren't supplying the rpl_malloc function needed if this failed, and didn't check for realloc, so just remove. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e28c5803bba8242ae98979700c5a034d3790255e Author: Ivy Foster <ivy.foster(a)gmail.com> Date: Tue Aug 30 15:33:56 2016 -0500 Replace CURLOPT_PROGRESSFUNCTION with CURLOPT_XFERINFOFUNCTION Curl 7.32.0 added CURLOPT_XFERINFOFUNCTION, which deprecates CURLOPT_PROGRESSFUNCTION and means less casting doubles to size_ts for alpm. This change has no user-facing nor frontend-facing effects. Signed-off-by: Ivy Foster <ivy.foster(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e2b39840660eabb393162cd2fb79423793ee36d Author: Lukas Fleischer <lfleischer(a)archlinux.org> Date: Sat Aug 20 13:46:26 2016 +0200 pacman.8: fix typo in the documentation of --asexplicit Add a space between the option and its argument. Also, do not enclose the argument in asterisk characters. Fixes a typo introduced in aa4c61f (Document database checking options, 2014-12-28). Reported-by: Luca Weiss <luca.emanuel.weiss(a)gmail.com> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 +- contrib/bacman.sh.in | 517 +++++++++++---------- contrib/bash_completion.in | 2 +- contrib/doc/.gitignore | 1 + contrib/doc/Makefile.am | 5 +- contrib/doc/bacman.8.txt | 67 +++ contrib/paclog-pkglist.sh.in | 2 +- doc/pacman.8.txt | 2 +- lib/libalpm/add.h | 6 +- lib/libalpm/alpm.h | 6 +- lib/libalpm/alpm_list.h | 6 +- lib/libalpm/backup.h | 6 +- lib/libalpm/base64.h | 4 +- lib/libalpm/be_local.c | 8 +- lib/libalpm/be_sync.c | 31 +- lib/libalpm/conflict.h | 6 +- lib/libalpm/db.h | 6 +- lib/libalpm/delta.h | 6 +- lib/libalpm/deps.h | 6 +- lib/libalpm/diskspace.h | 6 +- lib/libalpm/dload.c | 18 +- lib/libalpm/dload.h | 6 +- lib/libalpm/filelist.h | 6 +- lib/libalpm/graph.h | 6 +- lib/libalpm/group.h | 6 +- lib/libalpm/handle.h | 6 +- lib/libalpm/hook.h | 6 +- lib/libalpm/libarchive-compat.h | 6 +- lib/libalpm/log.h | 6 +- lib/libalpm/md5.h | 4 +- lib/libalpm/package.h | 6 +- lib/libalpm/pkghash.h | 6 +- lib/libalpm/remove.c | 1 + lib/libalpm/remove.h | 6 +- lib/libalpm/sha2.h | 4 +- lib/libalpm/signing.h | 6 +- lib/libalpm/sync.h | 6 +- lib/libalpm/trans.h | 6 +- lib/libalpm/util.h | 6 +- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/common/ini.h | 6 +- src/common/util-common.h | 6 +- src/pacman/callback.h | 6 +- src/pacman/check.h | 6 +- src/pacman/conf.h | 6 +- src/pacman/package.h | 6 +- src/pacman/pacman.h | 6 +- src/pacman/sighandler.h | 6 +- src/pacman/util.h | 6 +- test/pacman/tests/TESTS | 1 + .../tests/remove-optdepend-of-installed-package.py | 15 + 52 files changed, 510 insertions(+), 379 deletions(-) create mode 100644 contrib/doc/bacman.8.txt create mode 100644 test/pacman/tests/remove-optdepend-of-installed-package.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] bacman: allow for parallel packaging
by Gordian Edenhofer 25 Sep '16

25 Sep '16

* move the actual assembly process into its own function * allow for packaging multiple packages with one command * handle SIGHUP SIGINT SIGTERM and remove working dirs accordingly * add some comments Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- contrib/bacman.sh.in | 460 ++++++++++++++++++++++++++------------------------- 1 file changed, 238 insertions(+), 222 deletions(-) mode change 100644 => 100755 contrib/bacman.sh.in diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in old mode 100644 new mode 100755 index a611c1a..4cd78e4 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -33,9 +33,18 @@ ARGS=("$@") m4_include(../scripts/library/output_format.sh) -# -# User Friendliness -# +# Lazy recursive clean up of temporary dirs +work_dir_root="${TMPDIR:-/tmp}/bacman" +clean_up() { + rm -r "${work_dir_root}".* + echo + exit +} + +# Trap termination signals +trap clean_up SIGHUP SIGINT SIGTERM + +# Print usage information usage() { echo "${myname} (pacman) v${myver}" echo @@ -46,12 +55,14 @@ usage() { echo "Example: ${myname} linux-headers" } +# Print version information version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (C) 2008 locci <carlocci_at_gmail_dot_com>' echo 'Copyright (C) 2008-2016 Pacman Development Team <pacman-dev(a)archlinux.org>' } +# Check for specified arguments while [[ ! -z $1 ]]; do if [[ $1 == "--nocolor" ]]; then USE_COLOR='n' @@ -64,13 +75,16 @@ while [[ ! -z $1 ]]; do fi done +# Configure colored output m4_include(../scripts/library/term_colors.sh) -if (( $# != 1 )); then +# Break if no argument was given +if (( $# < 1 )); then usage exit 1 fi +# Print usage or version if requested if [[ $1 = -@(h|-help) ]]; then usage exit 0 @@ -79,9 +93,7 @@ elif [[ $1 = -@(V|-version) ]]; then exit 0 fi -# -# Fakeroot support -# +# Run in fakeroot if EUID is not root if (( EUID )); then if [[ -f /usr/bin/fakeroot ]]; then msg "Entering fakeroot environment" @@ -94,264 +106,268 @@ if (( EUID )); then fi fi -# -# Setting environmental variables -# +# Source environmental variables and specify fallbacks if [[ ! -r @sysconfdir@/pacman.conf ]]; then error "unable to read @sysconfdir@/pacman.conf" exit 1 fi - eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" - if [[ ! -r @sysconfdir@/makepkg.conf ]]; then error "unable to read @sysconfdir@/makepkg.conf" exit 1 fi - source "@sysconfdir@/makepkg.conf" if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi - pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} -pkg_name="$1" -pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-])) -pkg_namver=("${pkg_dir[@]##*/}") - -# -# Checks everything is in place -# +# Check for an existing database if [[ ! -d $pac_db ]]; then error "pacman database directory ${pac_db} not found" exit 1 fi -if (( ${#pkg_dir[@]} != 1 )); then - error "%d entries for package %s found in pacman database" \ - ${#pkg_dir[@]} "${pkg_name}" - msg2 "%s" "${pkg_dir[@]}" - exit 1 -fi - -if [[ ! -d $pkg_dir ]]; then - error "package %s is found in pacman database," "${pkg_name}" - plain " but '%s' is not a directory" "${pkg_dir}" - exit 1 -fi - -# -# Begin -# -msg "Package: ${pkg_namver}" -work_dir=$(mktemp -d "${TMPDIR:-/tmp}/bacman.XXXXXXXXXX") -cd "$work_dir" || exit 1 - -# -# File copying -# -msg2 "Copying package files..." - -while read i; do - if [[ -z $i ]]; then - continue +# Assemble a single package: $1 = pkgname +fakebuild() { + pkg_name="$1" + pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-])) + pkg_namver=("${pkg_dir[@]##*/}") + + # Checks database for specified package + if (( ${#pkg_dir[@]} != 1 )); then + error "%d entries for package %s found in pacman database" \ + ${#pkg_dir[@]} "${pkg_name}" + msg2 "%s" "${pkg_dir[@]}" + exit 1 fi - - if [[ $i == %+([A-Z])% ]]; then - current=$i - continue + if [[ ! -d $pkg_dir ]]; then + error "package %s is found in pacman database," "${pkg_name}" + plain " but '%s' is not a directory" "${pkg_dir}" + exit 1 fi - case "$current" in - %FILES%) - local_file="/$i" - package_file="$work_dir/$i" + # Create working directory + msg "Package: ${pkg_namver}" + work_dir=$(mktemp -d "${work_dir_root}.XXXXXXXXXX") + cd "$work_dir" || exit 1 - if [[ ! -e $local_file ]]; then - warning "package file $local_file is missing" - continue - fi - ;; - - %BACKUP%) - # Get the MD5 checksum. - original_md5="${i##*$'\t'}" - # Strip the md5sum after the tab. - i="${i%$'\t'*}" - local_file="/$i.pacnew" - package_file="$work_dir/$i" - - # Include unmodified .pacnew files. - local_md5="$(md5sum "$local_file" | cut -d' ' -f1)" - if [[ $INCLUDE_PACNEW == 'n' ]] \ - || [[ ! -e $local_file ]] \ - || [[ $local_md5 != $original_md5 ]]; then - # Warn about modified files. - local_md5="$(md5sum "/$i" | cut -d' ' -f1)" - if [[ $local_md5 != $original_md5 ]]; then - warning "package file /$i has been modified" - fi - # Let the normal file be included in the %FILES% list. - continue - fi - ;; + # Assemble list of files which belong to the package and tar them + msg2 "Copying package files..." + while read i; do + if [[ -z $i ]]; then + continue + fi - *) + if [[ $i == %+([A-Z])% ]]; then + current=$i continue - ;; - esac + fi - ret=0 - bsdtar -cnf - -s'/.pacnew$//' "$local_file" 2> /dev/null | bsdtar -xpf - 2> /dev/null + case "$current" in + %FILES%) + local_file="/$i" + package_file="$work_dir/$i" + + if [[ ! -e $local_file ]]; then + warning "package file $local_file is missing" + continue + fi + ;; + + %BACKUP%) + # Get the MD5 checksum. + original_md5="${i##*$'\t'}" + # Strip the md5sum after the tab. + i="${i%$'\t'*}" + local_file="/$i.pacnew" + package_file="$work_dir/$i" + + # Include unmodified .pacnew files. + local_md5="$(md5sum "$local_file" | cut -d' ' -f1)" + if [[ $INCLUDE_PACNEW == 'n' ]] \ + || [[ ! -e $local_file ]] \ + || [[ $local_md5 != $original_md5 ]]; then + # Warn about modified files. + local_md5="$(md5sum "/$i" | cut -d' ' -f1)" + if [[ $local_md5 != $original_md5 ]]; then + warning "package file /$i has been modified" + fi + # Let the normal file be included in the %FILES% list. + continue + fi + ;; - # Workaround to bsdtar not reporting a missing file as an error - if ! [[ -e $package_file || -L $package_file ]]; then - error "unable to add $local_file to the package" - plain " If your user does not have permission to read this file, then" - plain " you will need to run $myname as root." + *) + continue + ;; + esac + + # Tar files + ret=0 + bsdtar -cnf - -s'/.pacnew$//' "$local_file" 2> /dev/null | bsdtar -xpf - 2> /dev/null + # Workaround to bsdtar not reporting a missing file as an error + if ! [[ -e $package_file || -L $package_file ]]; then + error "unable to add $local_file to the package" + plain " If your user does not have permission to read this file, then" + plain " you will need to run $myname as root." + rm -rf "$work_dir" + exit 1 + fi + done < "$pkg_dir"/files + + ret=$? + if (( ret )); then rm -rf "$work_dir" exit 1 fi -done < "$pkg_dir"/files -ret=$? -if (( ret )); then - rm -rf "$work_dir" - exit 1 -fi + # Calculate package size + pkg_size=$(du -sk | awk '{print $1 * 1024}') -pkg_size=$(du -sk | awk '{print $1 * 1024}') - -# -# .PKGINFO stuff -# TODO adopt makepkg's write_pkginfo() into this or scripts/library -# -msg2 "Generating .PKGINFO metadata..." -echo "# Generated by $myname $myver" > .PKGINFO -if [[ $INFAKEROOT == "1" ]]; then - echo "# Using $(fakeroot -v)" >> .PKGINFO -fi -echo "# $(LC_ALL=C date)" >> .PKGINFO -echo "#" >> .PKGINFO - -while read i; do - if [[ -z $i ]]; then - continue; + # Reconstruct .PKGINFO from database + # TODO adopt makepkg's write_pkginfo() into this or scripts/library + msg2 "Generating .PKGINFO metadata..." + echo "# Generated by $myname $myver" > .PKGINFO + if [[ $INFAKEROOT == "1" ]]; then + echo "# Using $(fakeroot -v)" >> .PKGINFO fi - - if [[ $i == %+([A-Z])% ]]; then - current=$i - continue + echo "# $(LC_ALL=C date)" >> .PKGINFO + echo "#" >> .PKGINFO + while read i; do + if [[ -z $i ]]; then + continue; + fi + if [[ $i == %+([A-Z])% ]]; then + current=$i + continue + fi + + case "$current" in + # desc + %NAME%) + echo "pkgname = $i" >> .PKGINFO + ;; + %VERSION%) + echo "pkgver = $i" >> .PKGINFO + ;; + %DESC%) + echo "pkgdesc = $i" >> .PKGINFO + ;; + %URL%) + echo "url = $i" >> .PKGINFO + ;; + %LICENSE%) + echo "license = $i" >> .PKGINFO + ;; + %ARCH%) + echo "arch = $i" >> .PKGINFO + pkg_arch="$i" + ;; + %BUILDDATE%) + echo "builddate = $(date -u "+%s")" >> .PKGINFO + ;; + %PACKAGER%) + echo "packager = $pkg_pkger" >> .PKGINFO + ;; + %SIZE%) + echo "size = $pkg_size" >> .PKGINFO + ;; + %GROUPS%) + echo "group = $i" >> .PKGINFO + ;; + %REPLACES%) + echo "replaces = $i" >> .PKGINFO + ;; + %DEPENDS%) + echo "depend = $i" >> .PKGINFO + ;; + %OPTDEPENDS%) + echo "optdepend = $i" >> .PKGINFO + ;; + %CONFLICTS%) + echo "conflict = $i" >> .PKGINFO + ;; + %PROVIDES%) + echo "provides = $i" >> .PKGINFO + ;; + %BACKUP%) + # Strip the md5sum after the tab + echo "backup = ${i%%$'\t'*}" >> .PKGINFO + ;; + esac + done < <(cat "$pkg_dir"/{desc,files}) + + comp_files=".PKGINFO" + + # Add instal file if present + if [[ -f $pkg_dir/install ]]; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" + comp_files+=" .INSTALL" + fi + if [[ -f $pkg_dir/changelog ]]; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" + comp_files+=" .CHANGELOG" fi - case "$current" in - # desc - %NAME%) - echo "pkgname = $i" >> .PKGINFO - ;; - %VERSION%) - echo "pkgver = $i" >> .PKGINFO - ;; - %DESC%) - echo "pkgdesc = $i" >> .PKGINFO - ;; - %URL%) - echo "url = $i" >> .PKGINFO - ;; - %LICENSE%) - echo "license = $i" >> .PKGINFO - ;; - %ARCH%) - echo "arch = $i" >> .PKGINFO - pkg_arch="$i" - ;; - %BUILDDATE%) - echo "builddate = $(date -u "+%s")" >> .PKGINFO - ;; - %PACKAGER%) - echo "packager = $pkg_pkger" >> .PKGINFO - ;; - %SIZE%) - echo "size = $pkg_size" >> .PKGINFO - ;; - %GROUPS%) - echo "group = $i" >> .PKGINFO - ;; - %REPLACES%) - echo "replaces = $i" >> .PKGINFO - ;; - %DEPENDS%) - echo "depend = $i" >> .PKGINFO - ;; - %OPTDEPENDS%) - echo "optdepend = $i" >> .PKGINFO - ;; - %CONFLICTS%) - echo "conflict = $i" >> .PKGINFO - ;; - %PROVIDES%) - echo "provides = $i" >> .PKGINFO - ;; - - # files - %BACKUP%) - # Strip the md5sum after the tab - echo "backup = ${i%%$'\t'*}" >> .PKGINFO - ;; - esac -done < <(cat "$pkg_dir"/{desc,files}) - -comp_files=".PKGINFO" - -if [[ -f $pkg_dir/install ]]; then - cp "$pkg_dir/install" "$work_dir/.INSTALL" - comp_files+=" .INSTALL" -fi -if [[ -f $pkg_dir/changelog ]]; then - cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" - comp_files+=" .CHANGELOG" -fi + # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL + chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null + chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null -# -# Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL -# -chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null -chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null + # Generate the package + msg2 "Generating the package..." -# -# Generate the package -# -msg2 "Generating the package..." - -pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" -ret=0 - -# TODO: Maybe this can be set globally for robustness -shopt -s -o pipefail -bsdtar -cf - $comp_files * | -case "$PKGEXT" in - *tar.gz) gzip -c -f -n ;; - *tar.bz2) bzip2 -c -f ;; - *tar.xz) xz -c -z - ;; - *tar.Z) compress -c -f ;; - *tar) cat ;; - *) warning "'%s' is not a valid archive extension." \ - "$PKGEXT"; cat ;; -esac > "${pkg_file}"; ret=$? - -if (( ret )); then - error "Unable to write package to $pkg_dest" - plain " Maybe the disk is full or you do not have write access" + pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" + ret=0 + + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files * | + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; + *tar) cat ;; + *) warning "'%s' is not a valid archive extension." \ + "$PKGEXT"; cat ;; + esac > "${pkg_file}"; ret=$? + + # Move compressed package to destination + if (( ret )); then + error "Unable to write package to $pkg_dest" + plain " Maybe the disk is full or you do not have write access" + rm -rf "$work_dir" + exit 1 + fi + + # Clean up working directory rm -rf "$work_dir" - exit 1 -fi + msg "Done." +} -rm -rf "$work_dir" +# Run fakebuild in parralel with at maximum $MAX_JOBS jobs +# By default only run one job +MAX_JOBS=${MAX_JOBS:-1} +parallelize() { + while [[ $# -gt 0 ]] ; do + job_count=($(jobs -p)) + if [[ ${#job_count[@]} -lt $MAX_JOBS ]] ; then + fakebuild "$1" & + shift + fi + done + wait +} -msg "Done." +# Initiate assembly function +if [[ $MAX_JOBS -gt "1" ]]; then + parallelize "$@" +else + for PKG in $@; do fakebuild $PKG; done +fi exit 0 -- 2.9.2

4 109

[pacman-dev] Versioned packages
by Sergey Petrenko 23 Sep '16

23 Sep '16

Here is my attempt to solve seven years old infamous problem: https://bugs.archlinux.org/task/16702 Patch won't solve problem out of the box, a small changes in kernel PKGBUILD will be required, but only concerning install part. Idea behind patch is pretty simple: 1) Configure list of packages and number of old versions pacman should try to preserve. 2) When upgading to new version, keep old in place, if it has no file conflicts with new one, and mark it as `archived`, remove oldest `archived` version instead. Most of time pacman treats `archived` packages as if they aren't installed. For now it won't check package conflicts and dependencies, only file conflicts with newer versions. It's only an outline of full solution, proof of concept to illustrate the idea. I'd like to hear opinion of community whether this problem should be solved at all, or is it more like a feature of ArchLinux, and if it should, whether such approach suits ArchLinux's philosophy.

6 16

[pacman-dev] [PATCH 1/2] Return boolean from db_populate
by Rikard Falkeborn 22 Sep '16

22 Sep '16

Since the number of packages is not used anywhere, just return a boolean to avoid the implicit cast from size_t to int in be_local.c. Use 0 as success to be consistent with db_validate. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- This patch is made on top of the "Fix Gcc overflow patch". It will apply to master directly, but the diff doesn't match fully. As suggested by Andrew after concern of casts from size_t to int, triggered by the "Fix Gcc overflow patch", change the "populate" functions to return a flag instead of the number of packages to avoid implicit casting from size_t to int in local_db_populate(). The next patch changes the sync_db_populate() function to use size_t for count in order to not implicitly cast the return value from alpm_list_count() to int. lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 3ef1975..43c6bc9 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -612,7 +612,7 @@ static int local_db_populate(alpm_db_t *db) _alpm_log(db->handle, ALPM_LOG_DEBUG, "added %zu packages to package cache for db '%s'\n", count, db->treename); - return count; + return 0; } /* Note: the return value must be freed by the caller */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 32a669d..f127ed8 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -454,6 +454,7 @@ static int sync_db_populate(alpm_db_t *db) const char *dbpath; size_t est_count; int count, fd; + int ret = 0; struct stat buf; struct archive *archive; struct archive_entry *entry; @@ -487,7 +488,7 @@ static int sync_db_populate(alpm_db_t *db) db->pkgcache = _alpm_pkghash_create(est_count); if(db->pkgcache == NULL) { db->handle->pm_errno = ALPM_ERR_MEMORY; - count = -1; + ret = -1; goto cleanup; } @@ -520,7 +521,7 @@ cleanup: if(fd >= 0) { close(fd); } - return count; + return ret; } /* This function validates %FILENAME%. filename must be between 3 and -- 2.10.0

1 1

[pacman-dev] [PATCH] Fix gcc strict-overflow error
by Rikard Falkeborn 20 Sep '16

20 Sep '16

Recent gcc (tested with 6.2.1) produces the following error when compiling with both --enable-warningflags and --enable-debug. In particular, it seems it is the combination of GCC_STACK_PROTECT_LIB and -Wstrict-overflow=5 produces the error. be_local.c:609:4: error: assuming signed overflow does not occur when simplifying conditional [-Werror=strict-overflow] if(count > 0) { Fix this by changing the type of count from int to size_t, which is fine since count is never negative. Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- lib/libalpm/be_local.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index cc2d8ba..3ef1975 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -501,7 +501,7 @@ version_error: static int local_db_populate(alpm_db_t *db) { size_t est_count; - int count = 0; + size_t count = 0; struct stat buf; struct dirent *ent = NULL; const char *dbpath; @@ -607,9 +607,9 @@ static int local_db_populate(alpm_db_t *db) closedir(dbdir); if(count > 0) { - db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp); + db->pkgcache->list = alpm_list_msort(db->pkgcache->list, count, _alpm_pkg_cmp); } - _alpm_log(db->handle, ALPM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n", + _alpm_log(db->handle, ALPM_LOG_DEBUG, "added %zu packages to package cache for db '%s'\n", count, db->treename); return count; -- 2.9.3

3 2

[pacman-dev] [PATCH] repo-add: fix error in directories with a space in their name
by Allan McRae 09 Sep '16

09 Sep '16

From: Fabio Castell <webreg(a)vbsimple.net> Fixes FS#50285 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index d62f9c4..4da2c31 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -617,7 +617,7 @@ remove() { rotate_db() { dirname=${LOCKFILE%/*} - pushd $dirname >/dev/null + pushd "$dirname" >/dev/null for repo in "db" "files"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} -- 2.9.3

1 0

[pacman-dev] (no subject)
by ivy.foster＠gmail.com 09 Sep '16

09 Sep '16

For now, I'm just sending in the malloc patch (which, of course, now only frees variables that exist in the original source, not ones invented for the previous patches). To quickly recap an irc conversation with agregory, it looks like implementing checks before overwriting the db is more complicated if doing it properly (that is, downloading the newdb to a tempfile, rather than moving the olddb out of the way and then moving it back if need be). The downloader curl_download_internal (via _alpm_download) seems to expect a directory argument, rather than a filename (it appends the remote filename to the local path). I'll definitely try the checks patch again, though probably not in the next couple of days. Ivy

1 1

[pacman-dev] Do not clobber db if new db is invalid, close a couple "TODO" leaks
by ivy.foster＠gmail.com 08 Sep '16

08 Sep '16

Patch 1 is an attempt to close #46107 [1]. In lib/libalpm/be_sync.c, pacman 1) backs up the old db, 2) procedes as normal, 3) if new db is valid, deletes backup; if not, restores backup. While working on patch 1, I noticed a bunch of TODOs that mentioned the syncpath not being freed or umask reset if pacman ran out of memory for a MALLOC. Patch 2 fixes them. [1]: https://bugs.archlinux.org/task/46107?project=3 As always, comments welcome. Enjoy! (-: Ivy

3 6

[pacman-dev] [PATCH] Option to pass packages' versions to hook. Linearize code in _alpm_hook_trigger_match_pkg.
by Sergey Petrenko 05 Sep '16

05 Sep '16

--- lib/libalpm/hook.c | 102 ++++++++++++++++++++---------- test/pacman/tests/TESTS | 1 + test/pacman/tests/hook-target-versions.py | 47 ++++++++++++++ 3 files changed, 118 insertions(+), 32 deletions(-) create mode 100644 test/pacman/tests/hook-target-versions.py diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index ccde225..cc6c8bd 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -55,7 +55,7 @@ struct _alpm_hook_t { char **cmd; alpm_list_t *matches; alpm_hook_when_t when; - int abort_on_fail, needs_targets; + int abort_on_fail, needs_targets, needs_versions; }; struct _alpm_hook_cb_ctx { @@ -90,7 +90,7 @@ static void _alpm_hook_free(struct _alpm_hook_t *hook) _alpm_wordsplit_free(hook->cmd); alpm_list_free_inner(hook->triggers, (alpm_list_fn_free) _alpm_trigger_free); alpm_list_free(hook->triggers); - alpm_list_free(hook->matches); + alpm_list_free_inner(hook->matches, free); FREELIST(hook->depends); free(hook); } @@ -329,8 +329,11 @@ static int _alpm_hook_parse_cb(const char *file, int line, hook->abort_on_fail = 1; } else if(strcmp(key, "NeedsTargets") == 0) { hook->needs_targets = 1; + } else if(strcmp(key, "NeedsVersions") == 0) { + hook->needs_versions = 1; } else if(strcmp(key, "Exec") == 0) { - if((hook->cmd = _alpm_wordsplit(value)) == NULL) { + if((hook-> + cmd = _alpm_wordsplit(value)) == NULL) { if(errno == EINVAL) { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } else { @@ -456,31 +459,53 @@ static int _alpm_hook_trigger_match_file(alpm_handle_t *handle, static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, struct _alpm_hook_t *hook, struct _alpm_trigger_t *t) { - alpm_list_t *install = NULL, *upgrade = NULL, *remove = NULL; + alpm_list_t *add = NULL, *remove = NULL; if(t->op & ALPM_HOOK_OP_INSTALL || t->op & ALPM_HOOK_OP_UPGRADE) { alpm_list_t *i; for(i = handle->trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { - if(pkg->oldpkg) { - if(t->op & ALPM_HOOK_OP_UPGRADE) { - if(hook->needs_targets) { - upgrade = alpm_list_add(upgrade, pkg->name); - } else { - return 1; - } - } - } else { - if(t->op & ALPM_HOOK_OP_INSTALL) { - if(hook->needs_targets) { - install = alpm_list_add(install, pkg->name); - } else { - return 1; - } - } + + if(_alpm_fnmatch_patterns(t->targets, pkg->name) != 0) { + continue; + } + + int upgrade_match = 0, install_match = 0; + if (pkg->oldpkg) { + upgrade_match = (t->op & ALPM_HOOK_OP_UPGRADE); + } else { + install_match = (t->op & ALPM_HOOK_OP_INSTALL); + } + + if (!upgrade_match && !install_match) { + continue; + } + + if (!hook->needs_targets) { + return 1; + } + + char* output = NULL; + size_t len = strlen(pkg->name) + 1; + if (hook->needs_versions) { + if (upgrade_match) { + len += strlen(pkg->oldpkg->version) + 1; } + len += strlen(pkg->version) + 1; } + CALLOC(output, len, sizeof(char), continue); + + strcat(output, pkg->name); + if (hook->needs_versions) { + if (upgrade_match) { + strcat(output, " "); + strcat(output, pkg->oldpkg->version); + } + strcat(output, " "); + strcat(output, pkg->version); + } + + add = alpm_list_add(add, output); } } @@ -488,25 +513,38 @@ static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, alpm_list_t *i; for(i = handle->trans->remove; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(pkg && _alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { - if(!alpm_list_find(handle->trans->add, pkg, _alpm_pkg_cmp)) { - if(hook->needs_targets) { - remove = alpm_list_add(remove, pkg->name); - } else { - return 1; - } - } + + if(_alpm_fnmatch_patterns(t->targets, pkg->name) != 0) { + continue; } + + if (!hook->needs_targets) { + return 1; + } + + char* output = NULL; + size_t len = strlen(pkg->name) + 1; + if (hook->needs_versions) { + len += strlen(pkg->version) + 1; + } + CALLOC(output, len, sizeof(char), continue); + + strcat(output, pkg->name); + if (hook->needs_versions) { + strcat(output, " "); + strcat(output, pkg->version); + } + + remove = alpm_list_add(remove, output); } } /* if we reached this point we either need the target lists or we didn't * match anything and the following calls will all be no-ops */ - hook->matches = alpm_list_join(hook->matches, install); - hook->matches = alpm_list_join(hook->matches, upgrade); + hook->matches = alpm_list_join(hook->matches, add); hook->matches = alpm_list_join(hook->matches, remove); - return install || upgrade || remove; + return add || remove; } static int _alpm_hook_trigger_match(alpm_handle_t *handle, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index bd5a0b6..9443e90 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -63,6 +63,7 @@ TESTS += test/pacman/tests/hook-pkg-postinstall-trigger-match.py TESTS += test/pacman/tests/hook-pkg-remove-trigger-match.py TESTS += test/pacman/tests/hook-pkg-upgrade-trigger-match.py TESTS += test/pacman/tests/hook-target-list.py +TESTS += test/pacman/tests/hook-target-versions.py TESTS += test/pacman/tests/hook-upgrade-trigger-no-match.py TESTS += test/pacman/tests/ignore001.py TESTS += test/pacman/tests/ignore002.py diff --git a/test/pacman/tests/hook-target-versions.py b/test/pacman/tests/hook-target-versions.py new file mode 100644 index 0000000..fd6d207 --- /dev/null +++ b/test/pacman/tests/hook-target-versions.py @@ -0,0 +1,47 @@ +self.description = "Hook with NeedsTargets" + +self.add_hook("hook", + """ + [Trigger] + Type = Package + Operation = Upgrade + Target = foo + + # duplicate trigger to check that duplicate targets are removed + [Trigger] + Type = Package + Operation = Install + Target = bar + + [Trigger] + Type = File + Operation = Install + # matches files in 'file/' but not 'file/' itself + Target = somewhere/?* + + [Action] + When = PreTransaction + Exec = bin/sh -c 'while read -r tgt; do printf "%s\\n" "$tgt"; done > var/log/hook-output' + NeedsTargets + NeedsVersions + """); + +lp1 = pmpkg("foo") +lp1.files = ["file/foo"] +self.addpkg2db("local", lp1) + +p1 = pmpkg("foo", "2.0-1") +p1.files = ["file/foo"] +self.addpkg(p1) + +p2 = pmpkg("bar") +p2.files = ["file/bar"] +self.addpkg(p2) + +self.args = "-U %s %s" % (p1.filename(), p2.filename()) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=foo") +self.addrule("""FILE_CONTENTS=var/log/hook-output|bar 1.0-1 +foo 1.0-1 2.0-1 +""") -- 2.9.3

4 7