- Pacman-dev - lists.archlinux.org

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

07 Sep '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> --- v2: - rename file - do word based matching - also check += usage scripts/Makefile.am | 1 + scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 65 +++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 67 insertions(+) create mode 100644 scripts/libmakepkg/lint_pkgbuild/variable.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 58c7f73..d660c0b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -73,6 +73,7 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_pkgbuild/provides.sh \ libmakepkg/lint_pkgbuild/source.sh \ libmakepkg/lint_pkgbuild/util.sh \ + libmakepkg/lint_pkgbuild/variable.sh \ libmakepkg/source.sh \ libmakepkg/source/bzr.sh \ libmakepkg/source/file.sh \ diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in new file mode 100644 index 0000000..effa2f4 --- /dev/null +++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in @@ -0,0 +1,65 @@ +#!/bin/bash +# +# variable.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_VARIABLE_SH" ]] && return +LIBMAKEPKG_LINT_PKGBUILD_VARIABLE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +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 sha256sums sha384sums sha512sums source) + local string=(changelog epoch install pkgdesc pkgrel pkgver url) + + local i + for i in ${array[@]}; do + if grep -w -q -e "$i=[^(]" -e "$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 -w -q -e "$i_$a=[^(]" -e "$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 -w -q -e "$i=(" -e "$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.5.0

2 2

[pacman-dev] Source Package Versioning
by David Manouchehri 07 Sep '15

07 Sep '15

For sharing/keeping source packages, is there any reason not to include .git/ if it's present when creating a .src.tar*? I know a fair amount of Arch devs are on SVN, so it would definitely need to be optional.

3 3

[pacman-dev] Security vuln. in makepkg?
by OS Hazard 06 Sep '15

06 Sep '15

Greetings, I've come across unexpected behavior in makepkg. One of several possible outcomes of this quirk is the ability to create files outside of the build environment. They are not included in the package, so the package manager is unaware of them. Moreover only the build process is affected, installation not a factor. In this manner, these untracked files can propogate to directories with write access by the user. It's unclear if this is a limitation of fakeroot or makepkg but I will continue to investigate. Here is a simple demonstration of this exploit. ========== Makefile ========== install: @wall creating ${HOME}/.bashrc-evil @touch ${HOME}/.bashrc-evil ========== PKGBUILD =========== pkgname=hello-world pkgver=0.1 pkgrel=1 pkgdesc="Friendly package" arch=('any') source=('Makefile') md5sums=(SKIP) build() { cd "$srcdir" make } package() { cd "$srcdir" make DESTDIR="${pkgdir}" install } ================ $ makepkg ==> Making package: hello-world 0.1-1 (Fri Sep 4 15:08:04 GMT 2015) ==> Checking runtime dependencies... ==> Checking buildtime dependencies... ==> Retrieving sources... -> Found Makefile ==> Validating source files with md5sums... Makefile ... Skipped ==> Extracting sources... ==> Removing existing $pkgdir/ directory... ==> Starting build()... Broadcast message from hazard@archlinux (pts/4) (Fri Sep 4 15:08:04 2015): creating /home/hazard/.bashrc-evil ==> Entering fakeroot environment... ==> Starting package()... ERROR: ld.so: object 'libfakeroot.so' from LD_PRELOAD cannot be preloaded (cannot open shared object file): ignored. Broadcast message from hazard@archlinux (pts/4) (Fri Sep 4 15:08:05 2015): creating /home/hazard/.bashrc-evil ==> Tidying install... -> Purging unwanted files... -> Compressing man and info pages... -> Stripping unneeded symbols from binaries and libraries... ==> Creating package "hello-world"... -> Generating .PKGINFO file... -> Generating .MTREE file... -> Compressing package... ==> Leaving fakeroot environment. ==> Finished making: hello-world 0.1-1 (Fri Sep 4 15:08:05 GMT 2015) $ tar -tf hello-world-0.1-1-any.pkg.tar.xz .PKGINFO .MTREE $ ls ~/.bashrc-evil /home/hazard/.bashrc-evil $ pacman -Qo ~/.bashrc-evil error: No package owns /home/hazard/.bashrc-evil ================== It should be noted that I only caught this because makepkg failed to build a certain package due to a lack of write access to the home directory (apacman AUR wrapper uses a restricted user to build). There was that controversial change back in pacman 4.2 to prevent makepkg running as root, I propose that makepkg should not run as the current user either but instead a dedicated unprivileged user. See here for more info: github.com/oshazard/apacman/issues/23 Sincerely, hazard (Archlinux BBS and AUR) P.S. apologies if this is a dupe, last message was rejected

5 5

Re: [pacman-dev] download interrupt mechanism
by Guillaume 26 Aug '15

26 Aug '15

To not block the GUI, I run trans_commit function in a g_thread and I can't use SIGINT signal. I have no way to correctly stop curl process. I propose to look for a particular value to do it as transaction functions do with TRANS_STATE_INTERRUPTED.Dave Reisner <d(a)falconindy.com> a écrit :On Aug 25, 2015 7:04 AM, "Guillaume Benoit" <guillaume(a)manjaro.org> wrote: > > Hi, > working on a GUI frontend for libalpm, I noticed that download process lakes for an internal interrupt mechanism. Download cancellation is only handled by catching SIGINT signal. > I think it would be a benefit for libalpm to have more correct download interrupt mechanism like trans_interrupt handle package transaction cancellation. Could you explain more about why signal handling is non-ideal? What would trans_interrupt do differently? What problems does this solve? > I'm already working on a patch and I would like to know if you would interested in adding this feature to libalpm. > Regards. Without knowing more details on what you're proposing, its hard to say.

3 2

[pacman-dev] download interrupt mechanism
by Guillaume Benoit 25 Aug '15

25 Aug '15

Hi, working on a GUI frontend for libalpm, I noticed that download process lakes for an internal interrupt mechanism. Download cancellation is only handled by catching SIGINT signal. I think it would be a benefit for libalpm to have more correct download interrupt mechanism like trans_interrupt handle package transaction cancellation. I'm already working on a patch and I would like to know if you would interested in adding this feature to libalpm. Regards.

2 1

[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