- 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