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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.0-14-gf63854f
by allan＠archlinux.org 22 Feb '16

22 Feb '16

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 f63854fa96f658ca5bdf2c21a1cd33cf4e3fbdbd (commit) via 83c7dc80cba7c9818f0ceba7ff6382fef873818f (commit) via fd936c9e732348ed754087576d67d1b2fe04afd4 (commit) via 169287e494a5348687260a00697be06b36ba4434 (commit) via 7624101e181c6c7262a40fc34797d591d062d4d4 (commit) via a1a8d067e0264ade802229d418acfb019528f97c (commit) via 7cf5e1aebf8aaeefa743d057d72833541722ca24 (commit) via c72ca3d539072acf55b4deb3a5646ce0717f08a1 (commit) via 3cb1669e07106e9108976a76b7d2f37e659bce6c (commit) via 0fa695d0e3862bf343804892c51d3793dd90be60 (commit) via 50a2db4834906d83651c9e3cd4392adade6b6855 (commit) via fb72eede2020e49402e7c191608bf412239f85e8 (commit) via c1bb41a0378736e0fdd535541daa8cd7d09a4cc6 (commit) via 252183b4093b8c82ad19159d23bdd2cf0e2d574e (commit) from fea9abc8db3b8161ab32774a0ddd7c405cfbe44f (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 f63854fa96f658ca5bdf2c21a1cd33cf4e3fbdbd Author: Dominik Fischer <d.f.fischer(a)web.de> Date: Sat Feb 20 18:35:47 2016 +0100 only include .SRCINFO comments in source tarball This avoids introducing unnecessary changes to the time stamp into package repositories that regularly use --printsrcinfo to update the .SRCINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83c7dc80cba7c9818f0ceba7ff6382fef873818f Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 20 15:43:13 2016 +1000 alpm-hooks.5: document hook running order Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fd936c9e732348ed754087576d67d1b2fe04afd4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 3 08:23:41 2016 -0500 only remove pacnew file if it is new Check if we overwrote an exiting pacnew file before unlinking it. Otherwise, updating to a version with an unchanged file would delete existing pacnew files. FS#47993 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 169287e494a5348687260a00697be06b36ba4434 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 16 12:08:07 2016 +1000 makepkg: remove pkg from OPT_LONG array Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7624101e181c6c7262a40fc34797d591d062d4d4 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Feb 12 21:09:47 2016 +1000 Revert "makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD" This reverts commit f9423cfa5d5b9f2041b70676438082faad1cd1ee. This created issue when building packages with debug info multiple times. It could be fixed, but it confirmed my initial opinion that keeping other directories in $pkgdirbase was wrong. Use different BUILDDIRs if you want to build different things from a single PKGBUILD. commit a1a8d067e0264ade802229d418acfb019528f97c Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sat Jan 30 15:16:28 2016 +0100 Log to file when running hooks Useful if there's some output (to know where it comes from), or in case of failure. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7cf5e1aebf8aaeefa743d057d72833541722ca24 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 7 22:01:08 2016 +1000 doc/alpm-hooks: mention that hooks must have a ".hooks" suffix. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c72ca3d539072acf55b4deb3a5646ce0717f08a1 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sat Feb 6 20:54:31 2016 +1300 Make "makepkg -g" ignore the current architecture. Commit 663c74150ab4ba6d3adc55b0e3f539557a16e352 (makepkg: merge arch dependent variables after PKGBUILD linting) broke "makepkg -g" on a PKGBUILD which did not include the current architecture, by moving the lint_pkgbuild call before GENINTEG was processed. Fix that by setting IGNOREARCH for the "-g" option. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3cb1669e07106e9108976a76b7d2f37e659bce6c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 7 21:27:31 2016 +1000 libmakepkg: increase robustness of the detection of array variables Extract array detection into its own utility function that ensures extglob is enabled. Suggested-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0fa695d0e3862bf343804892c51d3793dd90be60 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 7 20:59:09 2016 +1000 repo-remove: fix checking for non-existent .db database Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50a2db4834906d83651c9e3cd4392adade6b6855 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Thu Feb 4 07:25:28 2016 +1300 Add the missing limits.h include to hook.c PATH_MAX is only defined in limits.h in musl libc, so ensure that it is included. Presumably this is also required on other platforms. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fb72eede2020e49402e7c191608bf412239f85e8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 1 12:39:47 2016 -0500 doc/index.txt: update for pacman 5.0 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1bb41a0378736e0fdd535541daa8cd7d09a4cc6 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Feb 1 12:14:47 2016 -0500 dump_pkg_info: fix wide character title alignment The padding added to the end of the title was based on the return value of mbstowcs which is the number of characters. This caused alignment issues for languages with characters that span multiple columns. Instead, base the padding on the number of columns needed by the translated string as returned by wcswidth. Fixes #47980 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 252183b4093b8c82ad19159d23bdd2cf0e2d574e Author: Doug Newgard <scimmia(a)archlinux.info> Date: Sat Jan 30 23:02:00 2016 -0600 Bring makepkg zsh completions up to date Signed-off-by: Doug Newgard <scimmia(a)archlinux.info> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 21 +++++++++++------- doc/alpm-hooks.5.txt | 4 +++- doc/index.txt | 13 +++++++---- lib/libalpm/add.c | 10 ++++++--- lib/libalpm/hook.c | 3 ++- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 6 ++--- scripts/libmakepkg/util/util.sh | 17 ++++++++++++++ scripts/makepkg.sh.in | 27 ++++++++++++++--------- scripts/repo-add.sh.in | 2 +- src/pacman/package.c | 17 +++++++++----- test/pacman/tests/TESTS | 1 + test/pacman/tests/{upgrade021.py => backup001.py} | 5 +++-- 12 files changed, 87 insertions(+), 39 deletions(-) copy test/pacman/tests/{upgrade021.py => backup001.py} (83%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add: do not alter the database if only verifying signature
by Allan McRae 21 Feb '16

21 Feb '16

Fixes FS#48085. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index cab5e04..d62f9c4 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -798,6 +798,17 @@ fi check_xdelta +if (( VERIFY && ${#args[@]} == 1 )); then + for repo in "db" "files"; do + dbfile=${repodir}/$REPO_DB_PREFIX.$repo.$REPO_DB_SUFFIX + + if [[ -f $dbfile ]]; then + verify_signature "$dbfile" + fi + done + exit 0 +fi + prepare_repo_db for arg in "${args[@]:1}"; do -- 2.7.1

1 0

[pacman-dev] [PATCH] Failed database downloads cause transaction to stop
by Allan McRae 21 Feb '16

21 Feb '16

Previously, we errored only if all databases failed to download. If any database downloads fail, we are unable to determine whether an update is still considered safe. So now if any database download fails, the transaction is aborted (after attempting all database downloads). Fixes FS#47599. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index e2c9900..0862de0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -147,7 +147,7 @@ int check_syncdbs(size_t need_repos, int check_valid) int sync_syncdbs(int level, alpm_list_t *syncs) { alpm_list_t *i; - unsigned int success = 0; + unsigned int success = 1; for(i = syncs; i; i = alpm_list_next(i)) { alpm_db_t *db = i->data; @@ -156,21 +156,14 @@ int sync_syncdbs(int level, alpm_list_t *syncs) if(ret < 0) { pm_printf(ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); + success = 0; } else if(ret == 1) { printf(_(" %s is up to date\n"), alpm_db_get_name(db)); - success++; - } else { - success++; } } - /* We should always succeed if at least one DB was upgraded - we may possibly - * fail later with unresolved deps, but that should be rare, and would be - * expected - */ if(!success) { - pm_printf(ALPM_LOG_ERROR, _("failed to synchronize any databases\n")); - trans_init_error(); + pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases\n")); } return (success > 0); } -- 2.7.1

1 0

[pacman-dev] [PATCH] Use versions specified in optdepends
by Allan McRae 21 Feb '16

21 Feb '16

Checking install status and if a package is optionally required on removal now considers the version of the optdepend. Fixes FS#44957. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 3 ++- src/pacman/util.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 22211d9..45f7c2f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -180,7 +180,8 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * alpm_list_t *j; for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; - if(alpm_find_satisfier(lp, optdep->name)) { + char *optstring = alpm_dep_compute_string(optdep); + if(alpm_find_satisfier(lp, optstring)) { alpm_event_optdep_removal_t event = { .type = ALPM_EVENT_OPTDEP_REMOVAL, .pkg = pkg, diff --git a/src/pacman/util.c b/src/pacman/util.c index e613c75..e2c9900 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1201,9 +1201,9 @@ static char *make_optstring(alpm_depend_t *optdep) alpm_db_t *localdb = alpm_get_localdb(config->handle); char *optstring = alpm_dep_compute_string(optdep); char *status = NULL; - if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { + if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optstring)) { status = _(" [installed]"); - } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optdep->name)) { + } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optstring)) { status = _(" [pending]"); } if(status) { -- 2.7.1

1 0

[pacman-dev] [PATCH] Consider provides when warning about optdepnd removal
by Allan McRae 21 Feb '16

21 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/remove.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index bdb7d2a..22211d9 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -180,7 +180,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * alpm_list_t *j; for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; - if(alpm_pkg_find(lp, optdep->name)) { + if(alpm_find_satisfier(lp, optdep->name)) { alpm_event_optdep_removal_t event = { .type = ALPM_EVENT_OPTDEP_REMOVAL, .pkg = pkg, -- 2.7.1

1 0

[pacman-dev] [PATCH] Consider provides when labelling optdepends status as pending install
by Allan McRae 21 Feb '16

21 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 48a3600..e613c75 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1203,7 +1203,7 @@ static char *make_optstring(alpm_depend_t *optdep) char *status = NULL; if(alpm_find_satisfier(alpm_db_get_pkgcache(localdb), optdep->name)) { status = _(" [installed]"); - } else if(alpm_pkg_find(alpm_trans_get_add(config->handle), optdep->name)) { + } else if(alpm_find_satisfier(alpm_trans_get_add(config->handle), optdep->name)) { status = _(" [pending]"); } if(status) { -- 2.7.1

1 0

[pacman-dev] [PATCH] set .SRCINFO time stamp to PKGBUILD modification
by Dominik Fischer 21 Feb '16

21 Feb '16

As the .SRCINFO is mandatory for a git push to AUR, it is tempting to automate its generation, for example in a git hook. This also saves the developer from accidentally uploading a change to the PKGBUILD without it being properly reflected in the .SRCINFO. But when only files other than the PKGBUILD were changed, or a change to the PKGBUILD did not affect the contents of the .SRCINFO, the time stamp still changes on each run of mksrcinfo, introducing an unnecessary and possibly misleading change to the otherwise unaltered .SRCINFO file. This especially impairs the use of commands examining the history, like "git log .SRCINFO". Using the last modification time of the PKGBUILD in place of the date the .SRCINFO was generated alleviates at least part of this problem. --- More than a ready proposal for a change, this patch is an inquiry about the reason for the time stamp. As noted above, I find it quite impractical while maintaining packages in the AUR. Above that, the information seems redundant, as all package repositories are versioned with git, where each commit already carries a date, usually only a few seconds behind the time stamp. I originally posted this issue to the pkgbuild-introspection project [1], but as pacman sets the standard for the .SRCINFO format, this mailing list is the more appropriate place for it. I am aware that git attributes and filters could be used to modify or delete the timestamp, but am reluctant to deviate from the norm be it only for a mere comment, as long a I do not know its purpose. Why is the time stamp there? Would it be sensible to switch it out for the PKGBUILD modification date? Could it even be removed? [1]: https://github.com/falconindy/pkgbuild-introspection/issues/32 scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80b95f4..00e532b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1084,7 +1084,7 @@ write_srcinfo() { local pkg printf "# Generated by makepkg %s\n" "$makepkg_version" - printf "# %s\n" "$(LC_ALL=C date -u)" + printf "# %s\n" "$(LC_ALL=C date -ud @$(stat -c %Y "$BUILDFILE"))" srcinfo_write_global -- 2.7.1

3 7

[pacman-dev] [PATCH] makepkg: Remove upx and optipng support
by Allan McRae 20 Feb '16

20 Feb '16

These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ----- doc/makepkg.conf.5.txt | 10 +------- etc/makepkg.conf.in | 6 ++--- scripts/Makefile.am | 2 -- scripts/libmakepkg/tidy/optipng.sh.in | 44 --------------------------------- scripts/libmakepkg/tidy/upx.sh.in | 46 ----------------------------------- scripts/makepkg.sh.in | 16 ------------ scripts/po/POTFILES.in | 2 -- 9 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 scripts/libmakepkg/tidy/optipng.sh.in delete mode 100644 scripts/libmakepkg/tidy/upx.sh.in diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 35ca6bd..110bbc7 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,7 +211,7 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|optipng\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|purge\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e410481..e19a81c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -293,12 +293,6 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'. *zipman*;; Compress man and info pages with gzip. - *upx*;; - Compress binary executable files using UPX. - - *optipng*;; - Optimize PNG images with optipng. - *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index e35eb8a..5bd3472 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -141,7 +141,7 @@ Options Specify a key to use for GPG signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge !upx !optipng**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**:: This array contains options that affect default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -178,14 +178,6 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. - *upx*;; - Compress binary executable files using UPX. Additional options - can be passed to UPX by specifying the `UPXFLAGS` array variable. - - *optipng*;; - Optimize PNG images with optipng. Additional options can be passed - to optipng by specifying the `OPTIPNGFLAGS` array variable. - *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 71ec624..efac16a 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -71,7 +71,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) +# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -81,11 +81,9 @@ BUILDENV=(!distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- optipng: Optimize PNG images with optipng #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !optipng !debug) +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d660c0b..6f9abb8 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -85,11 +85,9 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ - libmakepkg/tidy/optipng.sh \ libmakepkg/tidy/purge.sh \ libmakepkg/tidy/staticlibs.sh \ libmakepkg/tidy/strip.sh \ - libmakepkg/tidy/upx.sh \ libmakepkg/tidy/zipman.sh \ libmakepkg/util.sh \ libmakepkg/util/pkgbuild.sh \ diff --git a/scripts/libmakepkg/tidy/optipng.sh.in b/scripts/libmakepkg/tidy/optipng.sh.in deleted file mode 100644 index 4c07674..0000000 --- a/scripts/libmakepkg/tidy/optipng.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# optipng.sh - Compress PNG files using optpng -# -# 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_TIDY_OPTIPNG_SH" ]] && return -LIBMAKEPKG_TIDY_OPTIPNG_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('optipng') -tidy_modify+=('tidy_optipng') - -tidy_optipng() { - if check_option "optipng" "y"; then - msg2 "$(gettext "Optimizing PNG images...")" - local png - find . -type f -iname "*.png" 2>/dev/null | while read -r png ; do - if [[ $(file --brief --mime-type "$png") = 'image/png' ]]; then - optipng "${OPTIPNGFLAGS[@]}" "$png" &>/dev/null || - warning "$(gettext "Could not optimize PNG image : %s")" "${png/$pkgdir\//}" - fi - done - fi -} diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in deleted file mode 100644 index f638335..0000000 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# upx.sh - Compress package binaries with UPX -# -# Copyright (c) 2011-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_TIDY_UPX_SH" ]] && return -LIBMAKEPKG_TIDY_UPX_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" -source "$LIBRARY/util/option.sh" - - -packaging_options+=('upx') -tidy_modify+=('tidy_upx') - -tidy_upx() { - if check_option "upx" "y"; then - msg2 "$(gettext "Compressing binaries with %s...")" "UPX" - local binary - find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do - case "$(file --brief --mime-type "$binary")" in - 'application/x-executable' | 'application/x-dosexec') - upx "${UPXFLAGS[@]}" "$binary" &>/dev/null || - warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" - ;; - esac - done - fi -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 29ccaad..fc299eb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1549,22 +1549,6 @@ check_software() { fi fi - # upx - binary compression - if check_option "upx" "y"; then - if ! type -p upx >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compressing binaries.")" "upx" - ret=1 - fi - fi - - # optipng - PNG image optimization - if check_option "optipng" "y"; then - if ! type -p optipng >/dev/null; then - error "$(gettext "Cannot find the %s binary required for optimizing PNG images.")" "optipng" - ret=1 - fi - fi - # distcc - compilation with distcc if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 3ac5a43..d115d89 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -40,11 +40,9 @@ scripts/libmakepkg/tidy.sh.in scripts/libmakepkg/tidy/docs.sh.in scripts/libmakepkg/tidy/emptydirs.sh.in scripts/libmakepkg/tidy/libtool.sh.in -scripts/libmakepkg/tidy/optipng.sh.in scripts/libmakepkg/tidy/purge.sh.in scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.sh.in -scripts/libmakepkg/tidy/upx.sh.in scripts/libmakepkg/tidy/zipman.sh.in scripts/libmakepkg/util/message.sh scripts/libmakepkg/util/source.sh.in -- 2.7.1

2 1

[pacman-dev] [PATCH] alpm-hooks.5: document hook running order
by Allan McRae 20 Feb '16

20 Feb '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not sure if this is worded correctly... Suggestions welcome. doc/alpm-hooks.5.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/alpm-hooks.5.txt b/doc/alpm-hooks.5.txt index 979af49..7c523e2 100644 --- a/doc/alpm-hooks.5.txt +++ b/doc/alpm-hooks.5.txt @@ -34,7 +34,8 @@ libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more '[Trigger]' section describing which transactions it should be run for. Hook -file names are required to have the suffix ".hook". +file names are required to have the suffix ".hook". Hooks are run in +alphabetical order of their file name. TRIGGERS -------- -- 2.7.1

1 0

[pacman-dev] [PATCH] test version range restrictions corner case
by Dominik Fischer 19 Feb '16

19 Feb '16

The test introduced herein illustrates a behavior that may be unexpected to package writers. It creates a package "pkg3" that is configured to depend on a "dependency" which version is between 3 and 4, inclusive. Two other packages are already present, providing "dependency" in version 2 and 5, respectively. So, the situation looks roughly like this: pkg1 pkg3 pkg2 provides depends on provides | <------------> | version __________2____________3____________4____________5___________... This seems to be enough to satisfy pacman when installing "pkg3". From an iterative standpoint, this is completely logical: First, the requirement "dependency>=3" is checked. There is a package that satisfies this restriction, it is called "pkg2". Afterwards, "dependency<=4" is covered in the same way by "pkg1". Nonetheless, what a package writer intends when specifying depends=('dependency>=3' 'dependency<=4') is most probably that pacman should only allow this package to be installed when there indeed is a package present that provides a version of "dependency" that lies _between_ 3 and 5. Signed-off-by: Dominik Fischer <d dot f dot fischer at web dot de> --- This behavior may be intended though. If so, this corner case should perhaps be noted in the documentation. Please review and comment. test/pacman/tests/TESTS | 1 + test/pacman/tests/deprange001.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 test/pacman/tests/deprange001.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index bee7c8e..f35ec1a 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -15,6 +15,7 @@ TESTS += test/pacman/tests/depconflict110.py TESTS += test/pacman/tests/depconflict111.py TESTS += test/pacman/tests/depconflict120.py TESTS += test/pacman/tests/dependency-cycle-fixed-by-upgrade.py +TESTS += test/pacman/tests/deprange001.py TESTS += test/pacman/tests/deptest001.py TESTS += test/pacman/tests/dummy001.py TESTS += test/pacman/tests/epoch001.py diff --git a/test/pacman/tests/deprange001.py b/test/pacman/tests/deprange001.py new file mode 100644 index 0000000..bab52fa --- /dev/null +++ b/test/pacman/tests/deprange001.py @@ -0,0 +1,17 @@ +self.description = "undetected conflict with version range" + +lp1 = pmpkg("pkg1") +lp1.provides = ["dependency=2"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["dependency=5"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg3") +p.depends = ["dependency>3", "dependency<4"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg3") -- 2.6.3

4 8