June 2018 - Pacman-contrib - lists.archlinux.org

[PATCH] rankmirrors: add --max-time option
by Sami Kerola 06 Jul '18

06 Jul '18

When testing all known mirrors, and knowing you have fairly ok connectivity, it's nice to have ability to define more aggressive timeout, such as 0.1 This way finding a small number of best mirrors will take a little bit less time in total. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> --- src/rankmirrors.sh.in | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in index 7f518c0..faa4074 100644 --- a/src/rankmirrors.sh.in +++ b/src/rankmirrors.sh.in @@ -34,13 +34,14 @@ usage() { echo "Usage: ${myname} [options] MIRRORFILE | URL" echo echo "Options:" - echo " --version show program's version number and exit" - echo " -h, --help show this help message and exit" - echo " -n NUM number of servers to output, 0 for all" - echo " -t, --times only output mirrors and their response times" - echo " -u, --url test a specific URL" - echo " -v, --verbose be verbose in output" - echo " -r, --repo specify a repository name instead of guessing" + echo " --version show program's version number and exit" + echo " -h, --help show this help message and exit" + echo " -n NUM number of servers to output, 0 for all" + echo " -m, --max-time NUM specify a ranking operation timeout, can be desimal number" + echo " -t, --times only output mirrors and their response times" + echo " -u, --url test a specific URL" + echo " -v, --verbose be verbose in output" + echo " -r, --repo specify a repository name instead of guessing" exit 0 } @@ -61,7 +62,7 @@ err() { # gettime fetchurl (e.g gettime http://foo.com/core/os/i686/core.db.tar.gz) # returns the fetching time, or timeout, or unreachable gettime() { - IFS=' ' output=( $(curl -s -m 10 -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) + IFS=' ' output=( $(curl -s -m $MAX_TIME -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) (( $? == 28 )) && echo timeout && return (( ${output[1]} >= 400 || ! ${output[1]} )) && echo unreachable && return echo "${output[0]}" @@ -128,6 +129,10 @@ while [[ $1 ]]; do case "${1:2}" in help) usage ;; version) version ;; + max-time) + [[ $2 ]] || err "Must specify number."; + MAX_TIME="$2" + shift 2;; times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) @@ -153,6 +158,10 @@ while [[ $1 ]]; do for ((i=1 ; i<${#1}; i++)); do case ${1:$i:1} in h) usage ;; + m) + [[ $2 ]] || err "Must specify number."; + MAX_TIME="$2" + shift 2;; t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) @@ -185,6 +194,7 @@ done # Some sanity checks [[ $NUM ]] || NUM=0 +[[ $MAX_TIME ]] || MAX_TIME=10 [[ $FILE && $CHECKURL ]] && err "Cannot specify a URL and mirrorfile." [[ $FILE || $CHECKURL || $STDIN ]] || err "Must specify URL, mirrorfile, or stdin." -- 2.17.1

3 2

[PATCH v2] pactree: Use full dep string when finding dependencies
by Johannes Löthberg 21 Jun '18

21 Jun '18

Otherwise we don't use the version requirements, leading us to sometimes get the wrong results for lib32 .so deps. Fixes FS#59072. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Since v1: Compute the dep strings inside get_pkg_deps rather than inside walk_deps, so that walk_deps doesn't need any special logic based on the source. src/pactree.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index 45d6e50..a862f9e 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -411,14 +411,15 @@ static void print_end(void) } } -static alpm_list_t *get_pkg_dep_names(alpm_pkg_t *pkg) +static alpm_list_t *get_pkg_deps(alpm_pkg_t *pkg) { - alpm_list_t *i, *names = NULL; + alpm_list_t *i, *dep_strings = NULL; for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { - alpm_depend_t *d = i->data; - names = alpm_list_add(names, d->name); + alpm_depend_t *dep = i->data; + char *ds = alpm_dep_compute_string(dep); + dep_strings = alpm_list_add(dep_strings, ds); } - return names; + return dep_strings; } /** @@ -437,7 +438,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r if(rev) { deps = alpm_pkg_compute_requiredby(pkg); } else { - deps = get_pkg_dep_names(pkg); + deps = get_pkg_deps(pkg); } for(i = deps; i; i = alpm_list_next(i)) { @@ -477,11 +478,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r } } - if(rev) { - FREELIST(deps); - } else { - alpm_list_free(deps); - } + FREELIST(deps); } int main(int argc, char *argv[]) -- 2.17.1

1 0

[GIT] branch 1.0.0-rc1 deleted (was 0e28036)
by Johannes Löthberg 21 Jun '18

21 Jun '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch 1.0.0-rc1 in repository pacman-contrib. was 0e28036 Tag v1.0.0-rc1 This change permanently discards the following revisions: discard 0e28036 Tag v1.0.0-rc1 Graph of discarded commits: * 0e28036 Tag v1.0.0-rc1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch 1.0.0-rc1 created (now 0e28036)
by Johannes Löthberg 21 Jun '18

21 Jun '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch 1.0.0-rc1 in repository pacman-contrib. at 0e28036 Tag v1.0.0-rc1 This branch includes the following new commits: new 0e28036 Tag v1.0.0-rc1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 0e28036 (1.0.0-rc1) Tag v1.0.0-rc1 Detailed log of new commits: commit 0e280366c9475e665dacdfd1376d86fc756270c9 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue May 15 22:50:38 2018 +0200 Tag v1.0.0-rc1 Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch master updated (5db0b1e -> 1603b07)
by Johannes Löthberg 21 Jun '18

21 Jun '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 5db0b1e pacsort: fix short version option new 0439723 Add sha224sums to PKGBUILD vim syntax new 1603b07 paccache: add man page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 1603b07 (HEAD -> master) paccache: add man page * 0439723 Add sha224sums to PKGBUILD vim syntax Detailed log of new commits: commit 1603b07ce03b10f7c61b5635f7917fd1e943efe2 Author: Michael Straube <straubem(a)gmx.de> Date: Thu Jun 14 19:24:32 2018 +0200 paccache: add man page The main purpose of adding a man page is to document the new systemd timer. So users are aware it exists. Signed-off-by: Michael Straube <straubem(a)gmx.de> Message-Id: <20180614172432.24677-1-straubem(a)gmx.de> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 0439723c117edbab643e369eb9e7fe427640dafb Author: morganamilo <morganamilo(a)gmail.com> Date: Fri Jun 8 02:13:52 2018 +0100 Add sha224sums to PKGBUILD vim syntax Signed-off-by: morganamilo <morganamilo(a)gmail.com> Message-Id: <20180608011352.16189-1-morganamilo(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: doc/Makefile.am | 4 +++ doc/paccache.8.txt | 85 +++++++++++++++++++++++++++++++++++++++++++++ src/paccache.sh.in | 2 +- src/vim/syntax/PKGBUILD.vim | 14 ++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 doc/paccache.8.txt -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] paccache: add man page
by Michael Straube 21 Jun '18

21 Jun '18

The main purpose of adding a man page is to document the new systemd timer. So users are aware it exists. Signed-off-by: Michael Straube <straubem(a)gmx.de> --- doc/Makefile.am | 4 +++ doc/paccache.8.txt | 85 ++++++++++++++++++++++++++++++++++++++++++++++ src/paccache.sh.in | 2 +- 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 doc/paccache.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index b44319d..cf48bb5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,9 +4,11 @@ # man_MANS if --enable-asciidoc and/or --enable-doxygen are used. ASCIIDOC_MANS = \ + paccache.8 \ pactree.8 HTML_MANPAGES = \ + paccache.8.html \ pactree.8.html HTML_OTHER = \ @@ -19,6 +21,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ + paccache.8.txt \ pactree.8.txt \ footer.txt \ $(ASCIIDOC_MANS) @@ -94,6 +97,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am %.3.html: ASCIIDOC_OPTS += -d manpage # Dependency rules +paccache.8 paccache.8.html: paccache.8.txt pactree.8 pactree.8.html: pactree.8.txt # vim:set noet: diff --git a/doc/paccache.8.txt b/doc/paccache.8.txt new file mode 100644 index 0000000..db81283 --- /dev/null +++ b/doc/paccache.8.txt @@ -0,0 +1,85 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +paccache(8) +========= + +Name +---- +paccache - flexible pacman cache cleaning utility + + +Synopsis +-------- +'paccache' <operation> [options] [targets...] + + +Description +----------- +Paccache removes old packages from the pacman cache directory. +By default the last three versions of a package are kept. + + +Operations +---------- +*-d, \--dryrun*:: + Perform a dry run, only finding candidate packages. + +*-m, \--move <dir>*:: + Move candidate packages from the cache directory to 'dir'. + +*-r, \--remove*:: + Remove candidate packages from the cache directory. + + +Options +------- +*-a, \--arch <arch>*:: + Scan for packages for a specific architecture. Default is to scan for + all architectures. + +*-c, \--cachedir <dir>*:: + Specify a different cache directory. This option can be used more than once. + Default is to use the cache directory configured in 'pacman.conf'. + +*-f, \--force*:: + Apply force to 'mv' and 'rm' operations. + +*-h, \--help*:: + Display syntax and command line options. + +*-i, \--ignore <pkgs>*:: + Specify packages to ignore, comma-separated. Alternatively "-" can be used + to read the package names from stdin, newline-delimited. + +*-k, \--keep <num>*:: + Specify how many versions of each package are kept in the cache directory, + default is 3. + +*\--nocolor*:: + Remove color from the output. + +*-q, \--quiet*:: + Minimize the output. + +*-u, \--uninstalled*:: + Target uninstalled packages. + +*-v, \--verbose*:: + Increase verbosity, can be specified up to 3 times. + +*-z, \--null*:: + Use null delimiters for candidate names (only with -v and -vv). + + +Systemd Timer +------------- +The package cache can be cleaned periodically using the systemd timer 'paccache.timer'. +If the timer is enabled the cache will be cleaned weekly with paccache's default options. + + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5], linkman:systemctl[1] + +include::footer.txt[] diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 135954f..012ba9f 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# pacache - flexible pacman cache cleaning +# paccache - flexible pacman cache cleaning # # Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org> # -- 2.17.1

2 1

[PATCH] Add sha224sums to PKGBUILD vim syntax
by morganamilo 21 Jun '18

21 Jun '18

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/vim/syntax/PKGBUILD.vim | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/vim/syntax/PKGBUILD.vim b/src/vim/syntax/PKGBUILD.vim index 110bbc7..6a27360 100644 --- a/src/vim/syntax/PKGBUILD.vim +++ b/src/vim/syntax/PKGBUILD.vim @@ -176,6 +176,17 @@ hi def link pbSha1Quotes Keyword hi def link pbSha1Hash Error hi def link pbValidSha1sums Number +" sha224sums +syn keyword pb_k_sha224sums sha224sums contained +syn match pbIllegalsha224sums /[^='"()\/ ]/ contained contains=pbValidsha224sums +syn match pbValidsha224sums /\x\{64\}/ contained +syn region pbsha224sumsGroup start=/^sha224sums/ end=/)/ contains=pb_k_sha224sums,pbsha224Quotes,pbsha224Hash,pbIllegalsha224sums keepend +syn match pbsha224Quotes /'.*'\|".*"/ contained contains=pbsha224Hash,pbIllegalsha224sums +syn match pbsha224Hash /\x\+/ contained contains=pbValidsha224sums +hi def link pbsha224Quotes Keyword +hi def link pbsha224Hash Error +hi def link pbValidsha224sums Number + " sha256sums syn keyword pb_k_sha256sums sha256sums contained syn match pbIllegalSha256sums /[^='"()\/ ]/ contained contains=pbValidSha256sums @@ -291,6 +302,9 @@ hi def link pbIllegalMd5sums Error hi def link pb_k_sha1sums pbKeywords hi def link pbIllegalSha1sums Error +hi def link pb_k_sha224sums pbKeywords +hi def link pbIllegalSha224sums Error + hi def link pb_k_sha256sums pbKeywords hi def link pbIllegalSha256sums Error -- 2.17.1

2 1

[PATCH 1/2] Migrate bacman
by morganamilo 21 Jun '18

21 Jun '18

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- doc/Makefile.am | 3 + src/Makefile.am | 1 + src/bacman.sh.in | 391 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 395 insertions(+) create mode 100644 src/bacman.sh.in diff --git a/doc/Makefile.am b/doc/Makefile.am index b44319d..3b3e362 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,6 +4,7 @@ # man_MANS if --enable-asciidoc and/or --enable-doxygen are used. ASCIIDOC_MANS = \ + bacman.8 \ pactree.8 HTML_MANPAGES = \ @@ -19,6 +20,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ + bacman.8.txt \ pactree.8.txt \ footer.txt \ $(ASCIIDOC_MANS) @@ -94,6 +96,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am %.3.html: ASCIIDOC_OPTS += -d manpage # Dependency rules +bacman.8: bacman.8.txt pactree.8 pactree.8.html: pactree.8.txt # vim:set noet: diff --git a/src/Makefile.am b/src/Makefile.am index 792da70..f78635c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,7 @@ systemd__DATA = \ paccache.service paccache.timer BASHSCRIPTS = \ + bacman \ checkupdates \ paccache \ pacdiff \ diff --git a/src/bacman.sh.in b/src/bacman.sh.in new file mode 100644 index 0000000..ca7c9c8 --- /dev/null +++ b/src/bacman.sh.in @@ -0,0 +1,391 @@ +#!/bin/bash +# +# bacman: recreate a package from a running system +# This script rebuilds an already installed package using metadata +# stored into the pacman database and system files +# +# Copyright (c) 2008 locci <carlocci_at_gmail_dot_com> +# Copyright (c) 2008-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/>. +# + +shopt -s extglob +shopt -s nullglob + +declare -r myname='bacman' +declare -r myver='@PACKAGE_VERSION@' +USE_COLOR='y' +INCLUDE_PACNEW='n' +QUIET=0 +# Required for fakeroot because options are shifted off the array. +ARGS=("$@") + +m4_include(../lib/output_format.sh) +m4_include(../lib/parseopts.sh) + +# Lazy recursive clean up of temporary dirs +work_dir_root="${TMPDIR:-/tmp}/bacman" +clean_up() { + rm -rf "$work_dir_root".* + echo + exit +} +# Trap termination signals +trap clean_up SIGHUP SIGINT SIGTERM + +# Print usage information +usage() { + printf "%s (pacman) %s\n" "$myname" "$myver" + echo + printf -- "$(gettext "Recreate packages using pacman's database and system files")\n" + echo + printf -- "$(gettext "Usage: %s [options] <package(s)>")\n" "$0" + echo + printf -- "$(gettext "Options:")\n" + printf -- "$(gettext " -h, --help Show this help message and exit")\n" + printf -- "$(gettext " -q, --quiet Silence most of the status reporting")\n" + printf -- "$(gettext " -m, --nocolor Disable colorized output messages")\n" + printf -- "$(gettext " -o, --out <dir> Write output to specified directory (instead of \$PKGDEST)")\n" + printf -- "$(gettext " --pacnew Package .pacnew files")\n" + echo + printf -- "$(gettext "Examples:")" + printf -- " %s linux-headers\n" "$myname" + printf -- " %s -o ~/packages libarchive\n" "$myname" + printf -- " %s --nocolor --pacnew gzip make binutils\n" "$myname" + printf -- " %s \$(pacman -Qq)\n" "$myname" + echo +} + +# Print version information +version() { + printf "%s %s\n" "$myname" "$myver" + echo 'Copyright (C) 2008 locci <carlocci_at_gmail_dot_com>' + echo 'Copyright (C) 2008-2016 Pacman Development Team <pacman-dev(a)archlinux.org>' +} + + +# Printing the usage information takes precedence over every other parameter +for option in "$@"; do + [[ $option == "-h" || $option == "--help" ]] && usage && exit 0 +done + +# Parse arguments +OPT_SHORT='o:qmv' +OPT_LONG=('out:' 'quiet' 'nocolor' 'pacnew' 'version') +if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then + usage + exit 1 +fi +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET + +while :; do + case "$1" in + -o|--out) + pkg_dest=$2 + [[ ! -d "$2" ]] && echo -e "The directory \e[39;1m$2\e[0m does not exist!" && exit 3 + shift ;; + -q|--quiet) + QUIET=1 ;; + -m|--nocolor) + USE_COLOR='n' ;; + --pacnew) + INCLUDE_PACNEW='y' ;; + -v|--version) + version + exit 0 ;; + --) + shift + break 2 ;; + esac + shift +done + +# Configure colored output +m4_include(../lib/term_colors.sh) + +# Retrieve the list of packages to be assembled and break if none was specified +pkg_list=($*) +if [[ ${#pkg_list[@]} == 0 ]]; then + usage + exit 1 +fi + +# Run with fake root privileges if EUID is not root +if (( EUID )); then + if [[ -f /usr/bin/fakeroot ]]; then + msg "Entering fakeroot environment" + export INFAKEROOT="1" + /usr/bin/fakeroot -u -- "$0" "${ARGS[@]}" + exit $? + else + warning "installing fakeroot or running $myname as root is required to" + plain " preserve the ownership permissions of files in some packages\n" + fi +fi + +# Source environmental variables and specify fallbacks +if [[ ! -r @sysconfdir@/pacman.conf ]]; then + error "unable to read @sysconfdir@/pacman.conf" + exit 1 +fi +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" +if [[ ! -r @sysconfdir@/makepkg.conf ]]; then + error "unable to read @sysconfdir@/makepkg.conf" + exit 1 +fi +source "@sysconfdir@/makepkg.conf" +if [[ -r ~/.makepkg.conf ]]; then + source ~/.makepkg.conf +fi +PKGDEST="${PKGDEST:-$PWD}" +pkg_dest="${pkg_dest:-$PKGDEST}" +pkg_pkger="${PACKAGER:-'Unknown Packager'}" + +# Check for an existing database +if [[ ! -d $pac_db ]]; then + error "pacman database directory ${pac_db} not found" + exit 1 +fi + +# Assemble a single package: $1 = pkgname +fakebuild() { + pkg_name="$1" + pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-])) + pkg_namver=("${pkg_dir[@]##*/}") + + # Checks database for specified package + if (( ${#pkg_dir[@]} != 1 )); then + error "%d entries for package %s found in pacman database" \ + ${#pkg_dir[@]} "${pkg_name}" + msg2 "%s" "${pkg_dir[@]}" + exit 1 + fi + if [[ ! -d $pkg_dir ]]; then + error "package %s is found in pacman database," "${pkg_name}" + plain " but '%s' is not a directory" "${pkg_dir}" + exit 1 + fi + + # Create working directory + msg "Package: ${pkg_namver}" + work_dir=$(mktemp -d "${work_dir_root}.XXXXXXXXXX") + cd "$work_dir" || exit 1 + + # Assemble list of files which belong to the package and tar them + msg2 "Copying package files..." + + while read i; do + if [[ -z $i ]]; then + continue + fi + + if [[ $i == %+([A-Z])% ]]; then + current=$i + continue + fi + + case "$current" in + %FILES%) + local_file="/$i" + package_file="$work_dir/$i" + + if [[ ! -e $local_file ]]; then + warning "package file $local_file is missing" + continue + fi + ;; + + %BACKUP%) + # Get the MD5 checksum. + original_md5="${i##*$'\t'}" + # Strip the md5sum after the tab. + i="${i%$'\t'*}" + local_file="/$i.pacnew" + package_file="$work_dir/$i" + + # Include unmodified .pacnew files. + local_md5="$(md5sum "$local_file" | cut -d' ' -f1)" + if [[ $INCLUDE_PACNEW == 'n' ]] \ + || [[ ! -e $local_file ]] \ + || [[ $local_md5 != $original_md5 ]]; then + # Warn about modified files. + local_md5="$(md5sum "/$i" | cut -d' ' -f1)" + if [[ $local_md5 != $original_md5 ]]; then + warning "package file /$i has been modified" + fi + # Let the normal file be included in the %FILES% list. + continue + fi + ;; + + *) + continue + ;; + esac + + # Tar files + ret=0 + bsdtar -cnf - -s'/.pacnew$//' "$local_file" 2> /dev/null | bsdtar -xpf - 2> /dev/null + # Workaround to bsdtar not reporting a missing file as an error + if ! [[ -e $package_file || -L $package_file ]]; then + error "unable to add $local_file to the package" + plain " If your user does not have permission to read this file, then" + plain " you will need to run $myname as root." + rm -rf "$work_dir" + exit 1 + fi + done < "$pkg_dir"/files + + ret=$? + if (( ret )); then + rm -rf "$work_dir" + exit 1 + fi + + # Calculate package size + pkg_size=$(du -sk | awk '{print $1 * 1024}') + + # Reconstruct .PKGINFO from database + # TODO adopt makepkg's write_pkginfo() into this or scripts/library + msg2 "Generating .PKGINFO metadata..." + echo "# Generated by $myname $myver" > .PKGINFO + if [[ $INFAKEROOT == "1" ]]; then + echo "# Using $(fakeroot -v)" >> .PKGINFO + fi + echo "# $(LC_ALL=C date)" >> .PKGINFO + echo "#" >> .PKGINFO + while read i; do + if [[ -z $i ]]; then + continue; + fi + if [[ $i == %+([A-Z])% ]]; then + current=$i + continue + fi + + case "$current" in + # desc + %NAME%) + echo "pkgname = $i" >> .PKGINFO + ;; + %VERSION%) + echo "pkgver = $i" >> .PKGINFO + ;; + %DESC%) + echo "pkgdesc = $i" >> .PKGINFO + ;; + %URL%) + echo "url = $i" >> .PKGINFO + ;; + %LICENSE%) + echo "license = $i" >> .PKGINFO + ;; + %ARCH%) + echo "arch = $i" >> .PKGINFO + pkg_arch="$i" + ;; + %BUILDDATE%) + echo "builddate = $(date -u "+%s")" >> .PKGINFO + ;; + %PACKAGER%) + echo "packager = $pkg_pkger" >> .PKGINFO + ;; + %SIZE%) + echo "size = $pkg_size" >> .PKGINFO + ;; + %GROUPS%) + echo "group = $i" >> .PKGINFO + ;; + %REPLACES%) + echo "replaces = $i" >> .PKGINFO + ;; + %DEPENDS%) + echo "depend = $i" >> .PKGINFO + ;; + %OPTDEPENDS%) + echo "optdepend = $i" >> .PKGINFO + ;; + %CONFLICTS%) + echo "conflict = $i" >> .PKGINFO + ;; + %PROVIDES%) + echo "provides = $i" >> .PKGINFO + ;; + %BACKUP%) + # Strip the md5sum after the tab + echo "backup = ${i%%$'\t'*}" >> .PKGINFO + ;; + esac + done < <(cat "$pkg_dir"/{desc,files}) + + comp_files=".PKGINFO" + + # Add instal file if present + if [[ -f $pkg_dir/install ]]; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" + comp_files+=" .INSTALL" + fi + if [[ -f $pkg_dir/changelog ]]; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" + comp_files+=" .CHANGELOG" + fi + + # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL + chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null + chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null + + # Generate the package + msg2 "Generating the package..." + + pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" + ret=0 + + # Move compressed package to destination + # TODO: Maybe this can be set globally for robustness + shopt -s -o pipefail + bsdtar -cf - $comp_files * | + case "$PKGEXT" in + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; + *tar) cat ;; + *) warning "'%s' is not a valid archive extension." \ + "$PKGEXT"; cat ;; + esac > "${pkg_file}"; ret=$? + + # Evaluate return code + if (( ret )); then + error "Unable to write package to $pkg_dest" + plain " Maybe the disk is full or you do not have write access" + rm -rf "$work_dir" + exit 1 + fi + + # Clean up working directory + rm -rf "$work_dir" +} + + +for PKG in ${pkg_list[@]}; do + fakebuild $PKG +done +msg "Done." + +exit 0 + +# vim: set noet: -- 2.17.1

2 2

[PATCH] pactree: Use full dep string when finding dependencies
by Johannes Löthberg 20 Jun '18

20 Jun '18

Otherwise we don't use the version requirements, leading us to sometimes get the wrong results for lib32 .so deps. Fixes FS#59072. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pactree.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index 45d6e50..4f6faa9 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -411,14 +411,14 @@ static void print_end(void) } } -static alpm_list_t *get_pkg_dep_names(alpm_pkg_t *pkg) +static alpm_list_t *get_pkg_deps(alpm_pkg_t *pkg) { - alpm_list_t *i, *names = NULL; + alpm_list_t *i, *deps = NULL; for(i = alpm_pkg_get_depends(pkg); i; i = alpm_list_next(i)) { alpm_depend_t *d = i->data; - names = alpm_list_add(names, d->name); + deps = alpm_list_add(deps, d); } - return names; + return deps; } /** @@ -437,11 +437,17 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r if(rev) { deps = alpm_pkg_compute_requiredby(pkg); } else { - deps = get_pkg_dep_names(pkg); + deps = get_pkg_deps(pkg); } for(i = deps; i; i = alpm_list_next(i)) { - const char *pkgname = i->data; + char *pkgname = NULL; + if(rev) { + pkgname = i->data; + } else { + alpm_depend_t *dep = i->data; + pkgname = alpm_dep_compute_string(dep); + } int last = alpm_list_next(i) ? 0 : 1; alpm_pkg_t *dep_pkg = alpm_find_dbs_satisfier(handle, dblist, pkgname); @@ -475,6 +481,10 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r depth->next = NULL; } } + + if(!rev) { + free(pkgname); + } } if(rev) { -- 2.17.1

1 0