- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] I blame everyone for this
by Allan McRae 04 Feb '19

04 Feb '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 6ae93a9d..ce39e0c5 100644 --- a/NEWS +++ b/NEWS @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - read missing newline on -Qi/-Si output (FS#11331) + - re-add missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function -- 2.20.1

1 0

[pacman-dev] [PATCH] fix various typos
by morganamilo 04 Feb '19

04 Feb '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index a182d65e..6ae93a9d 100644 --- a/NEWS +++ b/NEWS @@ -167,7 +167,7 @@ VERSION DESCRIPTION - fix triggering of Install hooks (FS#47996) - fix handling of stdin scripts called by pacman - hook activity is logged - - documentataion updates for alpm-hooks (FS#48080) + - documentation updates for alpm-hooks (FS#48080) - makepkg: - increase robustness of variable array checks - makepkg -g does not perform current architecture checks @@ -259,9 +259,9 @@ VERSION DESCRIPTION - Fix removal of static libraries when the shared library uses the absolute path in symbolic links (FS#43395) - Improve Bazaar cloning (FS#43448) - - Fix issues with architecture dependant checksum + - Fix issues with architecture dependent checksum verification (FS#43192) - - Fix .SRCINFO file with architecture dependant fields + - Fix .SRCINFO file with architecture dependent fields (FS#43247) - Fix compatibility with older bash versions - Allow git checkouts to be downloaded into directory ending @@ -351,7 +351,7 @@ VERSION DESCRIPTION - checkupdates: rename CHECKUPDATE_DB to CHECKUPDATES_DB - pacdiff: add a "Quit" option, and many other improvements - pacsysclean is removed -4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitary +4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitrary file overwrites from malicious databases - makepkg: - restrict package name from starting with a dot @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - readd missing newline on -Qi/-Si output (FS#11331) + - read missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function @@ -1262,7 +1262,7 @@ VERSION DESCRIPTION external download utility like wget - added a license field to package meta-data - add url support to -A and -U operations (download packages) - - -Ss now searches thru provides fields + - -Ss now searches through provides fields - added --dbonly option to -R 2.7.6 - added --print-uris option - fixed an http download bug (FS#667) diff --git a/configure.ac b/configure.ac index 6f336022..415ed3cb 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ if test "x$CFLAGS" = "x"; then CFLAGS="" fi -# Set subsitution values for version stuff in Makefiles and anywhere else, +# Set substitution values for version stuff in Makefiles and anywhere else, # and put LIB_VERSION in config.h AC_SUBST(LIB_VERSION) AC_SUBST(LIB_VERSION_INFO) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index f12effde..32668adc 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -60,8 +60,8 @@ systems (see below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is a postive integer, with an optional subrelease level - specified by adding another postive integer separated by a period + variable is a positive integer, with an optional subrelease level + specified by adding another positive integer separated by a period (i.e. in the form x.y). *epoch*:: diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b11d5dda..fbcde266 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -38,7 +38,7 @@ /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package initialization (such as used by the file backend). Each - * backend is free to define a stuct containing pointers to a specific + * backend is free to define a struct containing pointers to a specific * implementation of these methods. Some backends may find using the * defined default_pkg_ops struct to work just fine for their needs. */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index df7ac6ca..92598b0e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -182,7 +182,7 @@ static int init_gpgme(alpm_handle_t *handle) #endif /* NOTE: * The GPGME library installs a SIGPIPE signal handler automatically if - * the default signal hander is in use. The only time we set a handler + * the default signal handler is in use. The only time we set a handler * for SIGPIPE is in dload.c, and we reset it when we are done. Given that * we do this, we can let GPGME do its automagic. However, if we install * a library-wide SIGPIPE handler, we will have to be careful. diff --git a/meson_options.txt b/meson_options.txt index 422a9ae4..bf3fc22d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,7 +2,7 @@ option('use-git-version', type : 'boolean', value : false, description : 'take version information from git') option('buildstatic', type : 'boolean', value : false, - description : 'if true, build staticly linked binaries') + description : 'if true, build statically linked binaries') # directories and filenames option('root-dir', type : 'string', value : '/', diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index 867dc928..ab069a45 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -1,6 +1,6 @@ #!/usr/bin/bash # -# strip.sh - Confirm presense of strip binary +# strip.sh - Confirm presence of strip binary # # Copyright (c) 2011-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 298275a8..4163805d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -38,7 +38,7 @@ array_build() { # it's an error to try to copy a value which doesn't exist. declare -p "$2" &>/dev/null || return 1 - # Build an array of the indicies of the source array. + # Build an array of the indices of the source array. eval "keys=(\"\${!$2[@]}\")" # Clear the destination array diff --git a/src/pacman/util.c b/src/pacman/util.c index 74e1037d..8f6290db 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1359,7 +1359,7 @@ static int multiselect_parse(char *array, int count, char *response) len--; include = 0; } else if(str) { - /* if first token is including, we unselect all targets */ + /* if first token is including, we deselect all targets */ memset(array, 0, count); } -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-130-g04e77591
by Allan McRae 04 Feb '19

04 Feb '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 04e77591d6333002815e9276ca08c01230fcf212 (commit) from 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e (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 04e77591d6333002815e9276ca08c01230fcf212 Author: morganamilo <morganamilo(a)gmail.com> Date: Sat Feb 2 19:01:05 2019 +0000 fix various typos Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Parallel downloads
by Dávid Bíró 01 Feb '19

01 Feb '19

Dear Pacman Devs I want to add a parallel download feature for Pacman. Is it a wanted feature? Should I do it? If yes, could you provide some docs for the code? David Judge dbiro97(a)gmail.com

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-129-g11bc315c
by Allan McRae 31 Jan '19

31 Jan '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 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e (commit) via 14755df06f4727f261a8174502754acd7243ab75 (commit) from 75aae126c423dcc9b215aef57daff9e7bd8f5f6b (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 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e Author: morganamilo <morganamilo(a)gmail.com> Date: Thu Jan 31 02:07:09 2019 +0000 libmakepkg: lint disallowed architecture specific variables Variables such as 'pkgdesc_x86_64' are invalid, instead of ignoring them raise an error. This also disallows using 'any' as an architecture specific variable Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 14755df06f4727f261a8174502754acd7243ab75 Author: morganamilo <morganamilo(a)gmail.com> Date: Thu Jan 31 02:04:56 2019 +0000 libmakepkg: lint disallowed variables in package() makepkg will now error if disallowed variables are set inside of the package function. Disallowed variables are variables that do exist, like 'makedepends' and 'pkgver' but can not be set inside of a package function. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/Makefile.am | 2 + .../libmakepkg/lint_pkgbuild/arch_specific.sh.in | 82 ++++++++++++++++++++++ scripts/libmakepkg/lint_pkgbuild/meson.build | 2 + .../lint_pkgbuild/package_function_variable.sh.in | 62 ++++++++++++++++ scripts/libmakepkg/util/pkgbuild.sh.in | 9 +++ 5 files changed, 157 insertions(+) create mode 100644 scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in create mode 100644 scripts/libmakepkg/lint_pkgbuild/package_function_variable.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/7] Improve linting for makepkg
by morganamilo 31 Jan '19

31 Jan '19

I recently did some data crunshing on AUR packages, trying to find ones that are formatted incorrectly, catching mistakes makepkg did not. I wrote up on the results here https://github.com/Morganamilo/go-srcinfo/issues/1. This patch should cover all the mistakes found and make is so that makepkg bails out duing the linting phase and users are forced to make more correct pkgbuilds. morganamilo (7): libmakepkg: disallow empty arch libmakepkg: stop printsrcinfo generating empty values libmakepkg: lint disallowed variables in package() libmakepkg: lint disallowed architecture specific variables libmakepkg: disallow using any as an architecture specific variable libmakepkg: add pkgbase to linted variables libmakepkg: disallow using 'any' with other arches scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 14 +++- .../libmakepkg/lint_pkgbuild/variable.sh.in | 72 ++++++++++++++++++- scripts/libmakepkg/srcinfo.sh.in | 6 +- 3 files changed, 86 insertions(+), 6 deletions(-) -- 2.17.1

5 56

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-127-g75aae126
by Allan McRae 31 Jan '19

31 Jan '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 75aae126c423dcc9b215aef57daff9e7bd8f5f6b (commit) via 6cf0548128d6d1a839ba93997b017661520395be (commit) from 776fbe1cde58739d0469d3efbc76cb13b80f18b3 (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 75aae126c423dcc9b215aef57daff9e7bd8f5f6b Author: morganamilo <morganamilo(a)gmail.com> Date: Wed Jan 30 18:07:20 2019 +0000 libmakepkg: centralise random arrays of pkgbuild variables Refactor many of the different arrays of pkgbuild variables into scripts/libmakepkg/util/schema.sh.in. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6cf0548128d6d1a839ba93997b017661520395be Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 30 10:40:09 2019 +1000 makepkg: use --unneeded for pacman call in remove_deps() This patch was inspired by FS#32723 which asks makepkg to install makedepends before depends. The use case is to build a package depending on a virtual package that is only provided by other packages (e.g. java-runtime in Arch Linux), but wanting to build against a specific version. Installing makedepends first (but not at the same time as depends) would allow specifying the version to build against, instead of pacman resolving to the default version when installing depends. It turns out, we can already achieve installing makedepends first by specifying dependencies only in the package function (and making sure makedepends includes everything needed). The only issue is that if we use makepkg to install the built package with the --install flag and along with the --rmdeps flag, we will try to remove any installed dependencies that are specified in the depends array in the package function. To counter this, we need to use the --unneeded flag for the pacman call. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/Makefile.am | 1 + .../libmakepkg/integrity/generate_checksum.sh.in | 1 + scripts/libmakepkg/integrity/verify_checksum.sh.in | 1 + scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 20 ++++----- scripts/libmakepkg/util/meson.build | 1 + scripts/libmakepkg/util/pkgbuild.sh.in | 2 + scripts/libmakepkg/util/schema.sh.in | 49 ++++++++++++++++++++++ scripts/makepkg.sh.in | 13 ++---- 8 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 scripts/libmakepkg/util/schema.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: centralise random arrays of pkgbuild variables
by morganamilo 30 Jan '19

30 Jan '19

Refactor many of the different arrays of pkgbuild variables into scripts/libmakepkg/util/schema.sh.in. Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- All the arch overrides happen to be arrays. The current code also uses arrays in the variable name to document this. so use pkgbuild_schema_arch_arrays over the previously discussed pkgbuild_schema_arch_overrides. scripts/Makefile.am | 1 + .../integrity/generate_checksum.sh.in | 1 + .../integrity/verify_checksum.sh.in | 1 + .../libmakepkg/lint_pkgbuild/variable.sh.in | 20 +++----- scripts/libmakepkg/util/meson.build | 1 + scripts/libmakepkg/util/pkgbuild.sh.in | 2 + scripts/libmakepkg/util/schema.sh.in | 49 +++++++++++++++++++ scripts/makepkg.sh.in | 11 +---- 8 files changed, 64 insertions(+), 22 deletions(-) create mode 100644 scripts/libmakepkg/util/schema.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 08fc34b2..0e5619bd 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -124,6 +124,7 @@ LIBMAKEPKG_IN = \ libmakepkg/util/option.sh \ libmakepkg/util/parseopts.sh \ libmakepkg/util/pkgbuild.sh \ + libmakepkg/util/schema.sh \ libmakepkg/util/source.sh \ libmakepkg/util/util.sh diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index 57ef46ff..63cdc4d6 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -25,6 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" generate_one_checksum() { local integ=$1 arch=$2 sources numsrc indentsz idx diff --git a/scripts/libmakepkg/integrity/verify_checksum.sh.in b/scripts/libmakepkg/integrity/verify_checksum.sh.in index 532e0693..ec61b16d 100644 --- a/scripts/libmakepkg/integrity/verify_checksum.sh.in +++ b/scripts/libmakepkg/integrity/verify_checksum.sh.in @@ -25,6 +25,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" check_checksums() { local integ a diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index a975b024..512bed7b 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -25,22 +25,16 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" lint_pkgbuild_functions+=('lint_variable') lint_variable() { - # TODO: refactor - similar arrays are used elsewhere - local array=(arch backup groups license noextract options validpgpkeys) - local arch_array=(checkdepends conflicts depends makedepends md5sums - optdepends provides replaces sha1sums sha224sums - sha256sums sha384sums sha512sums source) - local string=(changelog epoch install pkgbase pkgdesc pkgrel pkgver url) - local i a pkg out bad ret=0 # global variables - for i in ${array[@]} ${arch_array[@]}; do + for i in ${pkgbuild_schema_arrays[@]}; do if declare -p $i > /dev/null 2>&1; then if ! is_array $i; then error "$(gettext "%s should be an array")" "$i" @@ -52,7 +46,7 @@ lint_variable() { for a in ${arch[@]}; do [[ $a == "any" ]] && continue - for i in ${arch_array[@]}; do + for i in ${pkgbuild_schema_arch_arrays[@]}; do if declare -p "${i}_${a}" > /dev/null 2>&1; then if ! is_array ${i}_${a}; then error "$(gettext "%s should be an array")" "${i}_${a}" @@ -62,7 +56,7 @@ lint_variable() { done done - for i in ${string[@]}; do + for i in ${pkgbuild_schema_strings[@]}; do if declare -p "$i" > /dev/null 2>&1; then if is_array $i; then error "$(gettext "%s should not be an array")" "$i" @@ -73,7 +67,7 @@ lint_variable() { # package function variables for pkg in ${pkgname[@]}; do - for i in ${array[@]} ${arch_array[@]}; do + for i in ${pkgbuild_schema_arrays[@]}; do if extract_function_variable "package_$pkg" $i 0 out; then error "$(gettext "%s should be an array")" "$i" ret=1 @@ -83,7 +77,7 @@ lint_variable() { for a in ${arch[@]}; do [[ $a == "any" ]] && continue - for i in ${arch_array[@]}; do + for i in ${pkgbuild_schema_arch_arrays[@]}; do if extract_function_variable "package_$pkg" "${i}_${a}" 0 out; then error "$(gettext "%s should be an array")" "${i}_${a}" ret=1 @@ -91,7 +85,7 @@ lint_variable() { done done - for i in ${string[@]}; do + for i in ${pkgbuild_schema_strings[@]}; do if extract_function_variable "package_$pkg" $i 1 out; then error "$(gettext "%s should not be an array")" "$i" ret=1 diff --git a/scripts/libmakepkg/util/meson.build b/scripts/libmakepkg/util/meson.build index b0e829c4..229b004d 100644 --- a/scripts/libmakepkg/util/meson.build +++ b/scripts/libmakepkg/util/meson.build @@ -7,6 +7,7 @@ sources = [ 'option.sh.in', 'parseopts.sh.in', 'pkgbuild.sh.in', + 'schema.sh.in', 'source.sh.in', 'util.sh.in', ] diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index b29229a3..0dc239d1 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -21,6 +21,8 @@ [[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return LIBMAKEPKG_UTIL_PKGBUILD_SH=1 +source "$LIBRARY/util/schema.sh" + have_function() { declare -f "$1" >/dev/null diff --git a/scripts/libmakepkg/util/schema.sh.in b/scripts/libmakepkg/util/schema.sh.in new file mode 100644 index 00000000..38f034e0 --- /dev/null +++ b/scripts/libmakepkg/util/schema.sh.in @@ -0,0 +1,49 @@ +#!/bin/bash +# +# schema.sh - declare specific groups of pkgbuild variables +# +# Copyright (c) 2015-2018 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_SCHEMA_SH" ]] && return +LIBMAKEPKG_SCHEMA_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/util.sh" + + +known_hash_algos=({md5,sha{1,224,256,384,512}}) + +pkgbuild_schema_arrays=(arch backup checkdepends conflicts depends groups + license makedepends noextract optdepends options + provides replaces source validpgpkeys + "${known_hash_algos[@]/%/sums}") + +pkgbuild_schema_strings=(changelog epoch install pkgbase pkgdesc pkgrel pkgver + url) + +pkgbuild_schema_arch_arrays=(checkdepends conflicts depends makedepends + optdepends provides replaces source + "${known_hash_algos[@]/%/sums}") + +pkgbuild_schema_package_overrides=(pkgdesc arch url license groups depends + optdepends provides conflicts replaces + backup options install changelog) + +readonly -a known_hash_algos pkgbuild_schema_arrays \ + pkgbuild_schema_strings pkgbuild_schema_arch_arrays \ + pkgbuild_schema_package_overrides diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c81dc801..2cee5b02 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,13 +48,6 @@ declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' - 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' - 'options' 'install' 'changelog') -readonly -a splitpkg_overrides - -known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') - # Options ASDEPS=0 BUILDFUNC=0 @@ -905,7 +898,7 @@ check_build_status() { backup_package_variables() { local var - for var in ${splitpkg_overrides[@]}; do + for var in ${pkgbuild_schema_package_overrides[@]}; do local indirect="${var}_backup" eval "${indirect}=(\"\${$var[@]}\")" done @@ -913,7 +906,7 @@ backup_package_variables() { restore_package_variables() { local var - for var in ${splitpkg_overrides[@]}; do + for var in ${pkgbuild_schema_package_overrides[@]}; do local indirect="${var}_backup" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" -- 2.20.1

1 0

[pacman-dev] [PATCH 1/2] libalpm: Add dlclientcert and dlclientkey options.
by Maarten de Vries 30 Jan '19

30 Jan '19

These patches add support for client certificates to alpm and pacman. This can already be achieved currently by setting an XferCommand, but doing so significantly reduces the quality of the feedback pacman gives during the downloads. Especially annoying are the 404 errors on most database signature files, but that's not the only issue. I admit this is a bit of an edge case, but I find myself in the situation where I have to download packages from a private repository that requires a valid client certificate. I really want the nice regular pacman feedback back though, so I figured I'd hack it in myself. I tried to follow naming schemes and other conventions the best I could, but please let me know if I should change anything, or forgot something. --- lib/libalpm/alpm.h | 6 ++++ lib/libalpm/dload.c | 3 ++ lib/libalpm/handle.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 2 ++ 4 files changed, 86 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d3d198a..b894e249 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -933,6 +933,12 @@ int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, int level); int alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, unsigned short disable_dl_timeout); +const char *alpm_option_get_dlclientcert(alpm_handle_t *handle); +int alpm_option_set_dlclientcert(alpm_handle_t *handle, const char * path); + +const char *alpm_option_get_dlclientkey(alpm_handle_t *handle); +int alpm_option_set_dlclientkey(alpm_handle_t *handle, const char * path); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 36ae4ee1..df57e175 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -276,6 +276,9 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_TCP_KEEPINTVL, 60L); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(curl, CURLOPT_SSLCERT, alpm_option_get_dlclientcert(handle)); + curl_easy_setopt(curl, CURLOPT_SSLKEY, alpm_option_get_dlclientkey(handle)); + _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); if(payload->max_size) { diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 2213ce53..a9481837 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -88,6 +88,8 @@ void _alpm_handle_free(alpm_handle_t *handle) FREE(handle->lockfile); FREE(handle->arch); FREE(handle->gpgdir); + FREE(handle->dlclientcert); + FREE(handle->dlclientkey); FREELIST(handle->noupgrade); FREELIST(handle->noextract); FREELIST(handle->ignorepkg); @@ -417,6 +419,37 @@ alpm_errno_t _alpm_set_directory_option(const char *value, return 0; } +alpm_errno_t _alpm_set_file_option(const char *value, + char **storage, int must_exist) +{ + struct stat st; + char real[PATH_MAX]; + const char *path; + + path = value; + if(!path) { + return ALPM_ERR_WRONG_ARGS; + } + if(must_exist) { + if(stat(path, &st) == -1 || !S_ISREG(st.st_mode)) { + return ALPM_ERR_NOT_A_FILE; + } + if(!realpath(path, real)) { + return ALPM_ERR_NOT_A_FILE; + } + path = real; + } + + if(*storage) { + FREE(*storage); + } + *storage = strdup(path); + if(!*storage) { + return ALPM_ERR_MEMORY; + } + return 0; +} + int SYMEXPORT alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir) { char *newhookdir; @@ -876,3 +909,45 @@ int SYMEXPORT alpm_option_set_disable_dl_timeout(alpm_handle_t *handle, #endif return 0; } + +const char * SYMEXPORT alpm_option_get_dlclientcert(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dlclientcert; +} + +int SYMEXPORT alpm_option_set_dlclientcert(alpm_handle_t *handle, const char * path) +{ + int err; + CHECK_HANDLE(handle, return -1); + if(!path) { + FREE(handle->dlclientcert); + return 0; + } + if((err = _alpm_set_file_option(path, &(handle->dlclientcert), 1))) { + RET_ERR(handle, err, -1); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'dlclient_cert' = %s\n", handle->dlclientcert); + return 0; +} + +const char * SYMEXPORT alpm_option_get_dlclientkey(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dlclientkey; +} + +int SYMEXPORT alpm_option_set_dlclientkey(alpm_handle_t *handle, const char * path) +{ + int err; + CHECK_HANDLE(handle, return -1); + if(!path) { + FREE(handle->dlclientkey); + return 0; + } + if((err = _alpm_set_file_option(path, &(handle->dlclientkey), 1))) { + RET_ERR(handle, err, -1); + } + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'dlclient_key' = %s\n", handle->dlclientkey); + return 0; +} diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 44c4904b..4bcfeb8a 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -82,6 +82,8 @@ struct __alpm_handle_t { char *logfile; /* Name of the log file */ char *lockfile; /* Name of the lock file */ char *gpgdir; /* Directory where GnuPG files are stored */ + char *dlclientcert; /* Name of the client certificate */ + char *dlclientkey; /* Name of the client key */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ alpm_list_t *hookdirs; /* Paths to hook directories */ alpm_list_t *overwrite_files; /* Paths that may be overwritten */ -- 2.19.1

3 7

[pacman-dev] [PATCH] makepkg: use --unneeded for pacman call in remove_deps()
by Allan McRae 30 Jan '19

30 Jan '19

This patch was inspired by FS#32723 which asks makepkg to install makedepends before depends. The use case is build package depending on a virtual package that is only provided by other packages (e.g. java-runtime in Arch Linux), but wanting to build against a specific version. Installing makedepends first (but not at the same time as depends) would allow specifying the version to build against, instead of pacman resolving to the default version when installing depends. It turns out, we can already achieve installing makedepends first by specifying dependencies only in the package function (and making sure makedepends includes everything needed). The only issue is that if we use makepkg to install the built package with the --install flag and along with the --rmdeps flag, we will try to remove any installed dependencies that are specified in the depends array in the package function. To counter this, we need to use the --unneeded flag for the pacman call. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I think I need a prize for the size of the commit message for a one character addition! 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 c81dc801..749d074a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,7 @@ remove_deps() { msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully - if ! run_pacman -Rn ${deplist[@]}; then + if ! run_pacman -Rnu ${deplist[@]}; then warning "$(gettext "Failed to remove installed dependencies.")" return $E_REMOVE_DEPS_FAILED fi -- 2.20.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-125-g776fbe1c
by Allan McRae 30 Jan '19

30 Jan '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 776fbe1cde58739d0469d3efbc76cb13b80f18b3 (commit) from 5bd54fa0c672d89fedc7995025cf8ea4b5e5e96b (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 776fbe1cde58739d0469d3efbc76cb13b80f18b3 Author: Chloe Kudryavtsev <toast(a)toastin.space> Date: Tue Jan 29 00:54:21 2019 -0500 libmakepkg: Add lzip ext support lzip is a lossless data compressor designed to replace gzip and bzip2 as the standard general-purpose compressed format. - add .lz (lzip) support to libmakepkg/util/compress.sh:compress_as - add COMPRESSLZ to makepkg.conf.in - document COMPRESSLZ - document PKGEXT with `.tar.lz` Signed-off-by: Chloe Kudryavtsev <toast(a)toastin.space> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.asciidoc | 3 ++- etc/makepkg.conf.in | 1 + scripts/libmakepkg/util/compress.sh.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: Add lzip ext support
by Chloe Kudryavtsev 29 Jan '19

29 Jan '19

lzip is a lossless data compressor designed to replace gzip and bzip2 as the standard general-purpose compressed format. - add .lz (lzip) support to libmakepkg/util/compress.sh:compress_as - add COMPRESSLZ to makepkg.conf.in - document COMPRESSLZ Signed-off-by: Chloe Kudryavtsev <toast(a)toastin.space> --- doc/makepkg.conf.5.asciidoc | 1 + etc/makepkg.conf.in | 1 + scripts/libmakepkg/util/compress.sh.in | 1 + 3 files changed, 3 insertions(+) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 7d7796b7..cbda9c53 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -254,6 +254,7 @@ Options **COMPRESSLRZ=**"(lrzip -q)":: **COMPRESSLZ4=**"(lz4 -q)":: **COMPRESSZ=**"(compress -c -f)":: +**COMPRESSLZ=**"(lzip -c -f)":: Sets the command and options used when compressing compiled or source packages in the named format. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index a4321541..4d5cf4ea 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -135,6 +135,7 @@ COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) COMPRESSLZ4=(lz4 -q) +COMPRESSLZ=(lzip -c -f) ######################################################################### # EXTENSION DEFAULTS diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index 3a43e8b5..3d4d88fd 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -42,6 +42,7 @@ compress_as() { *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; *tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; + *tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; *tar) cat ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$ext"; cat ;; -- 2.20.1

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-124-g5bd54fa0
by Allan McRae 29 Jan '19

29 Jan '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 5bd54fa0c672d89fedc7995025cf8ea4b5e5e96b (commit) via 1e040153bcace3f67a2db1b17195f0225fbd2f5e (commit) via 9c817b654996249b8022e189ee7e2692f4668431 (commit) via ac0e21a6df65c3770920be39b3fe14d8b49f637b (commit) from 1b9e358f1d7ff806c62a7170f57342dd0e2338bf (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 5bd54fa0c672d89fedc7995025cf8ea4b5e5e96b Author: morganamilo <morganamilo(a)gmail.com> Date: Mon Jan 21 23:59:29 2019 +0000 libmakepkg: move checkdepends to the correct array Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1e040153bcace3f67a2db1b17195f0225fbd2f5e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue May 29 00:24:35 2018 -0400 libmakepkg: Implement extendable signature verification Lookup the existence of matching functions for each protocol, and fallback on the generic file handler. New verification protocols can then be added via thirdparty libmakepkg drop-ins without requiring modifications to verify_signature.sh Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9c817b654996249b8022e189ee7e2692f4668431 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon May 28 23:30:29 2018 -0400 libmakepkg: implement extendable source protocols Lookup the existence of matching functions for each protocol, and fallback on the generic file handler. New source protocols can then be added via thirdparty libmakepkg drop-ins without requiring modifications to source.sh Fixes FS#49076 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ac0e21a6df65c3770920be39b3fe14d8b49f637b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon May 28 23:14:03 2018 -0400 libmakepkg: optimize get_protocol to always return proto, not proto+uri e.g. git+https:// is commonly used for git repositories cloned over HTTPS, but we assume a proto with a plus in it is actually a protocol followed by some URI handler. So we might as well simplify the return value and not have to always add glob matching everywhere when checking the proto in use. This is required in order to use the proto directly in function calls, which will be used in a followup patch. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 7 ++-- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 9 ++--- scripts/libmakepkg/source.sh.in | 47 +++++----------------- scripts/libmakepkg/source/bzr.sh.in | 5 +++ scripts/libmakepkg/source/git.sh.in | 5 +++ scripts/libmakepkg/source/hg.sh.in | 5 +++ scripts/libmakepkg/source/svn.sh.in | 5 +++ scripts/libmakepkg/util/source.sh.in | 14 ++++--- 9 files changed, 47 insertions(+), 52 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Check for all return values of _alpm_key_in_keychain
by David Phillips 24 Jan '19

24 Jan '19

This fixes a bug I encountered with a GPG keyring where the key id used to locate a key in the keyring was ambiguous within my keychain. This commit ensures that all valid return values are checked to catch this and related error cases rather than incorrectly taking an error case to mean the key was found, since this is rarely going to be the case. --- lib/libalpm/be_package.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 7e8b7920..1891fa5a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -754,10 +754,21 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful alpm_list_t *k; for(k = keys; k; k = k->next) { char *key = k->data; - if(_alpm_key_in_keychain(handle, key) == 0) { - if(_alpm_key_import(handle, key) == -1) { + switch(_alpm_key_in_keychain(handle, key)) { + case 1: + /* key is known; proceed */ + break; + case 0: + /* key is unknown; attempt to import */ + if(_alpm_key_import(handle, key) == -1) { + fail = 1; + } + break; + case -1: + /* error finding key in keychain */ + default: fail = 1; - } + break; } } FREELIST(keys); -- 2.12.2

3 3

[pacman-dev] [PATCH] libmakepkg/source/git: Use --bare with a refspec instead of --mirror
by Johannes Löthberg 24 Jan '19

24 Jan '19

This pulls in all of the branches in the same way as --mirror, but won't also pull in all of the non-branch references. For example the refs/pull/*/{head,merge} references that GitHub creates for every PR that has ever been opened against the repo can pull in a very large amount of objects that aren't useful, and which can massively inflate a repository. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- scripts/libmakepkg/source/git.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 130c11e1..6a75c1c2 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -43,7 +43,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone --bare --config=remote.origin.fetch=+refs/heads/*:refs/heads/* "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.20.1

5 7

[pacman-dev] [PATCH v5 1/4] libmakepkg: move checkdepends to the correct array
by morganamilo 22 Jan '19

22 Jan '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index d19c95bc..a975b024 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -31,11 +31,10 @@ lint_pkgbuild_functions+=('lint_variable') lint_variable() { # TODO: refactor - similar arrays are used elsewhere - local array=(arch backup checkdepends groups license noextract options - validpgpkeys) - local arch_array=(conflicts depends makedepends md5sums optdepends provides - replaces sha1sums sha224sums sha256sums sha384sums sha512sums - source) + local array=(arch backup groups license noextract options validpgpkeys) + local arch_array=(checkdepends conflicts depends makedepends md5sums + optdepends provides replaces sha1sums sha224sums + sha256sums sha384sums sha512sums source) local string=(changelog epoch install pkgbase pkgdesc pkgrel pkgver url) local i a pkg out bad ret=0 -- 2.20.1

3 4

[pacman-dev] [PATCH 1/3] libmakepkg: optimize get_protocol to always return proto, not proto+uri
by Eli Schwartz 21 Jan '19

21 Jan '19

e.g. git+https:// is commonly used for git repositories cloned over HTTPS, but we assume a proto with a plus in it is actually a protocol followed by some URI handler. So we might as well simplify the return value and not have to always add glob matching everywhere when checking the proto in use. This is required in order to use the proto directly in function calls, which will be used in a followup patch. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 4 ++-- scripts/libmakepkg/source.sh.in | 16 ++++++++-------- scripts/libmakepkg/util/source.sh.in | 14 ++++++++------ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index eb9b74fc..b8b078ec 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -52,7 +52,7 @@ generate_one_checksum() { proto="$(get_protocol "$netfile")" case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) sum="SKIP" ;; *) diff --git a/scripts/libmakepkg/integrity/verify_signature.sh.in b/scripts/libmakepkg/integrity/verify_signature.sh.in index ea877822..38f8afa1 100644 --- a/scripts/libmakepkg/integrity/verify_signature.sh.in +++ b/scripts/libmakepkg/integrity/verify_signature.sh.in @@ -49,7 +49,7 @@ check_pgpsigs() { for netfile in "${all_sources[@]}"; do proto="$(get_protocol "$netfile")" - if [[ $proto = git* ]]; then + if [[ $proto = git ]]; then verify_git_signature "$netfile" "$statusfile" || continue else verify_file_signature "$netfile" "$statusfile" || continue @@ -263,7 +263,7 @@ source_has_signatures() { proto="$(get_protocol "$netfile")" query=$(get_uri_query "$netfile") - if [[ ${netfile%%::*} = *.@(sig?(n)|asc) || ( $proto = git* && $query = signed ) ]]; then + if [[ ${netfile%%::*} = *.@(sig?(n)|asc) || ( $proto = git && $query = signed ) ]]; then return 0 fi done diff --git a/scripts/libmakepkg/source.sh.in b/scripts/libmakepkg/source.sh.in index 5d7df732..198efd5e 100644 --- a/scripts/libmakepkg/source.sh.in +++ b/scripts/libmakepkg/source.sh.in @@ -63,16 +63,16 @@ download_sources() { local) download_local "$netfile" ;; - bzr*) + bzr) (( get_vcs )) && download_bzr "$netfile" ;; - git*) + git) (( get_vcs )) && download_git "$netfile" ;; - hg*) + hg) (( get_vcs )) && download_hg "$netfile" ;; - svn*) + svn) (( get_vcs )) && download_svn "$netfile" ;; *) @@ -93,16 +93,16 @@ extract_sources() { local file=$(get_filename "$netfile") local proto=$(get_protocol "$netfile") case "$proto" in - bzr*) + bzr) extract_bzr "$netfile" ;; - git*) + git) extract_git "$netfile" ;; - hg*) + hg) extract_hg "$netfile" ;; - svn*) + svn) extract_svn "$netfile" ;; *) diff --git a/scripts/libmakepkg/util/source.sh.in b/scripts/libmakepkg/util/source.sh.in index 17e44664..faa7061b 100644 --- a/scripts/libmakepkg/util/source.sh.in +++ b/scripts/libmakepkg/util/source.sh.in @@ -41,10 +41,12 @@ get_protocol() { if [[ $1 = *://* ]]; then # strip leading filename local proto="${1#*::}" - printf "%s\n" "${proto%%://*}" + proto="${proto%%://*}" + # strip proto+uri:// + printf "%s\n" "${proto%%+*}" elif [[ $1 = *lp:* ]]; then local proto="${1#*::}" - printf "%s\n" "${proto%%lp:*}" + printf "%s\n" "${proto%%+lp:*}" else printf "%s\n" local fi @@ -63,15 +65,15 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) filename=${netfile%%#*} filename=${filename%%\?*} filename=${filename%/} filename=${filename##*/} - if [[ $proto = bzr* ]]; then + if [[ $proto = bzr ]]; then filename=${filename#*lp:} fi - if [[ $proto = git* ]]; then + if [[ $proto = git ]]; then filename=${filename%%.git*} fi ;; @@ -89,7 +91,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - bzr*|git*|hg*|svn*) + bzr|git|hg|svn) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then -- 2.17.0

2 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-120-g1b9e358f
by Allan McRae 21 Jan '19

21 Jan '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 1b9e358f1d7ff806c62a7170f57342dd0e2338bf (commit) via 4d1d857ef050778abd22669058dc5f7781604299 (commit) via ff8c96fa7dd3ff8cb510e201b799ac48095d81ea (commit) via c15f7ae606683b3eb52ae5eaac7afc83cf04859b (commit) via a5090217f9ef3961153442577e8632310f79a272 (commit) from 10bcf66db8dffbadd6f051acba3b543693819eff (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 1b9e358f1d7ff806c62a7170f57342dd0e2338bf Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 20 23:31:21 2019 -0500 libmakepkg: make gettext replacements more templated Making the undescore be translated is probably not something we need translators to think about. Additionally, a number of places which use the same text differ only by the variable being referenced, so simplifying the string means we can drop a redundant translation. Bonus: we save a few bytes here and there. \o/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d1d857ef050778abd22669058dc5f7781604299 Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Jan 18 21:08:03 2019 +0000 libalpm: fix minor typo in _alpm_db_usage_ Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ff8c96fa7dd3ff8cb510e201b799ac48095d81ea Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jan 21 13:20:47 2019 +1000 Fix typo in pacman man page Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c15f7ae606683b3eb52ae5eaac7afc83cf04859b Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Jan 15 22:41:34 2019 +0000 libmakepkg: disallow using 'any' with other arches Error if the arch array contains any and any other values. This also fixes a bug where the check for `$arch == 'any'` which only evaluated the first value in the array, meaning the rest of the values would not be linted. Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a5090217f9ef3961153442577e8632310f79a272 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 22:55:00 2019 -0500 meson: fix website target A number of pages don't actually exist as html inside the source tree, and need to be generated even though they are manpages. This caused the website.tar.gz target to only work inside a dirty tree initially created by autotools. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/meson.build | 17 +++++++++++++---- doc/pacman.8.asciidoc | 2 +- lib/libalpm/alpm.h | 2 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 9 +++++++-- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- 5 files changed, 23 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: make gettext replacements more templated
by Eli Schwartz 21 Jan '19

21 Jan '19

Making the undescore be translated is probably not something we need translators to think about. Additionally, a number of places which use the same text differ only by the variable being referenced, so simplifying the string means we can drop a redundant translation. Bonus: we save a few bytes here and there. \o/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in index 1ee3c834..d19c95bc 100644 --- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -86,7 +86,7 @@ lint_variable() { for i in ${arch_array[@]}; do if extract_function_variable "package_$pkg" "${i}_${a}" 0 out; then - error "$(gettext "%s_%s should be an array")" "$i" "$a" + error "$(gettext "%s should be an array")" "${i}_${a}" ret=1 fi done -- 2.20.1

1 0

[pacman-dev] [PATCH] Fix typo in pacman man page
by Allan McRae 21 Jan '19

21 Jan '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 66483bcb..6b2d9172 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -514,7 +514,7 @@ designated to be backed up. During an upgrade, three MD5 hashes are used for each backup file to determine the required action: one for the original file installed, one for the new file that is about to be installed, and one for the actual file existing on the file system. After comparing these three hashes, the -follow scenarios can result: +following scenarios can result: original=X, current=X, new=X:: All three files are the same, so overwrites are not an issue. Install the -- 2.20.1

1 0

[pacman-dev] [PATCH] libalpm: fix minor typo in _alpm_db_usage_
by morganamilo 18 Jan '19

18 Jan '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bbce0971..337b30d2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1046,7 +1046,7 @@ alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db); */ alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); -typedef enum _alpm_db_usage_ { +typedef enum _alpm_db_usage_t { ALPM_DB_USAGE_SYNC = 1, ALPM_DB_USAGE_SEARCH = (1 << 1), ALPM_DB_USAGE_INSTALL = (1 << 2), -- 2.20.1

1 0

[pacman-dev] [PATCH 1/2] meson: fix website target
by Eli Schwartz 16 Jan '19

16 Jan '19

A number of pages don't actually exist as html inside the source tree, and need to be generated even though they are manpages. This caused the website.tar.gz target to only work inside a dirty tree initially created by autotools. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/meson.build | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 7c9631cb..4d796492 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -14,6 +14,13 @@ manpages = [ { 'name': 'BUILDINFO.5' }, ] +sitepages = [ + { 'name': 'submitting-patches' }, + { 'name': 'translation-help' }, + { 'name': 'HACKING', 'source': join_paths(meson.current_source_dir(), '../HACKING') }, + { 'name': 'index' }, +] + asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ @@ -58,6 +65,12 @@ foreach page : manpages install : true, install_dir : mandirn, ) +endforeach + +foreach page: manpages + sitepages + manpage = page['name'] + htmlpage = '@0@.html'.format(manpage) + input = page.get('source', '@0@.asciidoc'.format(manpage)) html = custom_target( htmlpage, @@ -85,6 +98,8 @@ foreach page : manpages html_files += [htmlpage] endforeach + + run_target('html', command : ['/bin/true'], depends : html_targets) @@ -96,10 +111,6 @@ custom_target( '-C', meson.current_build_dir(), ] + html_files + [ '-C', meson.current_source_dir(), - 'submitting-patches.html', - 'translation-help.html', - 'HACKING.html', - 'index.html', 'asciidoc-override.css', '-C', '/etc/asciidoc/stylesheets/', 'asciidoc.css', -- 2.20.1

3 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-115-g10bcf66d
by Allan McRae 14 Jan '19

14 Jan '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 10bcf66db8dffbadd6f051acba3b543693819eff (commit) via 02598521b1e6a2bffd0dc0917052a40b4a247f0e (commit) via a769fbfd402b149e4fee5ce65b26bae8c56b5d43 (commit) via b76dbb1159fb5d55bc0fd085bae0b5d3bc8dd1d8 (commit) from ce040514c4ed79f3053a104242cde90af471041a (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 10bcf66db8dffbadd6f051acba3b543693819eff Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 22:29:23 2019 -0500 update a bunch of links for https and to adapt to changing domains projects.archlinux.org and mailman.archlinux.org are both migrated to new domains. Transifex supports https, so encourage its use by default. Take advantage of the opportunity when updating these links, to also delist some projects that are dead. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 02598521b1e6a2bffd0dc0917052a40b4a247f0e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 11:57:44 2019 -0500 doc: add a couple missing manpages from the html index The index embeds the names of all doc subpages, and these were never updated. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a769fbfd402b149e4fee5ce65b26bae8c56b5d43 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Jan 12 20:22:27 2019 -0500 doc: keep manpages and html pages in sync We forgot to add BUILDINFO to the list of html docs. Instead of always updating things in two places, just derive the one from the other. meson did not have this problem as it already derives both lists from one template. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b76dbb1159fb5d55bc0fd085bae0b5d3bc8dd1d8 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Jan 13 21:18:40 2019 -0500 meson: fix regression that broke building libmakepkg In commit f7efa6a93d5361af610827d41045d87c7a72f2b5 we added a new file, and also wired it up to the build systems, but it got added under the wrong name in meson.build Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 14 +------------- doc/index.asciidoc | 24 ++++++++++++------------ doc/submitting-patches.asciidoc | 2 +- doc/translation-help.asciidoc | 8 ++++---- scripts/libmakepkg/lint_pkgbuild/meson.build | 2 +- 5 files changed, 19 insertions(+), 31 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] update a bunch of links for https and to adapt to changing domains
by Eli Schwartz 14 Jan '19

14 Jan '19

projects.archlinux.org and mailman.archlinux.org are both migrated to new domains. Transifex supports https, so encourage its use by default. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/index.asciidoc | 24 ++++++++++++------------ doc/submitting-patches.asciidoc | 2 +- doc/translation-help.asciidoc | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/index.asciidoc b/doc/index.asciidoc index fa7444db..6d3273ed 100644 --- a/doc/index.asciidoc +++ b/doc/index.asciidoc @@ -59,11 +59,11 @@ configuration files dealing with pacman. Changelog ~~~~~~~~~ For a good idea of what is going on in pacman development, take a look at the -link:https://projects.archlinux.org/pacman.git/[Git summary page] for the +link:https://git.archlinux.org/pacman.git/[Git summary page] for the project. See the most recent -link:https://projects.archlinux.org/pacman.git/tree/NEWS[NEWS] +link:https://git.archlinux.org/pacman.git/tree/NEWS[NEWS] file for a not-as-frequently-updated list of changes. However, this should contain the biggest changes in a format more concise than the commit log. @@ -203,8 +203,8 @@ Development Mailing List ~~~~~~~~~~~~ There is a mailing list devoted to pacman development, hosted by Arch Linux. -link:https://mailman.archlinux.org/mailman/listinfo/pacman-dev/[Subscribe] or -link:https://mailman.archlinux.org/pipermail/pacman-dev/[view the archives]. +link:https://lists.archlinux.org/listinfo/pacman-dev/[Subscribe] or +link:https://lists.archlinux.org/pipermail/pacman-dev/[view the archives]. Source Code ~~~~~~~~~~~ @@ -215,11 +215,11 @@ these trees). The current development tree can be fetched with the following command: - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://git.archlinux.org/pacman.git pacman which will fetch the full development history into a directory named pacman. You can browse the source as well using -link:https://projects.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also +link:https://git.archlinux.org/pacman.git/[cgit]. HTTP/HTTPS URLs are also available for cloning purposes; these URLs are listed at the above page. If you are interested in hacking on pacman, it is highly recommended you join @@ -238,15 +238,15 @@ Although the package manager itself is quite simple, many scripts have been developed that help automate building and installing packages. These are used extensively in link:https://www.archlinux.org/[Arch Linux]. Most of these utilities are available in the Arch Linux projects -link:https://projects.archlinux.org/[code browser]. +link:https://git.archlinux.org/[code browser]. Utilities available: -* link:https://projects.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download & use the Arch Linux PKGBUILD tree -* link:https://projects.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories -* link:https://projects.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking -* link:https://projects.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python -* link:https://projects.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper +* link:https://git.archlinux.org/abs.git/[abs] - ABS (Arch Build System), scripts to download & use the Arch Linux PKGBUILD tree +* link:https://git.archlinux.org/dbscripts.git/[dbscripts] - scripts used by Arch Linux to manage the main package repositories +* link:https://git.archlinux.org/devtools.git/[devtools] - tools to assist in packaging and dependency checking +* link:https://git.archlinux.org/namcap.git/[namcap] - a package analysis utility written in python +* link:https://git.archlinux.org/srcpac.git/[srcpac] - a bash build-from-source pacman wrapper Bugs ---- diff --git a/doc/submitting-patches.asciidoc b/doc/submitting-patches.asciidoc index 9cf8dc64..88b58ca5 100644 --- a/doc/submitting-patches.asciidoc +++ b/doc/submitting-patches.asciidoc @@ -20,7 +20,7 @@ started with GIT if you have not worked with it before. The pacman code can be fetched using the following command: - git clone git://projects.archlinux.org/pacman.git + git clone git://git.archlinux.org/pacman.git Creating your patch diff --git a/doc/translation-help.asciidoc b/doc/translation-help.asciidoc index 67117bcc..5a67a2d6 100644 --- a/doc/translation-help.asciidoc +++ b/doc/translation-help.asciidoc @@ -4,10 +4,10 @@ Pacman - Translating This document is here to guide you in helping translate pacman messages, libalpm messages, and the manual pages for the entire pacman package. -We are currently using http://www.transifex.com/[Transifex] as the translation +We are currently using https://www.transifex.com/[Transifex] as the translation platform for pacman and libalpm. You will need to sign up for an account there and then register with a translation team on the -http://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. +https://www.transifex.com/projects/p/archlinux-pacman/[pacman project page]. NOTE: This may be old information due to our switch to Transifex, but the gettext website is a very useful guide to read before embarking on translation @@ -31,7 +31,7 @@ either be hand-edited, or modified with a tool such as poedit, gtranslator or kbabel. Using a translation tool tends to make the job easier. Please read up on Transifex usage using the -http://docs.transifex.com/[Transifex Help] if you are not familiar. +https://docs.transifex.com/[Transifex Help] if you are not familiar. Transifex provides a command-line client to help with translations. Here is an example set of commands if you have a source code checkout and are not @@ -78,7 +78,7 @@ Incremental Updates If you have more advanced needs you will have to get a copy of the pacman repository. - git clone git://projects.archlinux.org/pacman.git pacman + git clone git://git.archlinux.org/pacman.git pacman Next, you will need to run `./autogen.sh` and `./configure` in the base directory to generate the correct Makefiles. At this point, all necessary -- 2.20.1

2 3

[pacman-dev] [PATCH] meson: fix regression that broke building libmakepkg
by Eli Schwartz 14 Jan '19

14 Jan '19

In commit f7efa6a93d5361af610827d41045d87c7a72f2b5 we added a new file, and also wired it up to the build systems, but it got added under the wrong name in meson.build Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- allanbrokeit when updating the pre-meson patch for meson. :p scripts/libmakepkg/lint_pkgbuild/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/meson.build b/scripts/libmakepkg/lint_pkgbuild/meson.build index 220f6a25..4ca414e4 100644 --- a/scripts/libmakepkg/lint_pkgbuild/meson.build +++ b/scripts/libmakepkg/lint_pkgbuild/meson.build @@ -8,7 +8,7 @@ sources = [ 'conflicts.sh.in', 'depends.sh.in', 'epoch.sh.in', - 'fullversion.sh.in', + 'fullpkgver.sh.in', 'install.sh.in', 'makedepends.sh.in', 'optdepends.sh.in', -- 2.20.1

1 0