- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/4] pacman(8): Improve grammar and quoting
by Jason St. John 09 Aug '14

09 Aug '14

Notable changes: * Add double quotes around printf-like formatting options for "--print-format" * Add a missing backslash in '--force' Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- doc/pacman.8.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index ccc0a01..28a12cf 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -123,7 +123,7 @@ Options Specify an alternative database location (a typical default is +{localstatedir}/lib/pacman+). This should not be used unless you know what you are doing. - *NOTE*: if specified, this is an absolute path, and the root path is + *NOTE*: If specified, this is an absolute path, and the root path is not automatically prepended. *-r, \--root* <path>:: @@ -176,7 +176,7 @@ Options Bypass any and all ``Are you sure?'' messages. It's not a good idea to do this unless you want to run pacman from a script. -Transaction Options (apply to '-S', '-R' and '-U') +Transaction Options (apply to '-S', '-R', and '-U') -------------------------------------------------- *-d, \--nodeps*:: Skips dependency version checks. Package names are still checked. Normally, @@ -203,8 +203,8 @@ Transaction Options (apply to '-S', '-R' and '-U') *\--print-format* <format>:: Specify a printf-like format to control the output of the '\--print' - operation. The possible attributes are: %n for pkgname, %v for pkgver, - %l for location, %r for repo, and %s for size. Implies '\--print'. + operation. The possible attributes are: "%n" for pkgname, "%v" for pkgver, + "%l" for location, "%r" for repository, and "%s" for size. Implies '\--print'. Upgrade Options (apply to '-S' and '-U')[[UO]] -------------------------------------------- @@ -212,7 +212,7 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] Bypass file conflict checks and overwrite conflicting files. If the package that is about to be installed contains files that are already installed, this option will cause all those files to be overwritten. - Using '--force' will not allow overwriting a directory with a file or + Using '\--force' will not allow overwriting a directory with a file or installing packages with conflicting files and directories. This option should be used with care, ideally not at all. @@ -406,7 +406,7 @@ select sync packages whose versions do not match with the local versions. This can be useful when the user switches from a testing repository to a stable one. + Additional targets can also be specified manually, so that '-Su foo' will do a -system upgrade and install/upgrade the foo package in the same operation. +system upgrade and install/upgrade the "foo" package in the same operation. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade anything. -- 2.0.4

2 4

[pacman-dev] [PATCH 1/6] remove --destination-dir argument from a2x options
by Dave Reisner 09 Aug '14

09 Aug '14

This option is only for HTML output, and we're building manpages here. --- doc/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a7908df..60a70b3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -124,8 +124,7 @@ A2X_OPTS = \ --no-xmllint \ -d manpage \ -f manpage \ - --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \ - --destination-dir='./' + --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am -- 2.0.4

3 9

[pacman-dev] [PATCH] Fix loading invalid package
by Olivier Brunel 08 Aug '14

08 Aug '14

In 5acfa65f when adding a new variable (hit_mtree), the initialization of a variable (config) was dropped, which could lead to loading invalid package files, i.e. files that aren't archive (no metadata loaded) would return a new alpm_pkg_t with everything set to 0/NULL. Depending on the operation/use of the package, this could lead to segfault. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- lib/libalpm/be_package.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2275129..6ec8888 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -540,7 +540,9 @@ error: alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, int full) { - int ret, fd, config, hit_mtree = 0; + int ret, fd; + int config = 0; + int hit_mtree = 0; struct archive *archive; struct archive_entry *entry; alpm_pkg_t *newpkg; -- 2.0.4

1 0

[pacman-dev] [PATCH] Update PKGBUILD documentation for removed override options
by Allan McRae 08 Aug '14

08 Aug '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 17e8af2..da225a4 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -368,9 +368,9 @@ Each split package uses a corresponding packaging function with name All options and directives for the split packages default to the global values given in the PKGBUILD. Nevertheless, the following ones can be overridden within each split package's packaging function: -`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `url`, `license`, `groups`, -`depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, -`options`, `install` and `changelog`. +`pkgdesc`, `arch`, `url`, `license`, `groups`, `depends`, `optdepends`, +`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and +`changelog`. An optional global directive is available when building a split package: -- 2.0.4

1 0

[pacman-dev] [PATCH 1/2] pacman: set SA_RESTART for signal handler
by Andrew Gregory 07 Aug '14

07 Aug '14

Calling a signal handler interrupts some functions, most notably read() and therefore fgets(). This was less of an issue in the past because signals generally resulted in the termination of the program, the recently added SIGWINCH handler does not. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- For an easy and safe way to see the problem fixed by this and the next patch resize the terminal while pacman is waiting for a user response. src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 12a4f7a..6787e72 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1029,7 +1029,7 @@ int main(int argc, char *argv[]) /* Set up the structure to specify the new action. */ new_action.sa_handler = handler; sigemptyset(&new_action.sa_mask); - new_action.sa_flags = 0; + new_action.sa_flags = SA_RESTART; /* assign our handler to any signals we care about */ for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { -- 2.0.1

2 2

[pacman-dev] [PATCH 1/2] Refactor check_sanity, to give it some sanity of its own
by Dave Reisner 04 Aug '14

04 Aug '14

Break apart each of the blocks into their own separate functions. And, instead of the hand crafted eval statements, reuse the logic from pkgbuild-introspection[0] to abstract away the complexities of parsing bash. This commit fixes at least 3 bugs in check_sanity, and one other: 1) The wrong variable is shown for the error which would be thrown when, e.g. pkgname=('foopkg' 'bar@pkg') 2) The "arch" variable is not sanity checked when the PKGBUILD has package_$pkgname() instead of package(). 3) Avoid linting pkgrel/epoch in package functions (because we don't actually support these overrides). 4) The "arch" variable is leaked when processing arch overrides in packages. For example: pkgname=(foo libfoo) arch=('i686' 'x86_64') .... package_foo() { arch=('any') : } package_libfoo() { : } This leaks arch=('any') into package_libfoo. Reversing the order of pkgname will mask this bug. Lastly, there's some string changes here which should help to clarify a few errors emitted in the linting process. [0] https://github.com/falconindy/pkgbuild-introspection --- scripts/makepkg.sh.in | 391 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 284 insertions(+), 107 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ee70e43..baa3720 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2202,18 +2202,89 @@ have_function() { declare -f "$1" >/dev/null } -check_sanity() { - # check for no-no's in the build script - local i - local ret=0 - for i in 'pkgname' 'pkgrel'; do - if [[ -z ${!i} ]]; then - error "$(gettext "%s is not allowed to be empty.")" "$i" - ret=1 - fi - done +array_build() { + eval "$1=(\"\${$2[@]}\")" +} + +funcgrep() { + { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" +} + +extract_global_var() { + # $1: variable name + # $2: multivalued + # $3: name of output var + + local attr=$1 isarray=$2 outputvar=$3 + + if (( isarray )); then + array_build ref "$attr" + [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" + else + [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + fi +} + +extract_function_var() { + # $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:]]*(declare( -[[:alpha:]])*)? %q\+?=\(' "$2" + else + printf -v attr_regex '^[[:space:]]*(declare( -[[:alpha:]])*)? %q\+?=[^(]' "$2" + fi + + while read -r; do + # strip leading whitespace and any usage of declare + decl=${REPLY##*([[:space:]])?(declare +(-+([[:alpha:]]) ))} + eval "${decl/#$attr/$outputvar}" + + # entering this loop at all means we found a match, so notify the caller. + r=0 + done < <(funcgrep "$funcname" "$attr_regex") + + return $r +} + +pkgbuild_get_attribute() { + # $1: package name + # $2: attribute name + # $3: name of output var + # $4: multivalued + + local pkgname=$1 attrname=$2 outputvar=$3 isarray=$4 + + printf -v "$outputvar" %s '' + + if [[ $pkgname ]]; then + extract_global_var "$attrname" "$isarray" "$outputvar" + extract_function_var "package_$pkgname" "$attrname" "$isarray" "$outputvar" + else + extract_global_var "$attrname" "$isarray" "$outputvar" + fi +} + +lint_pkgbase() { + if [[ ${pkgbase:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + return 1 + fi +} + +lint_pkgname() { + local ret=0 i for i in "${pkgname[@]}"; do + if [[ -z $i ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + ret=1 + continue + fi if [[ ${i:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" ret=1 @@ -2224,155 +2295,261 @@ check_sanity() { fi if [[ $i = *[^[:alnum:]+_.@-]* ]]; then error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgname' "${pkgname//[[:alnum:]+_.@-]}" + 'pkgname' "${i//[[:alnum:]+_.@-]}" ret=1 fi done - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" + return $ret +} + +lint_pkgrel() { + local ret=0 + + if [[ -z $pkgrel ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgrel" ret=1 fi - if (( ! PKGVERFUNC )) ; then - check_pkgver || ret=1 + if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then + error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" + ret=1 fi - awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" - if [[ $i != +([0-9])?(.+([0-9])) ]]; then - error "$(gettext "%s must be a decimal.")" "pkgrel" - return 1 - fi - done || ret=1 + return $ret +} - awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" - if [[ $i != *([[:digit:]]) ]]; then - error "$(gettext "%s must be an integer.")" "epoch" - return 1 - fi - done || ret=1 +lint_pkgver() { + if (( PKGVERFUNC )); then + # defer check to after getting version from pkgver function + return 0 + fi + + check_pkgver +} + +lint_epoch() { + if [[ $epoch != *([[:digit:]]) ]]; then + error "$(gettext "%s must be an integer, not %s.")" "epoch" "$e" + return 1 + fi +} + +lint_arch() { + local name list=("${@:-"${arch[@]}"}") - if [[ $arch != 'any' ]]; then - if ! in_array $CARCH "${arch[@]}"; then + if [[ $list == 'any' ]]; then + return 0 + fi + + if ! in_array "$CARCH" "${list[@]}" && (( ! IGNOREARCH )); then + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as %s.")" "arch=('$CARCH')" + return 1 + fi + + for name in "${pkgname[@]}"; do + pkgbuild_get_attribute "$name" 'arch' list 1 + if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then if (( ! IGNOREARCH )); then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as %s.")" "arch=('$CARCH')" + error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH" ret=1 fi fi - fi + done +} - if (( ${#pkgname[@]} > 1 )); then - for i in ${pkgname[@]}; do - local arch_list="" - eval $(declare -f package_${i} | sed -n 's/$^[[:space:]]*arch=$/arch_list=/p') - if [[ ${arch_list[@]} && ${arch_list} != 'any' ]]; then - if ! in_array $CARCH "${arch_list[@]}"; then - if (( ! IGNOREARCH )); then - error "$(gettext "%s is not available for the '%s' architecture.")" "$i" "$CARCH" - ret=1 - fi - fi - fi - done - fi +lint_provides() { + local list name provides_list ret=0 - local provides_list=() - eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ - sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in ${provides_list[@]}; do - if [[ $i == *['<>']* ]]; then + provides_list=("${provides[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" provides 1 list + provides_list+=("${list[@]}") + done + + for provide in "${provides_list[@]}"; do + if [[ $provide == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 fi done - local backup_list=() - eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \ - sed -e "s/backup=/backup_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in "${backup_list[@]}"; do - if [[ ${i:0:1} = "/" ]]; then - error "$(gettext "%s entry should not contain leading slash : %s")" "backup" "$i" + return $ret +} + +lint_backup() { + local list name backup_list ret=0 + + backup_list=("${backup[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" backup 1 list + backup_list+=("${list[@]}") + done + + for name in "${backup_list[@]}"; do + if [[ ${name:0:1} = "/" ]]; then + error "$(gettext "%s entry should not contain leading slash : %s")" "backup" "$name" ret=1 fi done - local optdepends_list=() - eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ - sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in "${optdepends_list[@]}"; do - local pkg=${i%%:[[:space:]]*} + return $ret +} + +lint_optdepends() { + local list name optdepends_list ret=0 + + optdepends_list=("${optdepends[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" optdepends 1 list + optdepends_list+=("${list[@]}") + done + + for name in "${optdepends_list[@]}"; do + local pkg=${name%%:[[:space:]]*} # the '-' character _must_ be first or last in the character range if [[ $pkg != +([-[:alnum:]><=.+_:]) ]]; then - error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i" + error "$(gettext "Invalid syntax for %s: '%s'")" "optdepend" "$name" ret=1 fi done - for i in 'changelog' 'install'; do - local file - while read -r file; do - # evaluate any bash variables used - eval file=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$file")\" - if [[ $file && ! -f $file ]]; then - error "$(gettext "%s file (%s) does not exist.")" "$i" "$file" - ret=1 - fi - done < <(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") + return $ret +} + +check_files_exist() { + local kind=$1 files=("${@:2}") file ret + + for file in "${files[@]}"; do + if [[ $file && ! -f $file ]]; then + error "$(gettext "%s file (%s) does not exist or is not a regular file.")" \ + "$kind" "$file" + ret=1 + fi + done + + return $ret +} + +lint_install() { + local list file name install_list ret=0 + + install_list=("${install[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" install 0 file + install_list+=("$file") + done + + check_files_exist 'install' "${install_list[@]}" +} + +lint_changelog() { + local list name file changelog_list ret=0 + + changelog_list=("${changelog[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" changelog 0 file + changelog_list+=("$file") + done + + check_files_exist 'changelog' "${changelog_list[@]}" +} + +lint_options() { + local ret=0 list name kopt options_list + + options_list=("${options[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" options 1 list + options_list+=("${list[@]}") done - local valid_options=1 - local known kopt options_list - eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \ - sed -e "s/options=/options_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in ${options_list[@]}; do - known=0 + for i in "${options_list[@]}"; do # check if option matches a known option or its inverse - for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [[ ${i} = "${kopt}" || ${i} = "!${kopt}" ]]; then - known=1 + for kopt in "${packaging_options[@]}" "${other_options[@]}"; do + if [[ $i = "$kopt" || $i = "!$kopt" ]]; then + # continue to the next $i + continue 2 fi done - if (( ! known )); then - error "$(gettext "%s array contains unknown option '%s'")" "options" "$i" - valid_options=0 - fi - done - if (( ! valid_options )); then + + error "$(gettext "%s array contains unknown option '%s'")" "options" "$i" ret=1 + done + + return $ret +} + +lint_source() { + local idx=("${!source[@]}") + + if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then + error "$(gettext "Sparse arrays are not allowed for source")" + return 1 fi +} + +lint_pkglist() { + local i ret=0 + + for i in "${PKGLIST[@]}"; do + if ! in_array "$i" "${pkgname[@]}"; then + error "$(gettext "Requested package %s is not provided in %s")" "$i" "$BUILDFILE" + ret=1 + fi + done + + return $ret +} + +lint_packagefn() { + local i ret=0 if (( ${#pkgname[@]} == 1 )); then - if have_function build && ! ( have_function package || have_function package_${pkgname}); then + if have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then error "$(gettext "Missing %s function in %s")" "package()" "$BUILDFILE" ret=1 fi else - for i in ${pkgname[@]}; do - if ! have_function package_${i}; then + for i in "${pkgname[@]}"; do + if ! have_function "package_$i"; then error "$(gettext "Missing %s function for split package '%s'")" "package_$i()" "$i" ret=1 fi done fi - for i in ${PKGLIST[@]}; do - if ! in_array $i ${pkgname[@]}; then - error "$(gettext "Requested package %s is not provided in %s")" "$i" "$BUILDFILE" - ret=1 - fi - done + return $ret +} - local idx=("${!source[@]}") - if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then - error "$(gettext "Sparse arrays are not allowed for source")" - ret=1 - fi +check_sanity() { + # check for no-no's in the build script + local ret=0 + local lintfn lint_functions + + lint_functions=( + lint_pkgbase + lint_pkgname + lint_pkgver + lint_pkgrel + lint_epoch + lint_arch + lint_provides + lint_backup + lint_optdepends + lint_changelog + lint_install + lint_options + lint_packagefn + lint_pkglist + lint_source + ) + + for lintfn in "${lint_functions[@]}"; do + "$lintfn" || ret=1 + done return $ret } -- 2.0.3

3 11

[pacman-dev] [PATCH] Add Andrew to maintainers list.
by Allan McRae 04 Aug '14

04 Aug '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- $ git shortlog -a -s -n v4.1.0.. 135 Andrew Gregory 113 Allan McRae 29 Dave Reisner doc/footer.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/footer.txt b/doc/footer.txt index af19304..12b0715 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -19,6 +19,7 @@ Authors Current maintainers: * Allan McRae <allan(a)archlinux.org> +* Andrew Gregory <andrew.gregory.8(a)gmail.com> * Dan McGee <dan(a)archlinux.org> * Dave Reisner <dreisner(a)archlinux.org> -- 2.0.4

1 0

[pacman-dev] [PATCH v2] makepkg: ensure vcs download tool are installed when required
by Allan McRae 04 Aug '14

04 Aug '14

Add an array VCSCLIENTS to makepkg.conf that matches vcs source protocols to the package containing the software needed for handling the source. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2. also check for vcs binary on system doc/makepkg.conf.5.txt | 5 ++++ scripts/makepkg.sh.in | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index af4df20..4dc3b38 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -47,6 +47,11 @@ Options be replaced with the local file name, plus a ``.part'' extension, which allows makepkg to handle resuming file downloads. +**VCSCLIENTS=(**\'protocol::package' ...**)**:: + Sets the packages required to fetch version controlled source files. When + required, makepkg will check that these packages are installed or are included + in the `depends` or `makedepends` arrays in the PKGBUILD. + **CARCH=**"carch":: Specifies your computer architecture; possible values include such things as ``i686'', ``x86_64'', ``ppc'', etc. This should be automatically set on diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f9e816f..40355b5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2402,6 +2402,71 @@ check_pkgver() { return $ret } +get_vcsclient() { + local proto=${1%%+*} + + local i + for i in "${VCSCLIENT[@]}"; do + local handler="${i%%::*}" + if [[ $proto = "$handler" ]]; then + local client="${i##*::}" + break + fi + done + + # if we didn't find an client, return an error + if [[ -z $client ]]; then + error "$(gettext "Unknown download protocol: %s")" "$proto" + plain "$(gettext "Aborting...")" + exit 1 # $E_CONFIG_ERROR + fi + + printf "%s\n" "$client" +} + +check_vcs_software() { + local ret=0 + + if (( SOURCEONLY == 1 )); then + # we will not download VCS sources + return $ret + fi + + if [[ -z $PACMAN_PATH ]]; then + warning "$(gettext "Cannot find the %s binary needed to check VCS source requirements.")" "$PACMAN" + return $ret + fi + + for netfile in ${source[@]}; do + local proto=$(get_protocol "$netfile") + + case $proto in + bzr*|git*|hg*|svn*) + if ! type -p ${proto%%+*} > /dev/null; then + local client + client=$(get_vcsclient "$proto") || exit $? + # ensure specified program is installed + local uninstalled + uninstalled="$(set +E; check_deps $client)" || exit 1 + # if not installed, check presence in depends or makedepends + if [[ -n "$uninstalled" ]] && (( ! NODEPS )); then + if ! in_array "$client" ${depends[@]} ${makedepends[@]}; then + error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ + "$client" "${proto%%+*}" + ret=1 + fi + fi + fi + ;; + *) + # non VCS source + ;; + esac + done + + return $ret +} + check_software() { # check for needed software local ret=0 @@ -2493,6 +2558,11 @@ check_software() { fi fi + # tools to download vcs sources + if ! check_vcs_software; then + ret=1 + fi + return $ret } -- 2.0.3

2 2

[pacman-dev] [PATCH 08/11] handle_unlock: log error when lock file is missing
by Andrew Gregory 03 Aug '14

03 Aug '14

Problems due to concurrent running instances of pacman can be difficult to diagnose. Log a warning to make it more obvious that that's what happened, that it's a bad idea, and hopefully encourage people who do things like removing the lock file to run pacman from an install script to at least be courteous enough to put it back when they're done. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- Example convoluted error due to concurrent instances: https://bbs.archlinux.org/viewtopic.php?id=184122 Example install script manually removing the lock file: https://github.com/manjaro/packages-core/blob/master/manjaro-system/manjaro… lib/libalpm/handle.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 234fc4d..0efc0a9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -125,12 +125,20 @@ int _alpm_handle_unlock(alpm_handle_t *handle) close(handle->lockfd); handle->lockfd = -1; - if(unlink(handle->lockfile) && errno != ENOENT) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("could not remove lock file %s\n"), handle->lockfile); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: could not remove lock file %s\n", handle->lockfile); - return -1; + if(unlink(handle->lockfile) != 0) { + if(errno == ENOENT) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("lock file missing %s\n"), handle->lockfile); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: lock file missing %s\n", handle->lockfile); + return 0; + } else { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove lock file %s\n"), handle->lockfile); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: could not remove lock file %s\n", handle->lockfile); + return -1; + } } return 0; } -- 2.0.2

2 1

[pacman-dev] [PATCH 01/11] handle: factor out string list option handling
by Andrew Gregory 03 Aug '14

03 Aug '14

Consolidates repeated code and replaces dangerous strdup calls with STRDUP. Also fix a couple variables named "pkg" that refer to file paths. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 8 ++--- lib/libalpm/handle.c | 89 +++++++++++++++++++++------------------------------- 2 files changed, 39 insertions(+), 58 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index db1e0cd..29a2dda 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -818,9 +818,9 @@ int alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog); * @{ */ alpm_list_t *alpm_option_get_noupgrades(alpm_handle_t *handle); -int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg); +int alpm_option_add_noupgrade(alpm_handle_t *handle, const char *path); int alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade); -int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg); +int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of no-extract files. @@ -830,9 +830,9 @@ int alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg); * @{ */ alpm_list_t *alpm_option_get_noextracts(alpm_handle_t *handle); -int alpm_option_add_noextract(alpm_handle_t *handle, const char *pkg); +int alpm_option_add_noextract(alpm_handle_t *handle, const char *path); int alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract); -int alpm_option_remove_noextract(alpm_handle_t *handle, const char *pkg); +int alpm_option_remove_noextract(alpm_handle_t *handle, const char *path); /** @} */ /** @name Accessors to the list of ignored packages. diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 0842d51..b218a68 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -444,26 +444,28 @@ int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog) return 0; } -int SYMEXPORT alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg) +static int _alpm_option_strlist_add(alpm_handle_t *handle, alpm_list_t **list, const char *str) { + char *dup; CHECK_HANDLE(handle, return -1); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); + STRDUP(dup, str, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + *list = alpm_list_add(*list, dup); return 0; } -int SYMEXPORT alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade) +static int _alpm_option_strlist_set(alpm_handle_t *handle, alpm_list_t **list, alpm_list_t *newlist) { CHECK_HANDLE(handle, return -1); - if(handle->noupgrade) FREELIST(handle->noupgrade); - handle->noupgrade = alpm_list_strdup(noupgrade); + FREELIST(*list); + *list = alpm_list_strdup(newlist); return 0; } -int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg) +static int _alpm_option_strlist_rem(alpm_handle_t *handle, alpm_list_t **list, const char *str) { char *vdata = NULL; CHECK_HANDLE(handle, return -1); - handle->noupgrade = alpm_list_remove_str(handle->noupgrade, pkg, &vdata); + *list = alpm_list_remove_str(*list, str, &vdata); if(vdata != NULL) { FREE(vdata); return 1; @@ -471,85 +473,64 @@ int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pk return 0; } -int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *pkg) +int SYMEXPORT alpm_option_add_noupgrade(alpm_handle_t *handle, const char *pkg) { - CHECK_HANDLE(handle, return -1); - handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->noupgrade), pkg); +} + +int SYMEXPORT alpm_option_set_noupgrades(alpm_handle_t *handle, alpm_list_t *noupgrade) +{ + return _alpm_option_strlist_set(handle, &(handle->noupgrade), noupgrade); +} + +int SYMEXPORT alpm_option_remove_noupgrade(alpm_handle_t *handle, const char *pkg) +{ + return _alpm_option_strlist_rem(handle, &(handle->noupgrade), pkg); +} + +int SYMEXPORT alpm_option_add_noextract(alpm_handle_t *handle, const char *path) +{ + return _alpm_option_strlist_add(handle, &(handle->noextract), path); } int SYMEXPORT alpm_option_set_noextracts(alpm_handle_t *handle, alpm_list_t *noextract) { - CHECK_HANDLE(handle, return -1); - if(handle->noextract) FREELIST(handle->noextract); - handle->noextract = alpm_list_strdup(noextract); - return 0; + return _alpm_option_strlist_set(handle, &(handle->noextract), noextract); } -int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *pkg) +int SYMEXPORT alpm_option_remove_noextract(alpm_handle_t *handle, const char *path) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->noextract = alpm_list_remove_str(handle->noextract, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->noextract), path); } int SYMEXPORT alpm_option_add_ignorepkg(alpm_handle_t *handle, const char *pkg) { - CHECK_HANDLE(handle, return -1); - handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->ignorepkg), pkg); } int SYMEXPORT alpm_option_set_ignorepkgs(alpm_handle_t *handle, alpm_list_t *ignorepkgs) { - CHECK_HANDLE(handle, return -1); - if(handle->ignorepkg) FREELIST(handle->ignorepkg); - handle->ignorepkg = alpm_list_strdup(ignorepkgs); - return 0; + return _alpm_option_strlist_set(handle, &(handle->ignorepkg), ignorepkgs); } int SYMEXPORT alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pkg) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->ignorepkg = alpm_list_remove_str(handle->ignorepkg, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->ignorepkg), pkg); } int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp) { - CHECK_HANDLE(handle, return -1); - handle->ignoregroup = alpm_list_add(handle->ignoregroup, strdup(grp)); - return 0; + return _alpm_option_strlist_add(handle, &(handle->ignoregroup), grp); } int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps) { - CHECK_HANDLE(handle, return -1); - if(handle->ignoregroup) FREELIST(handle->ignoregroup); - handle->ignoregroup = alpm_list_strdup(ignoregrps); - return 0; + return _alpm_option_strlist_set(handle, &(handle->ignoregroup), ignoregrps); } int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp) { - char *vdata = NULL; - CHECK_HANDLE(handle, return -1); - handle->ignoregroup = alpm_list_remove_str(handle->ignoregroup, grp, &vdata); - if(vdata != NULL) { - FREE(vdata); - return 1; - } - return 0; + return _alpm_option_strlist_rem(handle, &(handle->ignoregroup), grp); } int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) -- 2.0.2

2 1