- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, release/5.2.x, created. v5.2.1
by Allan McRae 01 Nov '19

01 Nov '19

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, release/5.2.x has been created at f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.2.1, created. v5.2.1
by Allan McRae 01 Nov '19

01 Nov '19

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 annotated tag, v5.2.1 has been created at 41ca4254dea45934fff98e3528621e43eb970cd1 (tag) tagging f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) replaces v5.2.0 tagged by Allan McRae on Fri Nov 1 11:05:25 2019 +1000 - Log ----------------------------------------------------------------- v5.2.1 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAl27hNUACgkQ+Z/+D+rp mb0HhggAn+jfI/ChONAE9nHx6n02s64cGarDBQ5JsUodr5VXNVfbnObI+KTxCgZI K16uAQwkL9kL+ssGMaPLzotna4wOVWzzJP2Ty7mco8cqaGOqHCS2m8n03gWKO+wF 6hL5ICXyNhJ+NOy5VKAYqEmZNS1yyxweJojHAa0nxwW23L8YorgSofO5hZPQeb22 DKA46ThoHn7i4nDxytY7gEiOav8nUr/sPq5JJvBdqNybTxghMwwPWLPC5n/kYYBd H5IAeiC25CAEBlRqnfeMSBi07cBMwoBOk7UwiURwY6Zu7XQ7Zwe0upB/o3u4HrEt bmAmswrp0vtFIAHv+0y08CKlU2t3zQ== =Miwf -----END PGP SIGNATURE----- Allan McRae (9): Fix distribution of meson files Update completion for -F changes Remove --force from completion Update copyright years Fix segfault importing PGP key for pacman -U operations Comma fail Update NEWS for pacman-5.2.1 Pull latest translations from Transifex Release 5.2.1 Eli Schwartz (5): meson: fix inodecmd for darwin/bsd makepkg: protect against unexpected whitespace in filenames makepkg: do not count hard links multiple times when calculating pkg size makepkg: only run --clean actions if we built a package autotools: be more templated when getting list of doc dist files Evangelos Foutras (1): Add pacman-conf(8) to the documentation index Nick Cao (1): Fix compression of package databases with zstd morganamilo (1): makepkg: don't warn when PACKAGER is unset ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-17-gf6564377
by Allan McRae 01 Nov '19

01 Nov '19

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 f6564377a2b0a0dd6294fb366a3f91a31142e124 (commit) via c9613f3a0ac0ecc3e7c3f99913eee1b49bf2bab1 (commit) via fca2f7e5984f794cdd714a85df86e378eb0fbf5e (commit) from 4d76cf6f074854c6c7fbd6b3a279c1a0c123d8c8 (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 f6564377a2b0a0dd6294fb366a3f91a31142e124 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 10:57:09 2019 +1000 Release 5.2.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c9613f3a0ac0ecc3e7c3f99913eee1b49bf2bab1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 10:54:12 2019 +1000 Pull latest translations from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fca2f7e5984f794cdd714a85df86e378eb0fbf5e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 1 09:26:54 2019 +1000 Update NEWS for pacman-5.2.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 11 +++++++++++ configure.ac | 4 ++-- doc/index.asciidoc | 1 + meson.build | 4 ++-- scripts/po/bg.po | 5 +++-- scripts/po/br.po | 4 ++-- scripts/po/ca.po | 5 +++-- scripts/po/cs.po | 5 +++-- scripts/po/da.po | 5 +++-- scripts/po/de.po | 5 +++-- scripts/po/el.po | 5 +++-- scripts/po/en_GB.po | 5 +++-- scripts/po/eo.po | 4 ++-- scripts/po/es.po | 5 +++-- scripts/po/es_419.po | 4 ++-- scripts/po/eu.po | 4 ++-- scripts/po/eu_ES.po | 4 ++-- scripts/po/fi.po | 4 ++-- scripts/po/fr.po | 5 +++-- scripts/po/gl.po | 4 ++-- scripts/po/hu.po | 5 +++-- scripts/po/id.po | 4 ++-- scripts/po/it.po | 5 +++-- scripts/po/ja.po | 5 +++-- scripts/po/ko.po | 5 +++-- scripts/po/lt.po | 11 ++++++----- scripts/po/nb.po | 5 +++-- scripts/po/nl.po | 5 +++-- scripts/po/pacman-scripts.pot | 4 ++-- scripts/po/pl.po | 5 +++-- scripts/po/pt.po | 4 ++-- scripts/po/pt_BR.po | 5 +++-- scripts/po/ro.po | 4 ++-- scripts/po/ru.po | 5 +++-- scripts/po/sk.po | 4 ++-- scripts/po/sl.po | 4 ++-- scripts/po/sr.po | 5 +++-- scripts/po/sr(a)latin.po | 5 +++-- scripts/po/sv.po | 5 +++-- scripts/po/tr.po | 5 +++-- scripts/po/uk.po | 5 +++-- scripts/po/zh_CN.po | 5 +++-- scripts/po/zh_TW.po | 5 +++-- src/pacman/po/hr.po | 12 ++++++------ src/pacman/po/lt.po | 33 ++++++++++++++++++--------------- src/pacman/po/pt_BR.po | 4 ++-- 46 files changed, 149 insertions(+), 108 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Update NEWS for pacman-5.2.1
by Allan McRae 31 Oct '19

31 Oct '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I will release 5.2.1 off the master branch when I next need to procrastinate writing a fellowship application (could be in a day, could be in an hour...). Then the release/5.2.x branch will be cut. NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index 9ceff259..6510de6d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,16 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +5.2.1 - fix segfault on importing PGP keys for -U operations + - fix distribution of meson files + - fix inode command for darwin/bsd + - distribute all documentation files + - update bash/zsh completion for -F changes, remove --force + - makepkg: + - fix calculation of package sizes in presence of hardlinks + - do not warn about PACKAGER format if not set + - only run --clean when a package is built + - repo-add: + - fix compression of databases with zstd 5.2.0 - completely remove delta support (CVE-2019-18183) - add support to pacman and pacman-key for downloading PGP signing keys using the WKD protocol (FS#63171) -- 2.23.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-14-g4d76cf6f
by Allan McRae 30 Oct '19

30 Oct '19

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 4d76cf6f074854c6c7fbd6b3a279c1a0c123d8c8 (commit) from 866a5cd431e35803f85ad7a8045f0050c0b240e5 (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 4d76cf6f074854c6c7fbd6b3a279c1a0c123d8c8 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 30 14:24:47 2019 +1000 Comma fail ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/util/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-13-g866a5cd4
by Allan McRae 30 Oct '19

30 Oct '19

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 866a5cd431e35803f85ad7a8045f0050c0b240e5 (commit) via 5c2059db28cc8d0dfa96f288517f2e10d1b6137a (commit) via 0272fca993718460bf7ecb7fdc3ca7dad1c7e6cd (commit) via a745d97c174ef1d85649b2a8ad7ca22e3dea9e58 (commit) via 99639dc27c4c037b3fe7ddf2b77d036a7332b5e3 (commit) from ae5cf26b5b5b92c9f68b5b29787e7d636f334c12 (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 866a5cd431e35803f85ad7a8045f0050c0b240e5 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Oct 24 02:54:31 2019 -0400 autotools: be more templated when getting list of doc dist files Distribute asciidoc sources for all manpages instead of remembering to add files to both variables. Fixes regression in 377d47142f7aaa01ca782e6587f2d4caf663865b which broke building the website from a dist tarball: make: *** No rule to make target 'pacman-conf.8.html', needed by 'html'. Stop. (Technically this regression is already fixed by commit 942b909829d529409216939b36af11e8480726f5, but this is just going to keep happening, I suspect, so we should fix the root cause.) Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5c2059db28cc8d0dfa96f288517f2e10d1b6137a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Oct 28 11:37:39 2019 -0400 makepkg: only run --clean actions if we built a package Fixes issue where users were allowed to run cleanup while running --geninteg or --printsrcinfo or --packagelist, thus mixing invalid responses into stdout. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0272fca993718460bf7ecb7fdc3ca7dad1c7e6cd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 27 03:41:46 2019 -0400 makepkg: do not count hard links multiple times when calculating pkg size Exclude files with hardlinks when cat'ing all the files, and do a second run to look at each file with hardlinks, keep track of the ones we've already operated on, and only cat each inode once. Then use "wc -c" to get the size of all (deduplicated) files the same way we were already doing. Original-patch-by: Ronan Pigott <rpigott(a)berkeley.edu> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a745d97c174ef1d85649b2a8ad7ca22e3dea9e58 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 27 03:05:10 2019 -0400 makepkg: protect against unexpected whitespace in filenames zipman: read -r protects against those evil manpages whose filenames contain backslash escapes, (muahahaha?) IFS= read protects against filenames with: - leading whitespace (but no one is actually stupid enough to configure their MAN_DIRS=() in makepkg.conf with such silly directories, *right*?) - trailing whitespace (but likewise, no one should be stupid enough to write an uncompressed manpage for section '1 ' or something) Also fix several other cases where we read filenames without protecting against surrounding whitespace, or without using null-delimited filenames when we could trivially do so. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 99639dc27c4c037b3fe7ddf2b77d036a7332b5e3 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 27 02:11:28 2019 -0400 meson: fix inodecmd for darwin/bsd The BSD stat command uses %N, not %n, and was incorrectly ported to meson. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 15 +------ meson.build | 4 +- scripts/Makefile.am | 1 + scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 6 +-- scripts/libmakepkg/tidy/zipman.sh.in | 8 ++-- .../{lint_config/ext.sh.in => util/dirsize.sh.in} | 48 ++++++++++------------ scripts/libmakepkg/util/meson.build | 1 + scripts/makepkg.sh.in | 10 ++--- 9 files changed, 41 insertions(+), 54 deletions(-) copy scripts/libmakepkg/{lint_config/ext.sh.in => util/dirsize.sh.in} (54%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-8-gae5cf26b
by Allan McRae 29 Oct '19

29 Oct '19

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 ae5cf26b5b5b92c9f68b5b29787e7d636f334c12 (commit) via dc55701132abf51de2f4289488f416a4c07afecf (commit) from f37a3752b38473236720e01230392377a42249e6 (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 ae5cf26b5b5b92c9f68b5b29787e7d636f334c12 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 24 23:38:50 2019 +1000 Fix segfault importing PGP key for pacman -U operations Use after free. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dc55701132abf51de2f4289488f416a4c07afecf Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Thu Oct 24 10:16:04 2019 +0300 Add pacman-conf(8) to the documentation index Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.asciidoc | 1 + lib/libalpm/be_package.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/1] makepkg: send output from clean_up to stderr
by Christian Hesse 29 Oct '19

29 Oct '19

From: Christian Hesse <mail(a)eworm.de> This is required when redirecting checksums to PKGBUILD: makepkg --clean --geninteg >> PKGBUILD Signed-off-by: Christian Hesse <mail(a)eworm.de> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 183e1a3e..3017f31b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1101,7 +1101,7 @@ while [[ $1 ]]; do done # setup signal traps -trap 'clean_up' 0 +trap 'clean_up >&2' 0 for signal in TERM HUP QUIT; do trap "trap_exit $signal \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" done

2 2

[pacman-dev] [PATCH] makepkg: only run --clean actions if we built a package
by Eli Schwartz 28 Oct '19

28 Oct '19

Fixes issue where users were allowed to run cleanup while running --geninteg or --printsrcinfo or --packagelist, thus mixing invalid responses into stdout. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d217d0a4..c49ac57a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -133,7 +133,7 @@ clean_up() { rm "$logpipe" fi - if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then + if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && BUILDPKG && CLEANUP )); then local pkg file # If it's a clean exit and -c/--clean has been passed... -- 2.23.0

1 0

Re: [pacman-dev] [MAKEPKG][PATCH] makepkg-do-not-count-hard-links-multiple-times (INODESIZECMD) + meson
by Allan McRae 28 Oct '19

28 Oct '19

On 28/10/19 3:01 am, la.luge(a)free.fr wrote: > Uses stat -c '%i %s' and sort -u to count hardlink one time. > Gives same result than cat | wc -c without harlinks and good result with hardlinks. > Doesn't use filenames > Forwarding to the pacman-dev list. My concern is that this is using the same information that du does to get the file size. And we have had repeated issue after issue for calculating file sizes with du, though we are not entirely sure of the cause (weird filesystem behaviour being the best guess). So I'd prefer just to stick to wc -c. >>From fc44b2a226dea56104819ff7ac05e90af01b3316 Mon Sep 17 00:00:00 2001 > From: nenesse <la.luge(a)free.fr> > Date: Sun, 27 Oct 2019 17:49:38 +0100 > Subject: [PATCH] makepkg-do-not-count-hard-links-multiple-times Uses stat -c > '%i %s' and sort -u to count hardlink one time. Gives same result than cat | > wc -c without hardlinks and good result with hardlinks. Doesn't use filenames > To: mailto:pacman-dev@archlinux.org > > --- > build-aux/edit-script.sh.in | 1 + > configure.ac | 5 ++++ > meson.build | 5 ++++ > scripts/Makefile.am | 1 + > scripts/libmakepkg/util/dirsize.sh.in | 34 +++++++++++++++++++++++++++ > scripts/makepkg.sh.in | 2 +- > 6 files changed, 47 insertions(+), 1 deletion(-) > create mode 100644 scripts/libmakepkg/util/dirsize.sh.in > > diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in > index 640d32f8..8bd8205d 100644 > --- a/build-aux/edit-script.sh.in > +++ b/build-aux/edit-script.sh.in > @@ -19,6 +19,7 @@ mode=$3 > -e "s|@TEMPLATE_DIR[@]|@TEMPLATE_DIR@|g" \ > -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ > -e "s|@INODECMD[@]|@INODECMD@|g" \ > + -e "s|@INODESIZECMD[@]|@INODESIZECMD@|g" \ > -e "s|@FILECMD[@]|@FILECMD@|g" \ > -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \ > -e "s|@SEDPATH[@]|@SEDPATH@|g" \ > diff --git a/configure.ac b/configure.ac > index d68b3591..ddc93020 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -371,6 +371,7 @@ GCC_VISIBILITY_CC > # Host-dependant definitions > DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i" > INODECMD="stat -c '%i %n'" > +INODESIZECMD="stat -c '%i %s'" > STRIP_BINARIES="--strip-all" > STRIP_SHARED="--strip-unneeded" > STRIP_STATIC="--strip-debug" > @@ -378,6 +379,7 @@ case "${host_os}" in > *bsd*) > INODECMD="stat -f '%i %N'" > DEFAULT_SEDINPLACEFLAGS=" -i \"\"" > + INODESIZECMD="stat -f '%i %z'" > ;; > darwin*) > host_os_darwin=yes > @@ -386,11 +388,13 @@ case "${host_os}" in > STRIP_BINARIES="" > STRIP_SHARED="-S" > STRIP_STATIC="-S" > + INODECMD="/usr/bin/stat -f '%i %z'" > ;; > esac > AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") > AC_PATH_PROGS([SEDPATH], [sed], [sed], [/usr/bin$PATH_SEPARATOR/bin] ) > AC_SUBST(INODECMD) > +AC_SUBST(INODESIZECMD) > AC_SUBST(STRIP_BINARIES) > AC_SUBST(STRIP_SHARED) > AC_SUBST(STRIP_STATIC) > @@ -576,6 +580,7 @@ ${PACKAGE_NAME}: > Architecture : ${CARCH} > Host Type : ${CHOST} > File inode command : ${INODECMD} > + File inode/size command: ${INODESIZECMD} > In-place sed command : ${SEDPATH} ${SEDINPLACEFLAGS} > File seccomp command : ${FILECMD} > > diff --git a/meson.build b/meson.build > index c5704efe..99d15ed6 100644 > --- a/meson.build > +++ b/meson.build > @@ -223,6 +223,7 @@ add_project_arguments('-include', 'config.h', language : 'c') > filecmd = 'file' > default_sedinplaceflags = ' --follow-symlinks -i' > inodecmd = 'stat -c \'%i %n\'' > +inodesizecmd = 'stat -c \'%i %s\'' > strip_binaries = '--strip-all' > strip_shared = '--strip-unneeded' > strip_static = '--strip-debug' > @@ -237,12 +238,14 @@ endif > os = host_machine.system() > if os.startswith('darwin') > inodecmd = '/usr/bin/stat -f \'%i %n\'' > + inodesizecmd = '/usr/bin/stat -f \'%i %z\'' > default_sedinplaceflags = ' -i \'\'' > strip_binaries = '' > strip_shared = '-s' > strip_static = '-s' > elif os.contains('bsd') or os == 'dragonfly' > inodecmd = 'stat -f \'%i %n\'' > + inodesizecmd = 'stat -f \'%i %z\'' > default_sedinplaceflags = ' -i \'\'' > endif > > @@ -276,6 +279,7 @@ substs.set('BUILDSCRIPT', BUILDSCRIPT) > substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir')) > substs.set('DEBUGSUFFIX', get_option('debug-suffix')) > substs.set('INODECMD', inodecmd) > +substs.set('INODESIZECMD', inodesizecmd) > substs.set('FILECMD', filecmd) > substs.set('SEDINPLACEFLAGS', sedinplaceflags) > substs.set('SEDPATH', SED.path()) > @@ -430,6 +434,7 @@ message('\n '.join([ > ' Architecture : @0@'.format(carch), > ' Host Type : @0@'.format(chost), > ' File inode command : @0@'.format(inodecmd), > + ' File inode/size command : @0@'.format(inodesizecmd), > ' In-place sed command : @0@ @1@'.format(SED.path(), sedinplaceflags), > ' File seccomp command : @0@'.format(filecmd), > ' libalpm version : @0@'.format(libalpm_version), > diff --git a/scripts/Makefile.am b/scripts/Makefile.am > index 88e9612d..fe9fb297 100644 > --- a/scripts/Makefile.am > +++ b/scripts/Makefile.am > @@ -184,6 +184,7 @@ edit = sed \ > -e 's|@TEMPLATE_DIR[@]|$(TEMPLATE_DIR)|g' \ > -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ > -e "s|@INODECMD[@]|$(INODECMD)|g" \ > + -e "s|@INODESIZECMD[@]|$(INODESIZECMD)|g" \ > -e "s|@FILECMD[@]|$(FILECMD)|g" \ > -e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \ > -e 's|@SEDPATH[@]|$(SEDPATH)|g' \ > diff --git a/scripts/libmakepkg/util/dirsize.sh.in b/scripts/libmakepkg/util/dirsize.sh.in > new file mode 100644 > index 00000000..8f2bd09b > --- /dev/null > +++ b/scripts/libmakepkg/util/dirsize.sh.in > @@ -0,0 +1,34 @@ > +#!/usr/bin/bash > +# > +# dirsize.sh - calculate size of all files in a directory > +# > +# Copyright (c) 2019 Pacman Development Team <pacman-dev(a)archlinux.org> > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > +# > + > +[[ -n "$LIBMAKEPKG_UTIL_DIRSIZE_SH" ]] && return > +LIBMAKEPKG_UTIL_DIRSIZE_SH=1 > + > +LIBRARY=${LIBRARY:-'/usr/share/makepkg'} > + > +dirsize() { > + local size=0 sz _ > + > + while read _ sz; do > + size=$(( size + sz )) > + done < <(find . -type f -exec @INODESIZECMD@ -- {} + 2>/dev/null|sort -u) > + > + echo $size > +} > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 997c8668..f7a9459b 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -584,7 +584,7 @@ write_kv_pair() { > } > > write_pkginfo() { > - local size="$(find . -type f -exec cat {} + 2>/dev/null | wc -c)" > + local size="$(dirsize)" > > merge_arch_attrs > >

1 0