- Pacman-dev - lists.archlinux.org

[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