- Pacman-dev - lists.archlinux.org

[pacman-dev] Source code not available. FTP broken.
by Folatt 09 Aug '15

09 Aug '15

Hi there! I only subscribed to this mailing list because I have problem with downloading the source code of the latest release version as I need to install pacman locally on my machine. But the FTP seems broken. I get a 404 message. Is there any chance you will have it up again today/tomorrow/next week? Greets, Folatt RPG

3 3

[pacman-dev] [PATCH] libmakepkg: util/pkgbuild.sh needs processing on build
by Allan McRae 08 Aug '15

08 Aug '15

pkgbuild.sh contained @DEBUGSUFFIX@ and so needs to be run through the sed command on build. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 2 +- scripts/libmakepkg/util/pkgbuild.sh | 191 --------------------------------- scripts/libmakepkg/util/pkgbuild.sh.in | 191 +++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 scripts/libmakepkg/util/pkgbuild.sh create mode 100644 scripts/libmakepkg/util/pkgbuild.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 907dc4f..58c7f73 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -50,7 +50,6 @@ LIBMAKEPKGDIRS = \ LIBMAKEPKG = \ libmakepkg/util/message.sh \ libmakepkg/util/option.sh \ - libmakepkg/util/pkgbuild.sh \ libmakepkg/util/util.sh LIBMAKEPKG_IN = \ @@ -92,6 +91,7 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/upx.sh \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ + libmakepkg/util/pkgbuild.sh \ libmakepkg/util/source.sh LIBMAKEPKG_DIST = \ diff --git a/scripts/libmakepkg/util/pkgbuild.sh b/scripts/libmakepkg/util/pkgbuild.sh deleted file mode 100644 index 2423a83..0000000 --- a/scripts/libmakepkg/util/pkgbuild.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/bash -# -# pkgbuild.sh - functions to extract information from PKGBUILD files -# -# Copyright (c) 2014-2015 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_UTIL_PKGBUILD_SH" ]] && return -LIBMAKEPKG_UTIL_PKGBUILD_SH=1 - - -have_function() { - declare -f "$1" >/dev/null -} - -grep_function() { - { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" -} - -array_build() { - local dest=$1 src=$2 i keys values - - # 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. - eval "keys=(\"\${!$2[@]}\")" - - # Clear the destination array - eval "$dest=()" - - # Read values indirectly via their index. This approach gives us support - # for associative arrays, sparse arrays, and empty strings as elements. - for i in "${keys[@]}"; do - values+=("printf -v '$dest[$i]' %s \"\${$src[$i]}\";") - done - - eval "${values[*]}" -} - -extract_global_variable() { - # $1: variable name - # $2: multivalued - # $3: name of output var - - local attr=$1 isarray=$2 outputvar=$3 ref - - if (( isarray )); then - array_build ref "$attr" - [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" - else - [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" - fi -} - -extract_function_variable() { - # $1: function name - # $2: variable name - # $3: multivalued - # $4: name of output var - - local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 - - if (( isarray )); then - printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2" - else - printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" - fi - - while read -r; do - # strip leading whitespace and any usage of declare - decl=${REPLY##*([[:space:]])} - eval "${decl/#$attr/$outputvar}" - - # entering this loop at all means we found a match, so notify the caller. - r=0 - done < <(grep_function "$funcname" "$attr_regex") - - return $r -} - -get_pkgbuild_attribute() { - # $1: package name - # $2: attribute name - # $3: multivalued - # $4: name of output var - - local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 - - printf -v "$outputvar" %s '' - - if [[ $pkgname ]]; then - extract_global_variable "$attrname" "$isarray" "$outputvar" - extract_function_variable "package_$pkgname" "$attrname" "$isarray" "$outputvar" - else - extract_global_variable "$attrname" "$isarray" "$outputvar" - fi -} - -## -# usage : get_full_version() -# return : full version spec, including epoch (if necessary), pkgver, pkgrel -## -get_full_version() { - if (( epoch > 0 )); then - printf "%s\n" "$epoch:$pkgver-$pkgrel" - else - printf "%s\n" "$pkgver-$pkgrel" - fi -} - -## -# usage : get_pkg_arch( [$pkgname] ) -# return : architecture of the package -## -get_pkg_arch() { - if [[ -z $1 ]]; then - if [[ $arch = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - else - local arch_override - get_pkgbuild_attribute "$1" arch 1 arch_override - (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") - if [[ $arch_override = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - fi -} - -print_all_package_names() { - local version=$(get_full_version) - local architecture pkg opts a - for pkg in ${pkgname[@]}; do - get_pkgbuild_attribute "$pkg" 'arch' 1 architecture - get_pkgbuild_attribute "$pkg" 'options' 1 opts - for a in ${architecture[@]}; do - printf "%s-%s-%s\n" "$pkg" "$version" "$a" - if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then - printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" - fi - done - done -} - -get_all_sources() { - local aggregate l a - - if array_build l 'source'; then - aggregate+=("${l[@]}") - fi - - for a in "${arch[@]}"; do - if array_build l "source_$a"; then - aggregate+=("${l[@]}") - fi - done - - array_build "$1" "aggregate" -} - -get_all_sources_for_arch() { - local aggregate l - - if array_build l 'source'; then - aggregate+=("${l[@]}") - fi - - if array_build l "source_$CARCH"; then - aggregate+=("${l[@]}") - fi - - array_build "$1" "aggregate" -} diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in new file mode 100644 index 0000000..2423a83 --- /dev/null +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -0,0 +1,191 @@ +#!/bin/bash +# +# pkgbuild.sh - functions to extract information from PKGBUILD files +# +# Copyright (c) 2014-2015 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_UTIL_PKGBUILD_SH" ]] && return +LIBMAKEPKG_UTIL_PKGBUILD_SH=1 + + +have_function() { + declare -f "$1" >/dev/null +} + +grep_function() { + { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" +} + +array_build() { + local dest=$1 src=$2 i keys values + + # 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. + eval "keys=(\"\${!$2[@]}\")" + + # Clear the destination array + eval "$dest=()" + + # Read values indirectly via their index. This approach gives us support + # for associative arrays, sparse arrays, and empty strings as elements. + for i in "${keys[@]}"; do + values+=("printf -v '$dest[$i]' %s \"\${$src[$i]}\";") + done + + eval "${values[*]}" +} + +extract_global_variable() { + # $1: variable name + # $2: multivalued + # $3: name of output var + + local attr=$1 isarray=$2 outputvar=$3 ref + + if (( isarray )); then + array_build ref "$attr" + [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" + else + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" + fi +} + +extract_function_variable() { + # $1: function name + # $2: variable name + # $3: multivalued + # $4: name of output var + + local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 + + if (( isarray )); then + printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2" + else + printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" + fi + + while read -r; do + # strip leading whitespace and any usage of declare + decl=${REPLY##*([[:space:]])} + eval "${decl/#$attr/$outputvar}" + + # entering this loop at all means we found a match, so notify the caller. + r=0 + done < <(grep_function "$funcname" "$attr_regex") + + return $r +} + +get_pkgbuild_attribute() { + # $1: package name + # $2: attribute name + # $3: multivalued + # $4: name of output var + + local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 + + printf -v "$outputvar" %s '' + + if [[ $pkgname ]]; then + extract_global_variable "$attrname" "$isarray" "$outputvar" + extract_function_variable "package_$pkgname" "$attrname" "$isarray" "$outputvar" + else + extract_global_variable "$attrname" "$isarray" "$outputvar" + fi +} + +## +# usage : get_full_version() +# return : full version spec, including epoch (if necessary), pkgver, pkgrel +## +get_full_version() { + if (( epoch > 0 )); then + printf "%s\n" "$epoch:$pkgver-$pkgrel" + else + printf "%s\n" "$pkgver-$pkgrel" + fi +} + +## +# usage : get_pkg_arch( [$pkgname] ) +# return : architecture of the package +## +get_pkg_arch() { + if [[ -z $1 ]]; then + if [[ $arch = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + else + local arch_override + get_pkgbuild_attribute "$1" arch 1 arch_override + (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") + if [[ $arch_override = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + fi +} + +print_all_package_names() { + local version=$(get_full_version) + local architecture pkg opts a + for pkg in ${pkgname[@]}; do + get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + get_pkgbuild_attribute "$pkg" 'options' 1 opts + for a in ${architecture[@]}; do + printf "%s-%s-%s\n" "$pkg" "$version" "$a" + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" + fi + done + done +} + +get_all_sources() { + local aggregate l a + + if array_build l 'source'; then + aggregate+=("${l[@]}") + fi + + for a in "${arch[@]}"; do + if array_build l "source_$a"; then + aggregate+=("${l[@]}") + fi + done + + array_build "$1" "aggregate" +} + +get_all_sources_for_arch() { + local aggregate l + + if array_build l 'source'; then + aggregate+=("${l[@]}") + fi + + if array_build l "source_$CARCH"; then + aggregate+=("${l[@]}") + fi + + array_build "$1" "aggregate" +} -- 2.5.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-193-g5780350
by allan＠archlinux.org 08 Aug '15

08 Aug '15

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 578035075108a90d20f084f077badf05d1c8527c (commit) via ae97082e98b6c3984799ba9f3f6ccc6ef5da6034 (commit) via 48f4efd9a18966509bd599684e77d3ad49d5b082 (commit) via ccd3a3eb9fad7b4c311a6bfb57b69a7a1a13c46a (commit) via 1ee2032b7f4a7aa6de973d7671fc6af135cef9b5 (commit) via 2d0e2bf2558698db242fbc382675ee00044c0d76 (commit) via b8c9385b8bbe9ad8a904e4cc27966f1029e67765 (commit) via 877578762cf47a9820bcc3cabbc138fe19ce3365 (commit) via 8566034866615f1acee6f3ed447ca88f01105b2e (commit) from deac9731884a83ad91eab9f27b288f406f56c87b (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 578035075108a90d20f084f077badf05d1c8527c Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jul 4 18:39:42 2015 +0200 libalpm: Force update when database is marked as corrupted. When a database and its signature is updated non-atomically on a server, there is a window where a user may update the database but grab the old signature. The database is marked as invalid by libalpm, which can be fixed by forcing a refresh (assuming the server has caught up and the user realizes what has happened) or with a future update of the repo. Work around this by forcing a repository refresh whenever a database is invalid. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ae97082e98b6c3984799ba9f3f6ccc6ef5da6034 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 16 19:05:34 2015 -0400 fill in name_hash for assumeinstalled options alpm_depend_t is an exposed data type. Front-ends may opt for alloc'ing one and filling the fields manually, but alpm's _alpm_hash_sdbm is not exposed, making it impossible for them to fill in the name_hash field. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48f4efd9a18966509bd599684e77d3ad49d5b082 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 16 19:05:33 2015 -0400 copy assumeinstalled options All other option setters copy their input. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ccd3a3eb9fad7b4c311a6bfb57b69a7a1a13c46a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 16 19:05:32 2015 -0400 check assumeinstalled for meaningful mod assumeinstalled options are used as provisions for which MOD_EQ and MOD_ANY are the only meaningful settings. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1ee2032b7f4a7aa6de973d7671fc6af135cef9b5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Jul 16 19:05:31 2015 -0400 check dep versions before calling strcmp Fixes a segfault when trying to remove an assumeinstalled option without a version. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d0e2bf2558698db242fbc382675ee00044c0d76 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Mon Jul 20 21:34:10 2015 +0200 pacman/util.c: Fix memory leak if realloc fails Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8c9385b8bbe9ad8a904e4cc27966f1029e67765 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 8 10:32:23 2015 +1000 Remove ko_KR translation The "ko_KR" locale is the same as the "ko" locale. Remove the "ko_KR" variant as it is incomplete and has been superseded by "ko" on transifex. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 877578762cf47a9820bcc3cabbc138fe19ce3365 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 20 14:50:52 2015 +1000 libmakepkg: move color settings to function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8566034866615f1acee6f3ed447ca88f01105b2e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jul 20 13:41:36 2015 +1000 pacman/files.c: fix memory leak on regex error Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 5 + lib/libalpm/handle.c | 28 +- lib/libalpm/po/LINGUAS | 1 - lib/libalpm/po/ko_KR.po | 817 ----------------- scripts/libmakepkg/util/message.sh | 20 + scripts/makepkg.sh.in | 22 +- scripts/po/LINGUAS | 1 - scripts/po/ko_KR.po | 1761 ------------------------------------ src/pacman/conf.c | 2 +- src/pacman/files.c | 1 + src/pacman/po/LINGUAS | 1 - src/pacman/po/ko_KR.po | 1625 --------------------------------- src/pacman/util.c | 7 +- 13 files changed, 61 insertions(+), 4230 deletions(-) delete mode 100644 lib/libalpm/po/ko_KR.po delete mode 100644 scripts/po/ko_KR.po delete mode 100644 src/pacman/po/ko_KR.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] check dep versions before calling strcmp
by Andrew Gregory 08 Aug '15

08 Aug '15

Fixes a segfault when trying to remove an assumeinstalled option without a version. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 4915d0b..1be2484 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -606,10 +606,21 @@ static int assumeinstalled_cmp(const void *d1, const void *d2) const alpm_depend_t *dep1 = d1; const alpm_depend_t *dep2 = d2; - if(strcmp(dep1->name, dep2->name) == 0 && strcmp(dep1->version, dep2->version) == 0) { + if(dep1->name_hash != dep2->name_hash + || strcmp(dep1->name, dep2->name) != 0) { + return -1; + } + + if(dep1->version && dep2->version + && strcmp(dep1->version, dep2->version) == 0) { return 0; } + if(dep1->version == NULL && dep2->version == NULL) { + return 0; + } + + return -1; } -- 2.4.6

2 6

[pacman-dev] [PATCH 1/2] Remove ko_KR translation
by Allan McRae 08 Aug '15

08 Aug '15

The "ko_KR" locale is the same as the "ko" locale. Remove the "ko_KR" variant as it is incomplete and has been superseded by "ko" on transifex. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/po/LINGUAS | 1 - lib/libalpm/po/ko_KR.po | 817 ---------------------- scripts/po/LINGUAS | 1 - scripts/po/ko_KR.po | 1761 ----------------------------------------------- src/pacman/po/LINGUAS | 1 - src/pacman/po/ko_KR.po | 1625 ------------------------------------------- 6 files changed, 4206 deletions(-) delete mode 100644 lib/libalpm/po/ko_KR.po delete mode 100644 scripts/po/ko_KR.po delete mode 100644 src/pacman/po/ko_KR.po <snip>

1 0

[pacman-dev] [PATCH] pacman/util.c: Fix memory leak if realloc fails
by Rikard Falkeborn 08 Aug '15

08 Aug '15

--- src/pacman/util.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index dd6e218..3d71d8b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1449,11 +1449,14 @@ int multiselect_question(char *array, int count) size_t len; /* handle buffer not being large enough to read full line case */ while(*lastchar == '\0' && lastchar[-1] != '\n') { + char *new_response; response_len += response_incr; - response = realloc(response, response_len); - if(!response) { + new_response = realloc(response, response_len); + if(!new_response) { + free(response); return -1; } + response = new_response; lastchar = response + response_len - 1; /* sentinel byte */ *lastchar = 1; -- 2.4.6

2 1

[pacman-dev] [PATCH] libmakepkg: check if PKGBUILD variables are arrays or not as appropriate
by Allan McRae 07 Aug '15

07 Aug '15

When extracting variables from PKGBUILD (e.g. for .SRCINFO creation) we make assumptions about whether variables are arrays or not. This adds a check to the PKGBUILD linter to ensure variables are arrays or not as appropriate. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_pkgbuild/array.sh.in | 62 ++++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 64 insertions(+) create mode 100644 scripts/libmakepkg/lint_pkgbuild/array.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 907dc4f..e961d26 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -59,6 +59,7 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ libmakepkg/lint_pkgbuild/arch.sh \ + libmakepkg/lint_pkgbuild/array.sh \ libmakepkg/lint_pkgbuild/backup.sh \ libmakepkg/lint_pkgbuild/changelog.sh \ libmakepkg/lint_pkgbuild/epoch.sh \ diff --git a/scripts/libmakepkg/lint_pkgbuild/array.sh.in b/scripts/libmakepkg/lint_pkgbuild/array.sh.in new file mode 100644 index 0000000..64717e9 --- /dev/null +++ b/scripts/libmakepkg/lint_pkgbuild/array.sh.in @@ -0,0 +1,62 @@ +#!/bin/bash +# +# array.sh - Check that variables are or are not arrays as appropriate +# +# Copyright (c) 2014-2015 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_LINT_PKGBUILD_ARRAY_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_ARRAY_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +lint_pkgbuild_functions+=('lint_array') + + +lint_array() { + array=(arch backup checkdepends groups license noextract options validpgpkeys) + arch_array=(conflicts depends makedepends md5sums optdepends provides replaces + sha1sums sha256sums sha384sums sha512sums source) + string=(changelog epoch install pkgdesc pkgrel pkgver url) + + for i in ${array[@]}; do + if grep -q "$i=[^(]" $BUILDSCRIPT; then + error "$(gettext "%s should be an array")" "$i" + ret=1 + fi + done + + for a in ${arch[@]}; do + [[ $a == "any" ]] && continue + + for i in ${arch_array[@]}; do + if grep -q "$i_$a=[^(]" $BUILDSCRIPT; then + error "$(gettext "%s_%s should be an array")" "$i" "$a" + ret=1 + fi + done + done + + for i in ${string[@]}; do + if grep -q "$i=(" $BUILDSCRIPT; then + error "$(gettext "%s should not be an array")" "$i" + ret=1 + fi + done +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 00cb1b8..261374a 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -13,6 +13,7 @@ scripts/libmakepkg/lint_package/build_references.sh.in scripts/libmakepkg/lint_package/missing_backup.sh.in scripts/libmakepkg/lint_pkgbuild.sh.in scripts/libmakepkg/lint_pkgbuild/arch.sh.in +scripts/libmakepkg/lint_pkgbuild/array.sh.in scripts/libmakepkg/lint_pkgbuild/backup.sh.in scripts/libmakepkg/lint_pkgbuild/changelog.sh.in scripts/libmakepkg/lint_pkgbuild/epoch.sh.in -- 2.4.6

2 5

[pacman-dev] Patch-proposal for makepkg: be able to use su for installations even if sudo is installed
by Jonas Große Sundrup 28 Jul '15

28 Jul '15

Hi, at the moment makepkg will use sudo to obtain root privileges if it is installed, otherwise it will use su. This means that if sudo is configured to only allow special commands (and none of those is "pacman"), "makepkg -i" will fail to install the built package. Same goes for installing dependencies with "makepkg -s". The patch appended introduces a new variable into makepkg.conf named SUPER_USER_BINARY, which is set to "sudo" by default. With it being "sudo" makepkg will behave as it does currently, so there should be no breakages with updates. If not set to sudo, makepkg will ignore an installed sudo and use su right away. Comments on this? ~ Jonas >From d4d0e6914ce669123e77f6f470fdbe56e40b449a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Gro=C3=9Fe=20Sundrup?= <cherti(a)letopolis.de> Date: Sat, 25 Jul 2015 00:45:18 +0200 Subject: [PATCH] implemented option to use su even if sudo is installed --- etc/makepkg.conf.in | 9 +++++++++ scripts/makepkg.sh.in | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 71ec624..e466edc 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -142,4 +142,13 @@ COMPRESSZ=(compress -c -f) PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' +######################################################################### +# SUPER USER BINARY +######################################################################### +# +# how to obtain root-privileges for installing packages +# can be either sudo or su +# +SUPER_USER_BINARY='sudo' + # vim: set ft=sh ts=2 sw=2 et: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8b6557e..68edee5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -229,7 +229,7 @@ run_pacman() { cmd=("$PACMAN_PATH" "$@") fi if [[ $1 != -@(T|Qq) ]]; then - if type -p sudo >/dev/null; then + if type -p sudo >/dev/null && [[ $SUPER_USER_BINARY == "sudo" ]]; then cmd=(sudo "${cmd[@]}") else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") @@ -1507,9 +1507,11 @@ check_software() { fi # check for sudo if we will need it during makepkg execution - if (( DEP_BIN || RMDEPS || INSTALL )); then - if ! type -p sudo >/dev/null; then - warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" + if [[ $SUPER_USER_BINARY == "sudo" ]]; then + if (( DEP_BIN || RMDEPS || INSTALL )); then + if ! type -p sudo >/dev/null; then + warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" + fi fi fi -- 2.4.6

5 7

[pacman-dev] Signature within repo databases?
by Allan McRae 22 Jul '15

22 Jul '15

I searched the archives, but I can not find why we stored the package PGP signatures base64'd in the repo database rather than downloading them as needed. Signatures are responsible for ~55% of the Arch repo database size, so I am guessing there must have been a tradeoff. Can anyone provide insight to this? It was 2008... Thanks, Allan

4 3

[pacman-dev] RFC: 'repo-add' command for repository discovery
by Tim Groeneveld 21 Jul '15

21 Jul '15

Hi Everyone, I have been thinking about the creation of a tool similar to Ubuntu's add-apt-repository, allowing some automation of the repository adding process inside Arch Linux. My thoughts at the moment would be to create a simple bash script (`repo-add`?) that would get the TXT record for the second command line argument. For example, I could run: repo-add packages.timg.ws The script would then get the TXT record for packages.timg.ws. That TXT record would point to a .conf file that contains all of the configuration for the "packages.timg.ws" repository. That .conf file would be downloaded, and then placed into /etc/pacman.d My thinking is that this command would set up the pacman configuration, and check that everything is OK. If the .conf file contains as a comment with the fingerprint and location of a public key, then `pacman-key` can additionally be automated, maybe showing a message showing what the fingerprint is and that the gpg key downloaded from the comment on the .conf file matches that of the public key. Additionally, a .conf file from the TXT record could also suggest that packages get installed straight after the repo-add command has been ran. If the second command is a URI, then either that file could be downloaded (skipping the "discovery" of a repository), or just the host could be extracted from the URI allowing the discovery to go back to the TXT record. Having this command use the TXT record has two awesome advantages: 1. My site (eg, packges.timg.ws) could be hosted on a different server to where the packages are. 2. No more copying & pasting a whole bunch of configuration to add a repository. Example Run: # repo-add packages.timg.ws 1. The script dig's the hostname that was entered as the second argument on the script: # dig TXT packages.timg.ws +short "http://timg.ws/archlinux/repo/timgws.conf" 2. The .conf file is downloaded. 3. The GPG key shown in the .conf file is downloaded 4. Fingerprint matched, OK (here there would be a warning if the fingerprint of key != fingerprint in conf) 5. Fingerprint shown, confirmation requested 6. conf added to pacman, if packages are suggested, show what they are, ask to run pacman -Su <packages> 7. ??? 8. Profit! Please let me know your thoughts. Tim

4 5