March 2016 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v2] Do not add root prefix twice when checking database files
by Allan McRae 28 Mar '16

28 Mar '16

When checking .INSTALL and .CHANGELOG files in the mtree file, we need to find the path they are stored in the local database. This was appending the root prefix twice as alpm_option_get_dbpath already includes the root path. While fixing that issue I added checks that the paths for the database files were not longer than PATH_MAX. Fixes FS#48563. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: Improve generation of paths for local db files src/pacman/check.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index 0fe74e8..d282cc2 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -254,7 +254,6 @@ int check_pkg_full(alpm_pkg_t *pkg) const char *root, *pkgname; size_t errors = 0; size_t rootlen; - char filepath[PATH_MAX]; struct archive *mtree; struct archive_entry *entry = NULL; size_t file_count = 0; @@ -267,7 +266,6 @@ int check_pkg_full(alpm_pkg_t *pkg) pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); return 1; } - strcpy(filepath, root); pkgname = alpm_pkg_get_name(pkg); mtree = alpm_pkg_mtree_open(pkg); @@ -282,6 +280,8 @@ int check_pkg_full(alpm_pkg_t *pkg) while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) { struct stat st; const char *path = archive_entry_pathname(entry); + char filepath[PATH_MAX]; + int filepath_len; mode_t type; size_t file_errors = 0; int backup = 0; @@ -292,31 +292,37 @@ int check_pkg_full(alpm_pkg_t *pkg) path += 2; } - if(strcmp(path, ".INSTALL") == 0) { - char filename[PATH_MAX]; - snprintf(filename, PATH_MAX, "%slocal/%s-%s/install", - alpm_option_get_dbpath(config->handle) + 1, - pkgname, alpm_pkg_get_version(pkg)); - archive_entry_set_pathname(entry, filename); - path = archive_entry_pathname(entry); - } else if(strcmp(path, ".CHANGELOG") == 0) { - char filename[PATH_MAX]; - snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog", - alpm_option_get_dbpath(config->handle) + 1, - pkgname, alpm_pkg_get_version(pkg)); - archive_entry_set_pathname(entry, filename); - path = archive_entry_pathname(entry); - } else if(*path == '.') { - continue; - } + if(*path == '.') { + const char *dbfile = NULL; - file_count++; + if(strcmp(path, ".INSTALL") == 0) { + dbfile = "install"; + } else if(strcmp(path, ".CHANGELOG") == 0) { + dbfile = "changelog"; + } else { + continue; + } - if(rootlen + 1 + strlen(path) > PATH_MAX) { - pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path); - continue; + /* Do not append root directory as alpm_option_get_dbpath is already + * an absoute path */ + filepath_len = snprintf(filepath, PATH_MAX, "%slocal/%s-%s/%s", + alpm_option_get_dbpath(config->handle), + pkgname, alpm_pkg_get_version(pkg), dbfile); + if(filepath_len >= PATH_MAX) { + pm_printf(ALPM_LOG_WARNING, _("path too long: %slocal/%s-%s/%s\n"), + alpm_option_get_dbpath(config->handle), + pkgname, alpm_pkg_get_version(pkg), dbfile); + continue; + } + } else { + filepath_len = snprintf(filepath, PATH_MAX, "%s%s", root, path); + if(filepath_len >= PATH_MAX) { + pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path); + continue; + } } - strcpy(filepath + rootlen, path); + + file_count++; exists = check_file_exists(pkgname, filepath, rootlen, &st); if(exists == 1) { -- 2.7.4

2 1

[pacman-dev] [PATCH] Changed documentation to use 'the default' instead of 'a typical default'
by Allan McRae 28 Mar '16

28 Mar '16

From: Alastair Hughes <hobbitalastair(a)gmail.com> --- Forwarding patch from FS#48696. doc/pacman.8.txt | 10 +++++----- doc/pacman.conf.5.txt | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 9e69685..4c0a30a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -127,7 +127,7 @@ greater than `1:3.6-1`. Options ------- *-b, \--dbpath* <path>:: - Specify an alternative database location (a typical default is + Specify an alternative database location (the 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 @@ -149,7 +149,7 @@ Options Specify an alternate architecture. *\--cachedir* <dir>:: - Specify an alternative package cache location (a typical default is + Specify an alternative package cache location (the default is +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be specified, and they are tried in the order they are passed to pacman. *NOTE*: This is an absolute path, and the root path is not automatically @@ -168,15 +168,15 @@ Options to be used. *\--gpgdir* <dir>:: - Specify a directory of files used by GnuPG to verify package signatures (a - typical default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain + Specify a directory of files used by GnuPG to verify package signatures + (the default is +{sysconfdir}/pacman.d/gnupg+). This directory should contain two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys of all packagers. `trustdb.gpg` contains a so-called trust database, which specifies that the keys are authentic and trusted. *NOTE*: This is an absolute path, and the root path is not automatically prepended. *\--hookdir* <dir>:: - Specify a alternative directory containing hook files (a typical default is + Specify a alternative directory containing hook files (the default is +{sysconfdir}/pacman.d/hooks+). Multiple hook directories can be specified with hooks in later directories taking precedence over hooks in earlier directories. *NOTE*: This is an absolute path, and the root path is not diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 022585c..c665870 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -57,13 +57,13 @@ Options be inside this root path. *DBPath =* path/to/db/dir:: - Overrides the default location of the toplevel database directory. A - typical default is +{localstatedir}/lib/pacman/+. Most users will not need to set + Overrides the default location of the toplevel database directory. The + default is +{localstatedir}/lib/pacman/+. Most users will not need to set this option. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. *CacheDir =* path/to/cache/dir:: - Overrides the default location of the package cache directory. A typical + Overrides the default location of the package cache directory. The default is +{localstatedir}/cache/pacman/pkg/+. Multiple cache directories can be specified, and they are tried in the order they are listed in the config file. If a file is not found in any cache directory, it will be downloaded @@ -72,7 +72,7 @@ Options *HookDir =* path/to/hook/dir:: Add directories to search for alpm hooks in addition to the system hook - directory (+{datarootdir}/libalpm/hooks/+). A typical default is + directory (+{datarootdir}/libalpm/hooks/+). The default is +{sysconfdir}/pacman.d/hooks+. Multiple directories can be specified with hooks in later directories taking precedence over hooks in earlier directories. *NOTE*: this is an absolute path, the root path is not @@ -81,7 +81,7 @@ Options *GPGDir =* path/to/gpg/dir:: Overrides the default location of the directory containing configuration - files for GnuPG. A typical default is +{sysconfdir}/pacman.d/gnupg/+. + files for GnuPG. The default is +{sysconfdir}/pacman.d/gnupg/+. This directory should contain two files: `pubring.gpg` and `trustdb.gpg`. `pubring.gpg` holds the public keys of all packagers. `trustdb.gpg` contains a so-called trust database, which specifies that the keys are @@ -90,7 +90,7 @@ Options prepended. *LogFile =* /path/to/file:: - Overrides the default location of the pacman log file. A typical default + Overrides the default location of the pacman log file. The default is +{localstatedir}/log/pacman.log+. This is an absolute path and the root directory is not prepended. -- 2.7.4

1 0

[pacman-dev] [Patch] Disable colors and progress bars if TERM=dumb
by Ivy Foster 27 Mar '16

27 Mar '16

I recently noticed that if colors and progress bars are enabled, pacman will faithfully attempt to print them even to dumb terminals that cannot handle them. This patch fixes that. Cheers, iff >From 08d67cd6bbfd1bc29ebfae8eff80ffbf9e24fdf5 Mon Sep 17 00:00:00 2001 From: Ivy Foster <ivy.foster(a)gmail.com> Date: Thu, 24 Mar 2016 22:57:10 -0500 Subject: [PATCH] Disable colors and progress bars if TERM=dumb Signed-off-by: Ivy Foster <ivy.foster(a)gmail.com> --- src/pacman/conf.c | 2 +- src/pacman/pacman.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..39ea1ab 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -67,7 +67,7 @@ void enable_colors(int colors) { colstr_t *colstr = &config->colstr; - if(colors == PM_COLOR_ON) { + if(colors == PM_COLOR_ON && strcmp(getenv("TERM"), "dumb") != 0) { colstr->colon = BOLDBLUE "::" BOLD " "; colstr->title = BOLD; colstr->repo = BOLDMAGENTA; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..1d6d20f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1110,7 +1110,7 @@ int main(int argc, char *argv[]) install_soft_interrupt_handler(); - if(!isatty(fileno(stdout))) { + if(!isatty(fileno(stdout)) || strcmp(getenv("TERM"), "dumb") == 0) { /* disable progressbar if the output is redirected */ config->noprogressbar = 1; } else { -- 2.7.4

2 2

[pacman-dev] Dependency Problem with bzr and makepkg
by Tim 27 Mar '16

27 Mar '16

Hi, I'm currently trying to build libunity [0] from the AUR. I'm doing this in a fresh nspawn environment, only base-devel is preinstalled. I talked to Florian Pritz and read the wiki, this seems to be the minimal requirements. The pacman package provides the file /usr/share/makepkg/source/bzr.sh, this is executed because libunity has a bzr based source. libunity has the bzr package as a makedepends, but the bzr.sh is executed before makedepends is parsed, also the pacman package does not have bzr as a dependency. This results in a failing build. What is the minimal required set of preintalled packages to build own packages, is base-devel not enough? Or is it possible to add bzr as a dependency to pacman (or move it from extra to base-devel)? Thanks, Tim [0] https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=libunity

5 7

Re: [pacman-dev] [PATCH] libmakepkg: extension for additional BUILDENV options
by Que Quotion 23 Mar '16

23 Mar '16

It didn't break anything, but it is unnecessary to use build_options here (and avoids a warning about it being readonly). extra_buildopts alone will suffice. buildenv_ext v2 (final) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6f9abb8..a633827 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -45,6 +45,7 @@ LIBMAKEPKGDIRS = \ lint_pkgbuild \ source \ tidy \ + buildenv_ext \ util LIBMAKEPKG = \ @@ -82,6 +83,7 @@ LIBMAKEPKG_IN = \ libmakepkg/source/local.sh \ libmakepkg/source/svn.sh \ libmakepkg/tidy.sh \ + libmakepkg/buildenv_ext.sh \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ diff --git a/scripts/libmakepkg/buildenv_ext.sh.in b/scripts/libmakepkg/ buildenv_ext.sh.in new file mode 100644 index 0000000..a877b87 --- /dev/null +++ b/scripts/libmakepkg/buildenv_ext.sh.in @@ -0,0 +1,42 @@ +#!/usr/bin/bash +# +# buildenv_ext.sh - addional functions for altering the build environment +# before compiliation +# +# Copyright (c) 2015-2016 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_BUILDENV_EXT_SH" ]] && return +LIBMAKEPKG_BUILDENV_EXT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +declare -a exta_buildopts + +for lib in "$LIBRARY/buildenv_ext/"*.sh; do + source "$lib" +done + +readonly -a extra_buildopts + +buildenv_ext() { + + # options that alter compilation parameters + for func in ${extra_buildopts[@]}; do + $func + done + +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2efcc98..aafec5d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -866,6 +866,9 @@ run_build() { export DISTCC_HOSTS fi + # Check for BUILDENV extensions, use any that are requested (check buildenv and PKGBUILD opts) + buildenv_ext + run_function_safe "build" }

1 0

Re: [pacman-dev] LTO and PGO build options
by Que Quotion 22 Mar '16

22 Mar '16

>We don't need more options. Use the tools already available to you. I understand your need to minimize makepkg, I really do. Still, I think there's a place for macros, if at least as third-party supplements. makepkg itself is a package creation macro. Technicially it is possible to do everything makepkg does in a terminal, but we have this macro to save time, confusion, and trouble. I only intend to save time, confusion and trouble. I came up with qqbuild quite a while ago to resolve the difficulties I had with doing it the ways you suggest and to minmize editing makepkg.conf (which I personaly consider risky as well as tedious). Anyway, the point is moot if you accept the patch I proposed in the other thread. >And it is still available - libmakepkg allows anybody to distribute additions like those to makepkg. These sort of optimizations need to be provided at a distribution (or repo) level, not in makepkg itself. Currently no such packages exist, but if you'll accept the new patch, I have one tested and ready. >Create two makepkg.conf files. One with CFLAGS for PGO pass 1 and one with CLFAGS for PGO pass 2. Use the --config switch to point at the one needed for that build. That could even be done in a tiny wrapper. As I said, I came up with qqbuild quite a while ago to deal with a number of difficulties doing these things in makepkg. Using two config files leaves open a lot of chances to make a mistake, and users would then have to edit both files any time they needed to make a change to one. There are a few reasons why my pgo macro figures out for itself if it should be generating or utilizing. Another reason to have a pgo macro in (lib)makepkg is the creation of PROFDEST. At its best, qqbuild could only handle pgo when used in the build directory, and as I mentioned in the forum it did silly things like make the profile directory before build() ever ran--thiese are limitations of /wrapping/ makepkg. Also, it isn't important for makepkg itself, but this solves a problem with AUR helpers, like yaourt, that don't keep build directories around after packages install. Again, moot point. The new patch I've proposed will allow for users to create and distribute additional BUILDENV options through libmakepkg for whatever their needs may be as supplemental packages, and they won't be coming to you if they have trouble with them.

1 0

[pacman-dev] [PATCH] libmakepkg: extension for additional BUILDENV options
by Que Quotion 22 Mar '16

22 Mar '16

Sorry for the double post; didn't expect a text attachment to be scrubbed and the title needed improvement. This patch makes it possible to create scripts to be used as addiional BUILDENV options. It does not include any such scripts itself, which would be up to users to install as supplemental packages. buildenv_ext.sh is based on tidy.sh; doing exactly the same thing for BUILDENV that tidy.sh does for OPTIONS. I have tested this, it does work, but if there's anything you'd like to change, go right ahead. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6f9abb8..a633827 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -45,6 +45,7 @@ LIBMAKEPKGDIRS = \ lint_pkgbuild \ source \ tidy \ + buildenv_ext \ util LIBMAKEPKG = \ @@ -82,6 +83,7 @@ LIBMAKEPKG_IN = \ libmakepkg/source/local.sh \ libmakepkg/source/svn.sh \ libmakepkg/tidy.sh \ + libmakepkg/buildenv_ext.sh \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ diff --git a/scripts/libmakepkg/buildenv_ext.sh.in b/scripts/libmakepkg/ buildenv_ext.sh.in new file mode 100644 index 0000000..a877b87 --- /dev/null +++ b/scripts/libmakepkg/buildenv_ext.sh.in @@ -0,0 +1,42 @@ +#!/usr/bin/bash +# +# buildenv_ext.sh - addional functions for altering the build environment +# before compiliation +# +# Copyright (c) 2015-2016 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_BUILDENV_EXT_SH" ]] && return +LIBMAKEPKG_BUILDENV_EXT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +declare -a build_options exta_buildopts + +for lib in "$LIBRARY/buildenv_ext/"*.sh; do + source "$lib" +done + +readonly -a build_options extra_buildopts + +buildenv_ext() { + + # options that alter compilation parameters + for func in ${extra_buildopts[@]}; do + $func + done + +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2efcc98..aafec5d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -866,6 +866,9 @@ run_build() { export DISTCC_HOSTS fi + # Check for BUILDENV extensions, use any that are requested (check buildenv and PKGBUILD opts) + buildenv_ext + run_function_safe "build" }

1 0

[pacman-dev] libmakepkg extension for additional build options [patch]
by Que Quotion 22 Mar '16

22 Mar '16

This patch makes it possible to create scripts to be used as addiional BUILDENV options. It does not include any such scripts itself, which would be up to users to install as supplemental packages. buildenv_ext.sh is based on tidy.sh; doing exactly the same thing that tidy.sh does for OPTIONS.

1 0

[pacman-dev] [PATCH] libmakepkg: extract functions for writing .SRCINFO files
by Ashley Whetter 21 Mar '16

21 Mar '16

Signed-off-by: Ashley Whetter <ashley(a)awhetter.co.uk> --- scripts/Makefile.am | 1 + scripts/libmakepkg/srcinfo.sh.in | 120 +++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 94 ------------------------------ 3 files changed, 121 insertions(+), 94 deletions(-) create mode 100644 scripts/libmakepkg/srcinfo.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b..2dfd238 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -74,6 +74,7 @@ LIBMAKEPKG_IN = \ libmakepkg/lint_pkgbuild/source.sh \ libmakepkg/lint_pkgbuild/util.sh \ libmakepkg/lint_pkgbuild/variable.sh \ + libmakepkg/srcinfo.sh \ libmakepkg/source.sh \ libmakepkg/source/bzr.sh \ libmakepkg/source/file.sh \ diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in new file mode 100644 index 0000000..96dc59b --- /dev/null +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -0,0 +1,120 @@ +#!/bin/bash +# +# srcinfo.sh - functions for writing .SRCINFO files +# +# Copyright (c) 2016 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_SRCINFO_SH" ]] && return +LIBMAKEPKG_SRCINFO_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/pkgbuild.sh" + +srcinfo_open_section() { + printf '%s = %s\n' "$1" "$2" +} + +srcinfo_close_section() { + echo +} + +srcinfo_write_attr() { + # $1: attr name + # $2: attr values + + local attrname=$1 attrvalues=("${@:2}") + + # normalize whitespace, strip leading and trailing + attrvalues=("${attrvalues[@]//+([[:space:]])/ }") + attrvalues=("${attrvalues[@]#[[:space:]]}") + attrvalues=("${attrvalues[@]%[[:space:]]}") + + printf "\t$attrname = %s\n" "${attrvalues[@]}" +} + +pkgbuild_extract_to_srcinfo() { + # $1: pkgname + # $2: attr name + # $3: multivalued + + local pkgname=$1 attrname=$2 isarray=$3 outvalue= + + if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then + srcinfo_write_attr "$attrname" "${outvalue[@]}" + fi +} + +srcinfo_write_section_details() { + local attr package_arch a + local multivalued_arch_attrs=(source provides conflicts depends replaces + optdepends makedepends checkdepends + {md5,sha{1,224,256,384,512}}sums) + + for attr in "${singlevalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 0 + done + + for attr in "${multivalued[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "$attr" 1 + done + + get_pkgbuild_attribute "$1" 'arch' 1 'package_arch' + for a in "${package_arch[@]}"; do + # 'any' is special. there's no support for, e.g. depends_any. + [[ $a = any ]] && continue + + for attr in "${multivalued_arch_attrs[@]}"; do + pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 + done + done +} + +srcinfo_write_global() { + local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) + local multivalued=(arch groups license checkdepends makedepends + depends optdepends provides conflicts replaces + noextract options backup + source validpgpkeys {md5,sha{1,224,256,384,512}}sums) + + srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" + srcinfo_write_section_details '' + srcinfo_close_section +} + +srcinfo_write_package() { + local singlevalued=(pkgdesc url install changelog) + local multivalued=(arch groups license checkdepends depends optdepends + provides conflicts replaces options backup) + + srcinfo_open_section 'pkgname' "$1" + srcinfo_write_section_details "$1" + srcinfo_close_section +} + +write_srcinfo() { + local pkg + + printf "# Generated by makepkg %s\n" "$makepkg_version" + printf "# %s\n" "$(LC_ALL=C date -u)" + + srcinfo_write_global + + for pkg in "${pkgname[@]}"; do + srcinfo_write_package "$pkg" + done +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f4..4411ac2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -999,100 +999,6 @@ find_libprovides() { printf '%s\n' "${libprovides[@]}" } -srcinfo_open_section() { - printf '%s = %s\n' "$1" "$2" -} - -srcinfo_close_section() { - echo -} - -srcinfo_write_attr() { - # $1: attr name - # $2: attr values - - local attrname=$1 attrvalues=("${@:2}") - - # normalize whitespace, strip leading and trailing - attrvalues=("${attrvalues[@]//+([[:space:]])/ }") - attrvalues=("${attrvalues[@]#[[:space:]]}") - attrvalues=("${attrvalues[@]%[[:space:]]}") - - printf "\t$attrname = %s\n" "${attrvalues[@]}" -} - -pkgbuild_extract_to_srcinfo() { - # $1: pkgname - # $2: attr name - # $3: multivalued - - local pkgname=$1 attrname=$2 isarray=$3 outvalue= - - if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then - srcinfo_write_attr "$attrname" "${outvalue[@]}" - fi -} - -srcinfo_write_section_details() { - local attr package_arch a - local multivalued_arch_attrs=(source provides conflicts depends replaces - optdepends makedepends checkdepends - {md5,sha{1,224,256,384,512}}sums) - - for attr in "${singlevalued[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "$attr" 0 - done - - for attr in "${multivalued[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "$attr" 1 - done - - get_pkgbuild_attribute "$1" 'arch' 1 'package_arch' - for a in "${package_arch[@]}"; do - # 'any' is special. there's no support for, e.g. depends_any. - [[ $a = any ]] && continue - - for attr in "${multivalued_arch_attrs[@]}"; do - pkgbuild_extract_to_srcinfo "$1" "${attr}_$a" 1 - done - done -} - -srcinfo_write_global() { - local singlevalued=(pkgdesc pkgver pkgrel epoch url install changelog) - local multivalued=(arch groups license checkdepends makedepends - depends optdepends provides conflicts replaces - noextract options backup - source validpgpkeys {md5,sha{1,224,256,384,512}}sums) - - srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" - srcinfo_write_section_details '' - srcinfo_close_section -} - -srcinfo_write_package() { - local singlevalued=(pkgdesc url install changelog) - local multivalued=(arch groups license checkdepends depends optdepends - provides conflicts replaces options backup) - - srcinfo_open_section 'pkgname' "$1" - srcinfo_write_section_details "$1" - srcinfo_close_section -} - -write_srcinfo() { - local pkg - - printf "# Generated by makepkg %s\n" "$makepkg_version" - printf "# %s\n" "$(LC_ALL=C date -u)" - - srcinfo_write_global - - for pkg in "${pkgname[@]}"; do - srcinfo_write_package "$pkg" - done -} - write_pkginfo() { local builddate=$(date -u "+%s") if [[ -n $PACKAGER ]]; then -- 2.7.0

2 1

[pacman-dev] [PATCH] libmakepkg: ensure emptydir find command acts on individual directories
by Allan McRae 21 Mar '16

21 Mar '16

Using "-exec command {} +" systax exits on any error. Such errors occur when running rmdir on a non-empty directory. Switch to "{} ;" syntax instead which avoids exiting before the find command is completed. Fixes FS#48515. Note, we can not use "-empty" in the find command because it is not supported by Busybox find, and the "--ignore-fail-on-non-empty" flag for rmdir is not available on BSD rmdir variants. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Comment added to avoid trying '-empty' again in the future... scripts/libmakepkg/tidy/emptydirs.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in index 32b8d8c..3be6005 100644 --- a/scripts/libmakepkg/tidy/emptydirs.sh.in +++ b/scripts/libmakepkg/tidy/emptydirs.sh.in @@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs') tidy_emptydirs() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -exec rmdir '{}' + 2>/dev/null + # we are unable to use '-empty' as it is non-POSIX and not support by all find variants + find . -depth -type d -exec rmdir '{}' ; 2>/dev/null fi } -- 2.7.3

2 2