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

[pacman-dev] [PATCH v2] Go to the end of screen if 'printonly' mode enabled
by Anatol Pomozov 26 Nov '20

26 Nov '20

At the end of download operation our code makes sure the cursor is moved to the end of the drawing area. But 'printonly' mode has its own if() branch that skips this cursor alignment. Add cursor_goto_end() to the 'printonly' codepath to make sure it does not clobber previous output. Fixes FS#68355 Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- src/pacman/callback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4240a779..53518101 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,6 +226,7 @@ static int number_length(size_t n) void cb_event(alpm_event_t *event) { if(config->print) { + cursor_goto_end(); return; } switch(event->type) { -- 2.29.0

2 1

[pacman-dev] [PATCH] Add fossil scm support to makepkg
by escondida＠iff.ink 25 Nov '20

25 Nov '20

From: Ivy Foster <escondida(a)iff.ink> Signed-off-by: Ivy Foster <escondida(a)iff.ink> --- doc/PKGBUILD.5.asciidoc | 3 + scripts/libmakepkg/source/fossil.sh.in | 124 +++++++++++++++++++++++++ scripts/libmakepkg/util/source.sh.in | 5 +- 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 scripts/libmakepkg/source/fossil.sh.in diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index 2e2108a0..54bb7775 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -499,6 +499,9 @@ The source URL is divided into four components: *bzr*;; revision (see `'bzr help revisionspec'` for details) + *fossil*;; + branch, checkin, ci, commit, tag (checkin, ci, and commit are synomymous) + *git*;; branch, commit, tag diff --git a/scripts/libmakepkg/source/fossil.sh.in b/scripts/libmakepkg/source/fossil.sh.in new file mode 100644 index 00000000..a0fe0480 --- /dev/null +++ b/scripts/libmakepkg/source/fossil.sh.in @@ -0,0 +1,124 @@ +#!/bin/bash +# +# fossil.sh - function for handling the download and extraction of Fossil sources +# +# Copyright (c) 2015-2020 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_SOURCE_FOSSIL_SH" ]] && return +LIBMAKEPKG_SOURCE_FOSSIL_SH=1 + + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/pkgbuild.sh" + +download_fossil() { + # abort early if parent says not to fetch + if declare -p get_vcs > /dev/null 2>&1; then + (( get_vcs )) || return + fi + + local netfile=$1 + + local db=$(get_filepath "$netfile") + [[ -z "$db" ]] && db="$SRCDEST/$(get_filename "$netfile")" + + local repo=$db + + local url=$(get_url "$netfile") + url=${url#fossil+} + url=${url%%#*} + url=${url%%\?*} + + if [[ ! -f "$db" ]]; then + msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "fossil" + if ! fossil clone $url $db; then + error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "fossil" + plainerr "$(gettext "Aborting...")" + exit 1 + fi + elif (( ! HOLDVER )); then + # Make sure we are fetching the right repo + if ! (fossil remote list -R $db | grep "$url"); then + error "$(gettext "%s is not a clone of %s")" "$db" "$url" + plainerr "$(gettext "Aborting...")" + exit 1 + fi + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "fossil" + if ! fossil pull -R $db; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "fossil" + fi + fi +} + +extract_fossil() { + local netfile=$1 tagname + + local fragment=$(get_uri_fragment "$netfile") + local repo=$(get_filename "$netfile") + + local db=$(get_filepath "$netfile") + [[ -z "$db" ]] && db="$SRCDEST/$(get_filename "$netfile")" + local dir=${db%%.fossil} + dir=${dir##*/} + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "fossil" + pushd "$srcdir" &>/dev/null + + if [[ -f "$dir/.fslckout" ]]; then + cd_safe "$dir" + if ! (fossil revert && fossil clean --verily); then + error "$(gettext "Failure while updating working copy of %s %s repo")" "${repo}" "fossil" + plainerr "$(gettext "Aborting...")" + exit 1 + fi + cd_safe "$srcdir" + elif [[ -d "$dir" && ! -f "$dir/.fslckout" ]]; then + error "$(gettext "%s is not a working copy of %s")" "$dir" "$db" + plainerr "$(gettext "Aborting...")" + exit 1 + elif ! fossil open "$db" --workdir "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "fossil" + plainerr "$(gettext "Aborting...")" + exit 1 + fi + + cd_safe "${dir##*/}" + + ref=tip + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + branch|checkin|ci|commit|tag) + ref=${fragment##*=} + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plainerr "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! fossil update "$ref"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "fossil" "$ref" + plainerr "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index be7c15c2..029bf8ed 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -65,7 +65,7 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - bzr|git|hg|svn) + bzr|fossil|git|hg|svn) filename=${netfile%%#*} filename=${filename%%\?*} filename=${filename%/} @@ -73,6 +73,9 @@ get_filename() { if [[ $proto = bzr ]]; then filename=${filename#*lp:} fi + if [[ $proto = fossil ]]; then + filename=$filename.fossil + fi if [[ $proto = git ]]; then filename=${filename%%.git*} fi -- 2.29.2

2 8

[pacman-dev] [PATCH] pacman-key: change signing key to ed25519
by Geert Hendrickx 05 Nov '20

05 Nov '20

Larger RSA keys are not the way forward, switch to ed25519 instead. This will also become the default in the next version of GnuPG. Signed-off-by: Geert Hendrickx <geert(a)hendrickx.be> --- scripts/pacman-key.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ccfd1b96..fd9d3793 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -147,8 +147,8 @@ generate_master_key() { # Generate the master key, which will be in both pubring and secring "${GPG_PACMAN[@]}" --gen-key --batch <<EOF %echo Generating pacman keyring master key... -Key-Type: RSA -Key-Length: 4096 +Key-Type: EDDSA +Key-Curve: ed25519 Key-Usage: sign Name-Real: Pacman Keyring Master Key Name-Email: pacman@localhost -- 2.29.2

4 6