November 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] repo-add: use wc -c on stdin instead of file to avoid use of cut
by Ethan Sommer 07 Nov '19

07 Nov '19

Redirect file to stdin so wc -c doesn't print a file name that needs to be stripped. Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/repo-add.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index caf1232d..7b2a9edb 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -273,7 +273,7 @@ db_write_entry() { error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 fi - pgpsigsize=$(wc -c "$pkgfile.sig" | cut -d' ' -f1) + pgpsigsize=$(wc -c < "$pkgfile.sig") if (( pgpsigsize > 16384 )); then error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig" return 1 @@ -282,7 +282,7 @@ db_write_entry() { pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n') fi - csize=$(wc -c "$pkgfile" | cut -d' ' -f1) + csize=$(wc -c < "$pkgfile") # compute checksums msg2 "$(gettext "Computing checksums...")" -- 2.23.0

2 1

[pacman-dev] [PATCH] pacman: make exact_file an int
by morganamilo 07 Nov '19

07 Nov '19

We only ever use it as a bool, no need to pass a char* around. Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/files.c b/src/pacman/files.c index 19191dd8..3b6dc23b 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -58,7 +58,7 @@ static void print_owned_by(alpm_db_t *db, alpm_pkg_t *pkg, char *filename) alpm_pkg_get_version(pkg), colstr->nocolor); } -static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, char *exact_file) +static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, int exact_file) { alpm_db_t *db_local = alpm_get_localdb(config->handle); const colstr_t *colstr = &config->colstr; @@ -71,7 +71,7 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, ch } } else if(config->quiet) { printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); - } else if(exact_file != NULL) { + } else if(exact_file) { alpm_list_t *ml; for(ml = match; ml; ml = alpm_list_next(ml)) { char *filename = ml->data; @@ -104,9 +104,9 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int found = 0; regex_t reg; size_t len = strlen(targ); - char *exact_file = strchr(targ, '/'); + int exact_file = strchr(targ, '/') != NULL; - if(exact_file != NULL) { + if(exact_file) { while(len > 1 && targ[0] == '/') { targ++; len--; @@ -131,7 +131,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { alpm_filelist_t *files = alpm_pkg_get_files(pkg); alpm_list_t *match = NULL; - if(exact_file != NULL) { + if(exact_file) { if (regex) { for(size_t f = 0; f < files->count; f++) { char *c = files->files[f].name; -- 2.23.0

2 1

[pacman-dev] [PATCH] Remove "Generated from ...; do not edit by hand" from scripts
by Allan McRae 06 Nov '19

06 Nov '19

This is a useless piece of information. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- build-aux/edit-script.sh.in | 1 - scripts/Makefile.am | 3 +-- scripts/makepkg-template.pl.in | 1 - scripts/makepkg.sh.in | 1 - scripts/pacman-db-upgrade.sh.in | 1 - scripts/pacman-key.sh.in | 1 - scripts/repo-add.sh.in | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 7423a223..661c22d5 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -20,7 +20,6 @@ mode=$3 -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ -e "s|@FILECMD[@]|@FILECMD@|g" \ - -e "s|@configure_input[@]|Generated from ${input##*/}; do not edit by hand.|g" \ "$input" >"$output" if [[ $mode ]]; then diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3cb6c133..191fc3d3 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -186,8 +186,7 @@ edit = sed \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@FILECMD[@]|$(FILECMD)|g" \ - -e 's|@SCRIPTNAME[@]|$@|g' \ - -e 's|@configure_input[@]|Generated from $<; do not edit by hand.|g' + -e 's|@SCRIPTNAME[@]|$@|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index da5eba1b..762dd4be 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -1,6 +1,5 @@ #!/usr/bin/perl # makepkg-template - template system for makepkg -# @configure_input@ # # Copyright (c) 2013-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 22df1b9f..2deb61da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,7 +1,6 @@ #!/bin/bash # # makepkg - make packages compatible for use with pacman -# @configure_input@ # # Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 5d65bc88..4a904b6d 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -1,7 +1,6 @@ #!/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format -# @configure_input@ # # Copyright (c) 2010-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 366fd205..613b3514 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -2,7 +2,6 @@ # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian -# @configure_input@ # # Copyright (c) 2010-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index caf1232d..f7dd8948 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -2,7 +2,6 @@ # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -# @configure_input@ # # Copyright (c) 2006-2019 Pacman Development Team <pacman-dev(a)archlinux.org> # -- 2.23.0

1 0

[pacman-dev] [PATCH] scripts/library: remove human_to_size
by Eli Schwartz 06 Nov '19

06 Nov '19

pkgdelta was the last user, and it is gone now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Makefile.am | 1 - scripts/Makefile.am | 4 --- scripts/library/README | 10 ------ scripts/library/human_to_size.sh | 51 --------------------------- scripts/meson.build | 6 ---- scripts/po/POTFILES.in | 1 - test/scripts/Makefile.am | 3 +- test/scripts/human_to_size_test.sh | 55 ------------------------------ test/scripts/meson.build | 1 - 9 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 scripts/library/README delete mode 100644 scripts/library/human_to_size.sh delete mode 100755 test/scripts/human_to_size_test.sh diff --git a/Makefile.am b/Makefile.am index c661f447..8b8b6882 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,6 @@ $(top_srcdir)/test/pacman/tests/TESTS: $(wildcard test/pacman/tests/*.py) @printf "TESTS += %s\n" $^ | LC_ALL=C sort -u > "$@" TESTS = test/scripts/parseopts_test.sh \ - test/scripts/human_to_size_test.sh \ test/scripts/makepkg-template_test.sh \ test/scripts/pacman-db-upgrade-v9.py \ test/util/vercmptest.sh diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 63d09767..1a5f0a04 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -31,13 +31,9 @@ EXTRA_DIST = \ repo-add.sh.in \ wrapper.sh.in \ $(COMPLETION_DIST) \ - $(LIBRARY) \ $(LIBMAKEPKG_DIST) \ po/meson.build -LIBRARY = \ - library/human_to_size.sh - libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ diff --git a/scripts/library/README b/scripts/library/README deleted file mode 100644 index d20f117a..00000000 --- a/scripts/library/README +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains code snippets that can be reused by multiple -scripts. A brief description of each file follows. - -human_to_size.sh: -A function to convert human readable sizes (such as "5.3 GiB") to raw byte -equivalents. base10 and base2 suffixes are supported, case sensitively. If -successful, the converted byte value is written to stdout and the function -returns 0. If an error occurs, nothing is written and the function returns 1. -Results may be inaccurate when using a broken implementation of awk, such -as mawk or busybox awk. diff --git a/scripts/library/human_to_size.sh b/scripts/library/human_to_size.sh deleted file mode 100644 index 11613207..00000000 --- a/scripts/library/human_to_size.sh +++ /dev/null @@ -1,51 +0,0 @@ -human_to_size() { - awk -v human="$1" ' - function trim(s) { - gsub(/^[[:space:]]+|[[:space:]]+$/, "", s) - return s - } - - function parse_units(units) { - if (!units || units == "B") - return 1 - if (match(units, /^.iB$/)) - return 1024 - if (match(units, /^.B$/)) - return 1000 - if (length(units) == 1) - return 1024 - - # parse failure: invalid base - return -1 - } - - function parse_scale(s) { - return index("BKMGTPE", s) - 1 - } - - function isnumeric(string) { - return match(string, /^[-+]?[[:digit:]]*(\.[[:digit:]]*)?/) - } - - BEGIN { - # peel off the leading number as the size, fail on invalid number - human = trim(human) - if (isnumeric(human)) - size = substr(human, RSTART, RLENGTH) - else - exit 1 - - # the trimmed remainder is assumed to be the units - units = trim(substr(human, RLENGTH + 1)) - - base = parse_units(units) - if (base < 0) - exit 1 - - scale = parse_scale(substr(units, 1, 1)) - if (scale < 0) - exit 1 - - printf "%d\n", size * base^scale + (size + 0 > 0 ? 0.5 : -0.5) - }' -} diff --git a/scripts/meson.build b/scripts/meson.build index 7d533f35..56f31222 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -9,10 +9,6 @@ scripts = [ 'makepkg-template.pl.in', ] -library_files = [ - 'library/human_to_size.sh', -] - SCRIPT_EDITOR = find_program(configure_file( input : join_paths(meson.source_root(), 'build-aux/edit-script.sh.in'), output : 'edit-script.sh', @@ -32,7 +28,6 @@ foreach script : scripts input : m4_edit.process(script), command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], output : script_shortname, - depend_files : library_files, install : true, install_dir : get_option('bindir')) endforeach @@ -48,7 +43,6 @@ foreach script : wrapped_scripts input : m4_edit.process(script), command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@', '0755'], output : script, - depend_files : library_files, build_by_default : true) cdata = configuration_data() diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 5f02393d..f7d8d93e 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -65,4 +65,3 @@ scripts/libmakepkg/util/parseopts.sh.in scripts/libmakepkg/util/pkgbuild.sh.in scripts/libmakepkg/util/source.sh.in scripts/libmakepkg/util/util.sh.in -scripts/library/human_to_size.sh diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am index 07fe63da..0100bffb 100644 --- a/test/scripts/Makefile.am +++ b/test/scripts/Makefile.am @@ -1,8 +1,7 @@ check_SCRIPTS = \ parseopts_test.sh \ pacman-db-upgrade-v9.py \ - makepkg-template_test.sh \ - human_to_size_test.sh + makepkg-template_test.sh noinst_SCRIPTS = $(check_SCRIPTS) diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh deleted file mode 100755 index fe9a94ba..00000000 --- a/test/scripts/human_to_size_test.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -source "$(dirname "$0")"/../tap.sh || exit 1 - -# source the library function -lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} -if [[ -z $lib || ! -f $lib ]]; then - tap_bail "human_to_size library (%s) could not be located" "${lib}" - exit 1 -fi -. "$lib" - -if ! type -t human_to_size &>/dev/null; then - tap_bail "human_to_size function not found" - exit 1 -fi - -tap_parse_hts() { - local input=$1 expected=$2 - tap_is_str "$(human_to_size "$input")" "$expected" "$input" -} - -tap_plan 15 - -# tap_parse_hts <input> <expected output> - -tap_parse_hts '1MiB' 1048576 - -tap_parse_hts '10XiB' '' - -tap_parse_hts '10 MiB' 10485760 - -tap_parse_hts '10 XiB' '' - -tap_parse_hts '.1 TiB' 109951162778 - -tap_parse_hts ' -3 KiB ' -3072 - -tap_parse_hts 'foo3KiB' '' - -tap_parse_hts '3KiBfoo' '' - -tap_parse_hts '3kib' '' - -tap_parse_hts '+1KiB' 1024 - -tap_parse_hts '+1.0 KiB' 1024 - -tap_parse_hts '1MB' 1000000 - -tap_parse_hts '1M' 1048576 - -tap_parse_hts ' 1 G ' 1073741824 - -tap_parse_hts '1Q' '' diff --git a/test/scripts/meson.build b/test/scripts/meson.build index 0dd05fd9..6d13ad1e 100644 --- a/test/scripts/meson.build +++ b/test/scripts/meson.build @@ -1,7 +1,6 @@ tests = [ 'parseopts_test.sh', 'makepkg-template_test.sh', - 'human_to_size_test.sh', ] foreach tst : tests -- 2.24.0

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-7-g3a814ee6
by Allan McRae 06 Nov '19

06 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 3a814ee6bca9ee24a868c0dc032b321048a53e08 (commit) via 424129e8d1e91987a9799a49391f1271b069c5cf (commit) via 27955a0fee16f817b5569e0bc29bc1498a87ea68 (commit) from 1bfae7d14a7bdad777e82912c5c6883deb11aee5 (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 3a814ee6bca9ee24a868c0dc032b321048a53e08 Author: Ethan Sommer <e5ten.arch(a)gmail.com> Date: Tue Nov 5 20:29:11 2019 -0500 makepkg: replaces sed in-place with built in substitution Reads PKGBUILD into an array and replaces the pkgver and pkgrel with bash parameter substitution, then uses shell redirection to write to to the file. Because shell redirection follows symlinks, this accomplishes the same thing as the previous default of using the GNU-specific --follow-symlinks sed flag. Removes SEDPATH and SEDINPLACEFLAGS from the build systems as they are not used elsewhere. Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 424129e8d1e91987a9799a49391f1271b069c5cf Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Nov 5 23:08:26 2019 +0000 pacman: clarify error when alpm fails to init Currently pacman is hard coded to print the dbpath, then the error alpm returned. Even though the error could really be caused by anything. So instead just print the arugemnts given to alpm and not assume the resulting error message is releated to either path. Fixes FS#59595 Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 27955a0fee16f817b5569e0bc29bc1498a87ea68 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 5 15:25:52 2019 +1000 Move update-copyright into build-aux This is a useful function to update all our copyright years. Move it into build-aux so that it is not lost in the switch to meson. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 7 +------ build-aux/edit-script.sh.in | 2 -- build-aux/update-copyright | 8 ++++++++ configure.ac | 11 ----------- meson.build | 11 ----------- meson_options.txt | 3 --- scripts/Makefile.am | 2 -- scripts/makepkg.sh.in | 8 +++++--- src/pacman/conf.c | 4 ++-- 9 files changed, 16 insertions(+), 40 deletions(-) create mode 100755 build-aux/update-copyright hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: replace sed in-place with built-in substitution
by Ethan Sommer 06 Nov '19

06 Nov '19

Read PKGBUILD into an array and replace the pkgver and pkgrel with bash parameter substitution, then use shell redirection to write to to the file. Because shell redirection follows symlinks, this accomplishes the same thing as the previous default of using the GNU-specific --follow-symlinks sed flag. Remove SEDPATH and SEDINPLACEFLAGS from the build systems as they are not used elsewhere. --- build-aux/edit-script.sh.in | 2 -- configure.ac | 11 ----------- meson.build | 11 ----------- meson_options.txt | 3 --- scripts/Makefile.am | 2 -- scripts/makepkg.sh.in | 7 ++++--- 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/build-aux/edit-script.sh.in b/build-aux/edit-script.sh.in index 640d32f8..7423a223 100644 --- a/build-aux/edit-script.sh.in +++ b/build-aux/edit-script.sh.in @@ -20,8 +20,6 @@ mode=$3 -e "s|@DEBUGSUFFIX[@]|@DEBUGSUFFIX@|g" \ -e "s|@INODECMD[@]|@INODECMD@|g" \ -e "s|@FILECMD[@]|@FILECMD@|g" \ - -e "s|@SEDINPLACEFLAGS[@]|@SEDINPLACEFLAGS@|g" \ - -e "s|@SEDPATH[@]|@SEDPATH@|g" \ -e "s|@configure_input[@]|Generated from ${input##*/}; do not edit by hand.|g" \ "$input" >"$output" diff --git a/configure.ac b/configure.ac index 305432b3..e59f82e9 100644 --- a/configure.ac +++ b/configure.ac @@ -369,7 +369,6 @@ AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h> GCC_VISIBILITY_CC # Host-dependant definitions -DEFAULT_SEDINPLACEFLAGS=" --follow-symlinks -i" INODECMD="stat -c '%i %n'" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" @@ -377,30 +376,21 @@ STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) INODECMD="stat -f '%i %N'" - DEFAULT_SEDINPLACEFLAGS=" -i \"\"" ;; darwin*) host_os_darwin=yes INODECMD="/usr/bin/stat -f '%i %N'" - DEFAULT_SEDINPLACEFLAGS=" -i ''" STRIP_BINARIES="" STRIP_SHARED="-S" STRIP_STATIC="-S" ;; 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(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) -# Flags for sed in place -if test "${SEDINPLACEFLAGS+set}" != "set"; then - SEDINPLACEFLAGS="${DEFAULT_SEDINPLACEFLAGS}" -fi -AC_ARG_VAR(SEDINPLACEFLAGS, [flags for sed, overriding the default]) - # Variables plugged into makepkg.conf CARCH="${host%%-*}" CHOST="${host}" @@ -576,7 +566,6 @@ ${PACKAGE_NAME}: Architecture : ${CARCH} Host Type : ${CHOST} File inode command : ${INODECMD} - In-place sed command : ${SEDPATH} ${SEDINPLACEFLAGS} File seccomp command : ${FILECMD} libalpm version : ${LIB_VERSION} diff --git a/meson.build b/meson.build index 8c296cb8..36f87ed2 100644 --- a/meson.build +++ b/meson.build @@ -221,7 +221,6 @@ config_h = configure_file( add_project_arguments('-include', 'config.h', language : 'c') filecmd = 'file' -default_sedinplaceflags = ' --follow-symlinks -i' inodecmd = 'stat -c \'%i %n\'' strip_binaries = '--strip-all' strip_shared = '--strip-unneeded' @@ -237,18 +236,11 @@ endif os = host_machine.system() if os.startswith('darwin') inodecmd = '/usr/bin/stat -f \'%i %N\'' - default_sedinplaceflags = ' -i \'\'' strip_binaries = '' strip_shared = '-s' strip_static = '-s' elif os.contains('bsd') or os == 'dragonfly' inodecmd = 'stat -f \'%i %N\'' - default_sedinplaceflags = ' -i \'\'' -endif - -sedinplaceflags = get_option('sedinplaceflags') -if sedinplaceflags == 'auto' - sedinplaceflags = default_sedinplaceflags endif chost = run_command(cc, '-dumpmachine').stdout().strip() @@ -277,8 +269,6 @@ substs.set('TEMPLATE_DIR', get_option('makepkg-template-dir')) substs.set('DEBUGSUFFIX', get_option('debug-suffix')) substs.set('INODECMD', inodecmd) substs.set('FILECMD', filecmd) -substs.set('SEDINPLACEFLAGS', sedinplaceflags) -substs.set('SEDPATH', SED.path()) substs.set('LIBMAKEPKGDIR', LIBMAKEPKGDIR) substs.set('STRIP_BINARIES', strip_binaries) substs.set('STRIP_SHARED', strip_shared) @@ -430,7 +420,6 @@ message('\n '.join([ ' Architecture : @0@'.format(carch), ' Host Type : @0@'.format(chost), ' File inode command : @0@'.format(inodecmd), - ' In-place sed command : @0@ @1@'.format(SED.path(), sedinplaceflags), ' File seccomp command : @0@'.format(filecmd), ' libalpm version : @0@'.format(libalpm_version), ' pacman version : @0@'.format(PACKAGE_VERSION), diff --git a/meson_options.txt b/meson_options.txt index 2b92ca1a..4d8cc300 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -54,6 +54,3 @@ option('i18n', type : 'boolean', value : true, # tools option('file-seccomp', type: 'feature', value: 'auto', description: 'determine whether file is seccomp-enabled') - -option('sedinplaceflags', type : 'string', value : 'auto', - description : 'flags to pass to sed to edit a file in-place') diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 63d09767..3cb6c133 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -186,8 +186,6 @@ edit = sed \ -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e "s|@FILECMD[@]|$(FILECMD)|g" \ - -e 's|@SEDINPLACEFLAGS[@]|$(SEDINPLACEFLAGS)|g' \ - -e 's|@SEDPATH[@]|$(SEDPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $<; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c49ac57a..b9e83458 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -199,13 +199,14 @@ update_pkgver() { fi if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then - if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then - if ! @SEDPATH@ @SEDINPLACEFLAGS@ "s:^pkgver=[^ ]*:pkgver=$newpkgver:" "$BUILDFILE"; then + if [[ -w $BUILDFILE ]]; then + mapfile -t buildfile < "$BUILDFILE" + buildfile=("${buildfile[@]/#pkgver=*([^ ])/pkgver=$newpkgver}") + if ! printf '%s\n' "${buildfile[@]/#pkgrel=*([^ ])/pkgrel=1}" > "$BUILDFILE"; then error "$(gettext "Failed to update %s from %s to %s")" \ "pkgver" "$pkgver" "$newpkgver" exit $E_PKGBUILD_ERROR fi - @SEDPATH@ @SEDINPLACEFLAGS@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE" source_safe "$BUILDFILE" local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" -- 2.23.0

3 4

[pacman-dev] [PATCH] pacman: clarify error when alpm fails to init
by morganamilo 06 Nov '19

06 Nov '19

Currently pacman is hard coded to print the dbpath, then the error alpm returned. Even though the error could really be caused by anything. So instead just print the arugemnts given to alpm and not assume the resulting error message is releated to either path. Fixes FS#59595 Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 468a3e02..42946189 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -766,8 +766,8 @@ static int setup_libalpm(void) /* initialize library */ handle = alpm_initialize(config->rootdir, config->dbpath, &err); if(!handle) { - pm_printf(ALPM_LOG_ERROR, _("failed to initialize alpm library\n(%s: %s)\n"), - alpm_strerror(err), config->dbpath); + pm_printf(ALPM_LOG_ERROR, _("failed to initialize alpm library (root: %s, dbpath: %s):\n%s\n"), + config->rootdir, config->dbpath, alpm_strerror(err)); if(err == ALPM_ERR_DB_VERSION) { fprintf(stderr, _("try running pacman-db-upgrade\n")); } -- 2.23.0

2 1

[pacman-dev] [PATCH] Add a timestamp file into repo tarballs
by Allan McRae 05 Nov '19

05 Nov '19

When creating or modifying repo tarballs, place a .TIMESTAMP file with seconds since epoch in it. This will be used in the future to enable rejecting databases older that a given threshold. Also skip reading the .TIMESTAMP file in sync_db_populate(). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Anyone want to check my logic in the sync_db_populate() populate change? Repo-add puts the .TIMESTAMP file first when calling bsdtar, so if present it will be first in the repo db file. Otherwise the first item read from the tarball will be a directory, which we skip reading anyway. So I just read the header for the first item and discard it. lib/libalpm/be_sync.c | 9 +++++++++ scripts/repo-add.sh.in | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 2c76fe83..041b2266 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -506,6 +506,13 @@ static int sync_db_populate(alpm_db_t *db) goto cleanup; } + /* the .TIMESTAMP file will be first entry in the repo archive if present. + * If not, the first entry will be a directory and can be skipped too */ + if((archive_ret = archive_read_next_header(archive, &entry)) != ARCHIVE_OK) { + ret = -1; + goto readfail; + } + while((archive_ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { mode_t mode = archive_entry_mode(entry); if(!S_ISDIR(mode)) { @@ -518,6 +525,8 @@ static int sync_db_populate(alpm_db_t *db) } } } + +readfail: if(archive_ret != ARCHIVE_EOF) { _alpm_log(db->handle, ALPM_LOG_ERROR, _("could not read db '%s' (%s)\n"), db->treename, archive_error_string(archive)); diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index caf1232d..c87409f1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -526,6 +526,7 @@ create_db() { TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE") # $LOCKFILE is already guaranteed to be absolute so this is safe dirname=${LOCKFILE%/*} + timestamp=$(date +%s) for repo in "db" "files"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} @@ -533,12 +534,13 @@ create_db() { tempname=$dirname/.tmp.$filename pushd "$tmpdir/$repo" >/dev/null + echo $timestamp > .TIMESTAMP if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then - bsdtar -c ${TAR_OPT} -f "$tempname" * + bsdtar -c ${TAR_OPT} -f "$tempname" .TIMESTAMP * else - # we have no packages remaining? zip up some emptyness + # we have no packages remaining warning "$(gettext "No packages remain, creating empty database.")" - bsdtar -c ${TAR_OPT} -f "$tempname" -T /dev/null + bsdtar -c ${TAR_OPT} -f "$tempname" .TIMESTAMP fi popd >/dev/null -- 2.23.0

3 5

[pacman-dev] [PATCH] Move update-copyright into build-aux
by Allan McRae 05 Nov '19

05 Nov '19

This is a useful function to update all our copyright years. Move it into build-aux so that it is not lost in the switch to meson. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Makefile.am | 7 +------ build-aux/update-copyright | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100755 build-aux/update-copyright diff --git a/Makefile.am b/Makefile.am index c661f447..851bf472 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,9 +77,4 @@ update-po: $(MAKE) -C scripts/po update-po $(MAKE) -C src/pacman/po update-po -update-copyright: - for file in $(shell sh -c 'git grep -l "Copyright .* Pacman Development" | grep -v "\.po"'); do \ - sed -i -e "/Copyright (/s/-$(OLD)/-$(NEW)/" -e "/Copyright (/s/ $(OLD)/ $(OLD)-$(NEW)/" "$$file"; \ - done - -.PHONY: update-po update-copyright +.PHONY: update-po diff --git a/build-aux/update-copyright b/build-aux/update-copyright new file mode 100755 index 00000000..eef368b8 --- /dev/null +++ b/build-aux/update-copyright @@ -0,0 +1,8 @@ +#! /bin/sh + +OLD=$1 +NEW=$2 + +for file in $(git grep -l "Copyright .* Pacman Development" | grep -v "\.po"); do \ + sed -i -e "/Copyright (/s/-${OLD}/-${NEW}/" -e "/Copyright (/s/ ${OLD}/ ${OLD}-${NEW}/" "$file" +done -- 2.23.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-4-g1bfae7d1
by Allan McRae 05 Nov '19

05 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 1bfae7d14a7bdad777e82912c5c6883deb11aee5 (commit) from 091b244d0ffa281ba9968606184d709e59c2a2d5 (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 1bfae7d14a7bdad777e82912c5c6883deb11aee5 Author: Ethan Sommer <e5ten.arch(a)gmail.com> Date: Mon Nov 4 23:36:02 2019 -0500 libmakepkg: fix empty arguments in parseopts Previously parseopts checked if there was an argument by checking that the string was non-empty, resulting in empty arguments being incorrectly considered non-existent. This change makes parseopts check if arguments exist at all, rather than checking that they are non-empty Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/util/parseopts.sh.in | 8 ++++---- test/scripts/parseopts_test.sh | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0