- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] paccache: added --quiet option
by Maxim Andersson 09 Feb '15

09 Feb '15

Less output, although errors and warnings will still be printed (scripts/library/output_format.sh). Cleaner to have -q,--quiet than >/dev/null in cron. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 1690583..02fae52 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -27,6 +27,7 @@ declare -a cachedirs=() candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 declare delim=$'\n' keep=3 movedir= scanarch= +QUIET=0 USE_COLOR='y' m4_include(../scripts/library/output_format.sh) @@ -135,6 +136,8 @@ runcmd() { } summarize() { + (( QUIET )) && return + local -i filecount=$1; shift local seenarch= seen= arch= name= local -r pkg_re='(.+)-[^-]+-[0-9]+-([^.]+)\.pkg.*' @@ -192,6 +195,7 @@ Usage: ${myname} <operation> [options] [targets...] delimited. -k, --keep <num> keep "num" of each package in the cache (default: 3). --nocolor remove color from output. + -q, --quiet minimize output -u, --uninstalled target uninstalled packages. -v, --verbose increase verbosity. specify up to 3 times. -z, --null use null delimiters for candidate names (only with -v @@ -205,9 +209,9 @@ version() { echo 'Copyright (C) 2011 Dave Reisner <dreisner(a)archlinux.org>' } -OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' +OPT_SHORT=':a:c:dfhi:k:m:qrsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' - 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') + 'nocolor' 'quiet' 'remove' 'uninstalled' 'version' 'verbose' 'null') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -247,11 +251,13 @@ while :; do keep=$(( 10#$keep )) fi shift ;; - --nocolor) - USE_COLOR='n' ;; -m|--move) move=1 movedir=$2 shift ;; + --nocolor) + USE_COLOR='n' ;; + -q|--quiet) + QUIET=1 ;; -r|--remove) delete=1 ;; -u|--uninstalled) -- 2.3.0

3 3

[pacman-dev] [libalpm] Installing and removing a package in the same handle lifecycle
by Fabien Bourigault 08 Feb '15

08 Feb '15

Hi, I'm a PackageKit alpm backend contributor and I found a strange behavior when removing a package in the same alpm_handle_t lifecycle. Here you have the simplified workflow : alpm initialization new transaction install inkscape end transaction new transaction remove inkscape end transaction When removing the package, backend does an alpm_db_get_pkg (localdb, name) to get the package and then call alpm_remove_pkg with this found package. alpm_remove_pkg returns an error with 6 as errno. I looked in alpm_remove_pkg code and there is 3 cases returning such error. The one failing is pkg coming from localdb. I have no knowledge of libalpm internals but from the outside it looks like the package structure was copied ot the localdb in installation phase but the db field was not updated. I hope this is a bug that could be solved. Regards, Fabien

2 3

[pacman-dev] [PATCH] zsh completion: get installed packages with pacman -Qq
by Roma Kovalev 08 Feb '15

08 Feb '15

Currently _pacman_completions_installed_packages() globs the directory @localstatedir@/lib/pacman/local/, this does not respect changes to DBPath in /etc/pacman.conf, which cause completion to stop working. Instead of globbing $(pacman -Qq) can be called to get a list of installed packages correctly. Signed-off-by: Roma Kovalev <roma.kvl(a)gmail.com> --- contrib/zsh_completion.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 1cae1de..0eae5e9 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -285,9 +285,8 @@ _pacman_completions_installed_groups() { # provides completions for installed packages _pacman_completions_installed_packages() { - local -a cmd packages packages_long - packages_long=(@localstatedir@/lib/pacman/local/*(/)) - packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} ) + local -a packages + packages=( $(pacman -Qq) ) compadd "$@" -a packages } -- 2.2.2

3 2

[pacman-dev] [PATCH] Disable directory ownership warnings
by Allan McRae 04 Feb '15

04 Feb '15

There was a lot of confusion regarding these warnings, particularly for packages that create users post_install and then chown the directories. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 82461ee..a6b83f5 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -231,6 +231,12 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, gid_t entrygid = archive_entry_gid(entry); /* case 6: existing dir, ignore it */ + +#if 0 + /* Disable these warnings until our user management has improved. Currently + many packages have to create users in post_install and chown the directories. + These all resulted in "false-positive" warnings. */ + if(lsbuf.st_mode != entrymode) { /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; @@ -252,6 +258,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, "filesystem: %u:%u package: %u:%u\n", filename, lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); } +#endif _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", filename); -- 2.2.2

2 2

[pacman-dev] Upgrading packages on case-insensitive filesystem
by David Macek 04 Feb '15

04 Feb '15

Hi all. The issue is that pacman refuses to replace a file during package upgrade if the case of the file's name has changed between versions. The error displayed is this: > error: failed to commit transaction (conflicting files) > example2: /path/to/file exists in filesystem > Errors occurred, no packages were upgraded. I'm using pacman on Windows/NTFS (ported as part of the MSYS2 project). I'm not completely sure if the problem is in upstream pacman, or only in the ported one, but it's happened enough times to prompt me to ask you people. I don't fully understand _alpm_db_find_fileconflicts, but it seems that it can't discover that the conflicting file will be removed with the old version of the package before an actual conflict can occur. Would this be considered as a bug in pacman? For the whole log (not much longer) and example PKGBUILDs, look here: https://gist.github.com/elieux/8faaf423601d7ef01d0f Note that NTFS while is not case-sensitive by default, it is case-preserving. -- David Macek

3 2

[pacman-dev] updpkgsums deletes more variables than it should
by David Macek 03 Feb '15

03 Feb '15

Hi all. It seems to me that updpkgsums destroys variables that it should not, specifically those with a suffix, e.g. "md5sums_extra". This is the regex in question: /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ I couldn't find anything that would suggest that such variable names are reserved for pacman. -- David Macek

4 4

[pacman-dev] [RFC] Correct directory permissions if the extracting package is the only owner
by Allan McRae 03 Feb '15

03 Feb '15

Adjusting permissions of directories in their install scripts results in warnings such as the following when the package update: warning: directory ownership differs on /var/lib/postfix/ filesystem: 73:0 package: 0:0 If the package being installed is the only owner of the directory, update the directory's permissions to those in the package file. This also allows directory permissions for a package to be changed directly in the PKGBUILD file rather that requiring adjustment in an install scriptlet. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This does require searching through all installed packages filelist to see if any other directories own this file, which does create a slowdown in these error cases. Once the ability to use symbolic names for owners is added, this code path will run only if there is an acutal error or in the rare case that directory permissions are genuinely being changed. Packages can currently avoid this being run by reverting their directory permission changes in pre_upgrade(). I'd like to push this to maint if people agree. These "false" warnings are causing too many issues. lib/libalpm/add.c | 61 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 82461ee..60db22f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -167,6 +167,20 @@ static int extract_db_file(alpm_handle_t *handle, struct archive *archive, return perform_extraction(handle, archive, entry, filename); } +static int other_directory_owners(alpm_handle_t *handle, const char *entryname, const char *pkgname) { + alpm_list_t *packages = alpm_db_get_pkgcache(handle->db_local); + alpm_list_t *i; + + for(i = packages; i ; i = alpm_list_next(i)) { + if(alpm_filelist_contains(alpm_pkg_get_files(i->data), entryname) && + strcmp(((alpm_pkg_t *)(i->data))->name, pkgname) != 0) { + return 1; + } + } + + return 0; +} + static int extract_single_file(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, alpm_pkg_t *newpkg, alpm_pkg_t *oldpkg) { @@ -232,25 +246,42 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* case 6: existing dir, ignore it */ if(lsbuf.st_mode != entrymode) { - /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; - _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, - entrymode & mask); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: directory permissions differ on %s\n" - "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, - entrymode & mask); + if(other_directory_owners(handle, entryname, newpkg->name) == 0) { + /* no other package owns this directory, "extract" with correct permissions */ + if(chmod(filename, entrymode) != 0) { + goto warn_permissions; + } + } else { +warn_permissions: + /* if filesystem perms are different than pkg perms, warn user */ + _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, + entrymode & mask); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: directory permissions differ on %s\n" + "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, + entrymode & mask); + + } } if((entryuid != lsbuf.st_uid) || (entrygid != lsbuf.st_gid)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("directory ownership differs on %s\n" - "filesystem: %u:%u package: %u:%u\n"), filename, - lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); - alpm_logaction(handle, ALPM_CALLER_PREFIX, - "warning: directory ownership differs on %s\n" - "filesystem: %u:%u package: %u:%u\n", filename, - lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); + if(other_directory_owners(handle, entryname, newpkg->name) == 0) { + /* no other package owns this directory, "extract" with correct owners */ + if(chown(filename, entryuid, entrygid) != 0) { + goto warn_owners; + } + } else { +warn_owners: + _alpm_log(handle, ALPM_LOG_WARNING, _("directory ownership differs on %s\n" + "filesystem: %u:%u package: %u:%u\n"), filename, + lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); + alpm_logaction(handle, ALPM_CALLER_PREFIX, + "warning: directory ownership differs on %s\n" + "filesystem: %u:%u package: %u:%u\n", filename, + lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid); + } } _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", -- 2.2.2

3 4

[pacman-dev] Release 4.2.1?
by Allan McRae 02 Feb '15

02 Feb '15

Hi all, A number of fixes have built up in maint. What do we need done for a 4.2.1 release? - I'd like comments on my directory permissions patch. - the release tarball embeds automate and aclocal versions so can only be built with the current version of automake. Not sure how to stop this... Anything else? A

1 0

[pacman-dev] [PATCH 1/3] makepkg: move package checking out of tidy_install
by Allan McRae 01 Feb '15

01 Feb '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 6 ++-- scripts/libmakepkg/.gitignore | 5 ++-- scripts/libmakepkg/lint.sh.in | 38 ++++++++++++++++++++++++++ scripts/libmakepkg/lint/build_references.sh.in | 36 ++++++++++++++++++++++++ scripts/libmakepkg/lint/missing_backup.sh.in | 36 ++++++++++++++++++++++++ scripts/libmakepkg/tidy.sh.in | 5 ---- scripts/libmakepkg/tidy/build_references.sh.in | 36 ------------------------ scripts/libmakepkg/tidy/missing_backup.sh.in | 36 ------------------------ scripts/libmakepkg/util/build_references.sh.in | 36 ++++++++++++++++++++++++ scripts/libmakepkg/util/missing_backup.sh.in | 36 ++++++++++++++++++++++++ scripts/makepkg.sh.in | 2 ++ 11 files changed, 191 insertions(+), 81 deletions(-) create mode 100644 scripts/libmakepkg/lint.sh.in create mode 100644 scripts/libmakepkg/lint/build_references.sh.in create mode 100644 scripts/libmakepkg/lint/missing_backup.sh.in delete mode 100644 scripts/libmakepkg/tidy/build_references.sh.in delete mode 100644 scripts/libmakepkg/tidy/missing_backup.sh.in create mode 100644 scripts/libmakepkg/util/build_references.sh.in create mode 100644 scripts/libmakepkg/util/missing_backup.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4745b6e..ab036c9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ LIBRARY = \ libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ + lint \ tidy \ util @@ -49,12 +50,13 @@ LIBMAKEPKG = \ libmakepkg/util/option.sh LIBMAKEPKG_IN = \ + libmakepkg/lint.sh \ + libmakepkg/lint/build_references.sh \ + libmakepkg/lint/missing_backup.sh \ libmakepkg/tidy.sh \ - libmakepkg/tidy/build_references.sh \ libmakepkg/tidy/docs.sh \ libmakepkg/tidy/emptydirs.sh \ libmakepkg/tidy/libtool.sh \ - libmakepkg/tidy/missing_backup.sh \ libmakepkg/tidy/optipng.sh \ libmakepkg/tidy/purge.sh \ libmakepkg/tidy/staticlibs.sh \ diff --git a/scripts/libmakepkg/.gitignore b/scripts/libmakepkg/.gitignore index 7072d8b..1064d02 100644 --- a/scripts/libmakepkg/.gitignore +++ b/scripts/libmakepkg/.gitignore @@ -1,9 +1,10 @@ +lint.sh +lint/build_references.sh +lint/missing_backup.sh tidy.sh -tidy/build_references.sh tidy/docs.sh tidy/emptydirs.sh tidy/libtool.sh -tidy/missing_backup.sh tidy/optipng.sh tidy/purge.sh tidy/staticlibs.sh diff --git a/scripts/libmakepkg/lint.sh.in b/scripts/libmakepkg/lint.sh.in new file mode 100644 index 0000000..2e3c7f6 --- /dev/null +++ b/scripts/libmakepkg/lint.sh.in @@ -0,0 +1,38 @@ +#!/bin/bash +# +# lint.sh - functions for checking for packaging errors +# +# Copyright (c) 2015 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[ -n "$LIBMAKEPKG_LINT_SH" ] && return +LIBMAKEPKG_LINT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +for lib in "$LIBRARY/lint/"*.sh; do + source "$lib" +done + +lint_package() { + cd_safe "$pkgdir" + msg "$(gettext "Checking for packaging issue...")" + + warn_missing_backup + warn_build_references +} diff --git a/scripts/libmakepkg/lint/build_references.sh.in b/scripts/libmakepkg/lint/build_references.sh.in new file mode 100644 index 0000000..9cf7b7a --- /dev/null +++ b/scripts/libmakepkg/lint/build_references.sh.in @@ -0,0 +1,36 @@ +#!/bin/bash +# +# build_references.sh - Warn about files containing references to build directories +# +# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[ -n "$LIBMAKEPKG_LINT_BUILD_REFERENCES_SH" ] && return +LIBMAKEPKG_LINT_BUILD_REFERENCES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +warn_build_references() { + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then + warning "$(gettext "Package contains reference to %s")" "\$srcdir" + fi + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then + warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + fi +} diff --git a/scripts/libmakepkg/lint/missing_backup.sh.in b/scripts/libmakepkg/lint/missing_backup.sh.in new file mode 100644 index 0000000..b54f2ab --- /dev/null +++ b/scripts/libmakepkg/lint/missing_backup.sh.in @@ -0,0 +1,36 @@ +#!/bin/bash +# +# missing_backup.sh - Warn about missing files in the backup array +# +# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[ -n "$LIBMAKEPKG_LINT_MISSING_BACKUP_SH" ] && return +LIBMAKEPKG_LINT_MISSING_BACKUP_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +warn_missing_backup() { + local file + for file in "${backup[@]}"; do + if [[ ! -f $file ]]; then + warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" + fi + done +} diff --git a/scripts/libmakepkg/tidy.sh.in b/scripts/libmakepkg/tidy.sh.in index 483afcb..b8c2965 100644 --- a/scripts/libmakepkg/tidy.sh.in +++ b/scripts/libmakepkg/tidy.sh.in @@ -47,11 +47,6 @@ tidy_install() { tidy_staticlibs tidy_emptydirs - # warn about packaging issues - # TODO: move these to another module - warn_missing_backup - warn_build_references - # options that reduce file sizes tidy_zipman tidy_strip diff --git a/scripts/libmakepkg/tidy/build_references.sh.in b/scripts/libmakepkg/tidy/build_references.sh.in deleted file mode 100644 index 2611869..0000000 --- a/scripts/libmakepkg/tidy/build_references.sh.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# -# build_references.sh - Warn about files containing references to build directories -# -# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[ -n "$LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH" ] && return -LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" - - -warn_build_references() { - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" - fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then - warning "$(gettext "Package contains reference to %s")" "\$pkgdir" - fi -} diff --git a/scripts/libmakepkg/tidy/missing_backup.sh.in b/scripts/libmakepkg/tidy/missing_backup.sh.in deleted file mode 100644 index fae04a2..0000000 --- a/scripts/libmakepkg/tidy/missing_backup.sh.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# -# missing_backup.sh - Warn about missing files in the backup array -# -# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[ -n "$LIBMAKEPKG_TIDY_MISSING_BACKUP_SH" ] && return -LIBMAKEPKG_TIDY_MISSING_BACKUP_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/message.sh" - - -warn_missing_backup() { - local file - for file in "${backup[@]}"; do - if [[ ! -f $file ]]; then - warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" - fi - done -} diff --git a/scripts/libmakepkg/util/build_references.sh.in b/scripts/libmakepkg/util/build_references.sh.in new file mode 100644 index 0000000..2611869 --- /dev/null +++ b/scripts/libmakepkg/util/build_references.sh.in @@ -0,0 +1,36 @@ +#!/bin/bash +# +# build_references.sh - Warn about files containing references to build directories +# +# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[ -n "$LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH" ] && return +LIBMAKEPKG_TIDY_BUILD_REFERENCES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +warn_build_references() { + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then + warning "$(gettext "Package contains reference to %s")" "\$srcdir" + fi + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then + warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + fi +} diff --git a/scripts/libmakepkg/util/missing_backup.sh.in b/scripts/libmakepkg/util/missing_backup.sh.in new file mode 100644 index 0000000..fae04a2 --- /dev/null +++ b/scripts/libmakepkg/util/missing_backup.sh.in @@ -0,0 +1,36 @@ +#!/bin/bash +# +# missing_backup.sh - Warn about missing files in the backup array +# +# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[ -n "$LIBMAKEPKG_TIDY_MISSING_BACKUP_SH" ] && return +LIBMAKEPKG_TIDY_MISSING_BACKUP_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + + +warn_missing_backup() { + local file + for file in "${backup[@]}"; do + if [[ ! -f $file ]]; then + warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" + fi + done +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c01e939..f47dc35 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2891,6 +2891,7 @@ run_split_packaging() { backup_package_variables run_package $pkgname tidy_install + lint_package create_package create_debug_package restore_package_variables @@ -3348,6 +3349,7 @@ if (( INFAKEROOT )); then run_package fi tidy_install + lint_package create_package create_debug_package else -- 2.2.2

1 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-118-g295a349
by allan＠archlinux.org 01 Feb '15

01 Feb '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 295a3491adc4af5c8634ac82777212ed9c664457 (commit) via 33466000d63e88e7a2ac7b1278a5966595fba707 (commit) via c8574baa7c35d10114918b9c1379e9d09fef790e (commit) via 7885931c969e781b732dfaea32e1fd166a3eb420 (commit) via 9917930ae1f02fdf85c1ca2a35ee039f1a17368f (commit) via bd2e95b00be2ce36767811d2da6d291c85f9a3f1 (commit) via 2e481019998b3e52c6777f7c0648e32e2348ae8c (commit) via 325be32acdace43cb830a18897f5e4d4416fda58 (commit) via bbac318d7a12500b1c3d0a57d0620d27edcd0422 (commit) via 54c630f6ecd74a44cc84f6804e918bda61310eef (commit) via 10fc538c70bf84f64881403f964ff4d6651268b3 (commit) via 841e531c519228b68a447a61d703d21c5ff6d37f (commit) via 3b22183a4d39b410ae7be0b95be6a1cb4704a50c (commit) via 8391716b8ab0bb884545bf0e76ab288412f5796e (commit) via aa12a773b8d6ed41878081a69d7a1d089129abef (commit) via 50de87e0e61e4cd5e80e58dcabc0f80b3e94d203 (commit) from 5167160c0cd6007c0ed77534f02f78e5ad04e719 (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 295a3491adc4af5c8634ac82777212ed9c664457 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 11:41:06 2015 +1000 makepkg: split package tidying into libmakepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 33466000d63e88e7a2ac7b1278a5966595fba707 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 10:57:00 2015 +1000 makepkg: split PKGBUILD/makepkg.conf option checking to libmakepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c8574baa7c35d10114918b9c1379e9d09fef790e Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 10:31:17 2015 +1000 makepkg: rename other_options to build_options Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7885931c969e781b732dfaea32e1fd166a3eb420 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 00:45:47 2015 +1000 makepkg: split message functions into libmakepkg This performs all the needed work for libmakepkg to be included in tarballs, installed into the correct place, and read into makepkg. Also change the install root for libmakepkg to an architecture independant location. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9917930ae1f02fdf85c1ca2a35ee039f1a17368f Author: Christian Hesse <mail(a)eworm.de> Date: Mon Jan 26 11:25:23 2015 +0100 add option to optimize PNG images with optipng This can decrease package size by optimizing PNG image size. Images are just stored with better compression and/or filter options. The actual image content is not altered. Additionally this can automatically fix broken PNG images which caused some trouble lately. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd2e95b00be2ce36767811d2da6d291c85f9a3f1 Author: Christian Hesse <mail(a)eworm.de> Date: Mon Jan 26 11:25:22 2015 +0100 remove globbing for upx and make UPXFLAGS an array variable Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e481019998b3e52c6777f7c0648e32e2348ae8c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 21 16:31:20 2015 +1000 Update copyright notices for 2015 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 325be32acdace43cb830a18897f5e4d4416fda58 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 21 16:29:29 2015 +1000 pmenv.py: Fix typo in copyright assignment Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bbac318d7a12500b1c3d0a57d0620d27edcd0422 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 21 16:28:24 2015 +1000 Add make rule to update copyright years Usage: make update-copyright OLD=2014 NEW=2015 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 54c630f6ecd74a44cc84f6804e918bda61310eef Merge: 5167160 10fc538 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 1 21:18:31 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: Makefile.am | 7 +- contrib/PKGBUILD.vim | 2 +- contrib/bacman.sh.in | 4 +- contrib/bash_completion.in | 8 +- contrib/pacdiff.sh.in | 4 +- contrib/pacscripts.sh.in | 2 +- contrib/zsh_completion.in | 2 +- doc/PKGBUILD.5.txt | 3 + doc/index.txt | 2 +- doc/makepkg.conf.5.txt | 10 +- etc/makepkg.conf.in | 5 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 6 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 61 ++++- scripts/libmakepkg/.gitignore | 13 + scripts/libmakepkg/tidy.sh.in | 60 +++++ .../tidy/build_references.sh.in} | 21 +- .../tidy/docs.sh.in} | 20 +- .../tidy/emptydirs.sh.in} | 20 +- .../tidy/libtool.sh.in} | 20 +- .../tidy/missing_backup.sh.in} | 21 +- scripts/libmakepkg/tidy/optipng.sh.in | 41 ++++ .../tidy/purge.sh.in} | 27 ++- .../tidy/staticlibs.sh.in} | 25 +- scripts/libmakepkg/tidy/strip.sh.in | 64 +++++ scripts/libmakepkg/tidy/upx.sh.in | 41 ++++ scripts/libmakepkg/tidy/zipman.sh.in | 58 +++++ .../util.sh.in} | 13 +- scripts/libmakepkg/util/message.sh | 49 ++++ scripts/libmakepkg/util/option.sh | 108 +++++++++ scripts/makepkg-template.pl.in | 4 +- scripts/makepkg-wrapper.sh.in | 2 +- scripts/makepkg.sh.in | 268 ++------------------- scripts/pacman-db-upgrade.sh.in | 4 +- scripts/pacman-key.sh.in | 4 +- scripts/pacman-optimize.sh.in | 4 +- scripts/po/POTFILES.in | 12 + scripts/repo-add.sh.in | 4 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/ini.c | 2 +- src/pacman/ini.h | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 +- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pacsort.c | 2 +- src/util/pactree.c | 2 +- src/util/testpkg.c | 2 +- src/util/vercmp.c | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/util.py | 2 +- test/util/pacsorttest.sh | 2 +- test/util/vercmptest.sh | 2 +- 124 files changed, 790 insertions(+), 405 deletions(-) create mode 100644 scripts/libmakepkg/.gitignore create mode 100644 scripts/libmakepkg/tidy.sh.in copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/build_references.sh.in} (51%) copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/docs.sh.in} (60%) copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/emptydirs.sh.in} (58%) copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/libtool.sh.in} (59%) copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/missing_backup.sh.in} (58%) create mode 100644 scripts/libmakepkg/tidy/optipng.sh.in copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/purge.sh.in} (52%) copy scripts/{makepkg-wrapper.sh.in => libmakepkg/tidy/staticlibs.sh.in} (53%) create mode 100644 scripts/libmakepkg/tidy/strip.sh.in create mode 100644 scripts/libmakepkg/tidy/upx.sh.in create mode 100644 scripts/libmakepkg/tidy/zipman.sh.in copy scripts/{makepkg-wrapper.sh.in => libmakepkg/util.sh.in} (71%) create mode 100644 scripts/libmakepkg/util/message.sh create mode 100644 scripts/libmakepkg/util/option.sh hooks/post-receive -- The official pacman repository

1 0