- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-30-g10fc538
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, maint has been updated via 10fc538c70bf84f64881403f964ff4d6651268b3 (commit) from 841e531c519228b68a447a61d703d21c5ff6d37f (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 10fc538c70bf84f64881403f964ff4d6651268b3 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 11:10:45 2015 +1000 makepkg: refix removing static libraries when shared uses absolute symlinks Commit 9e5e86aa was supposed to fix this. Instead I picked another [[ -f ]] statement in the same region and added the hardlink test to it instead, thus not fixing the bug. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-29-g841e531
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, maint has been updated via 841e531c519228b68a447a61d703d21c5ff6d37f (commit) via 3b22183a4d39b410ae7be0b95be6a1cb4704a50c (commit) via 8391716b8ab0bb884545bf0e76ab288412f5796e (commit) via aa12a773b8d6ed41878081a69d7a1d089129abef (commit) via 50de87e0e61e4cd5e80e58dcabc0f80b3e94d203 (commit) from c6263da168f7d612ea221e868fe42ad2ed706fa9 (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 841e531c519228b68a447a61d703d21c5ff6d37f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Jan 26 13:19:29 2015 -0500 trans_commit: restore pm_errno after updating log If the call to alpm_logaction failed it would overwrite pm_errno, leading to error messages unrelated to the actual reason the transaction failed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b22183a4d39b410ae7be0b95be6a1cb4704a50c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 24 15:56:23 2015 +1000 contrib: remove fakeroot option from PKGBUILD.vim Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8391716b8ab0bb884545bf0e76ab288412f5796e Author: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Date: Thu Jan 22 20:52:39 2015 +0100 makepkg: Set the working copy destination explicitly when cloning in extract_git This fixes the issue where if the user explicitly set the name of the cloned source to eg. foo.git, the directory name in $SRCDEST would be foo.git as expected, but the clone in $srcdir would be stripped of the .git suffix. Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa12a773b8d6ed41878081a69d7a1d089129abef Author: Jeffrey Tolar <tolar.jeffrey(a)gmail.com> Date: Wed Jan 21 19:45:15 2015 -0600 Add --noarchive to makepkg's zsh completion Signed-off-by: Jeffrey Tolar <tolar.jeffrey(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 50de87e0e61e4cd5e80e58dcabc0f80b3e94d203 Author: Jeffrey Tolar <tolar.jeffrey(a)gmail.com> Date: Wed Jan 21 19:45:14 2015 -0600 Remove --asroot from makepkg's completions Signed-off-by: Jeffrey Tolar <tolar.jeffrey(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 2 +- contrib/bash_completion.in | 8 ++++---- contrib/zsh_completion.in | 2 +- lib/libalpm/trans.c | 4 ++++ scripts/makepkg.sh.in | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Directory permission warnings
by Allan McRae 01 Feb '15

01 Feb '15

It seems people are getting really confused with the directory permission warnings that makepkg prints when upgrading a package that changes some permissions in its install script. There are a few ways to deal with this: 1) some packages have a reserved user:group ids - these should be chmoded in the PKGBUILD rather than the install scriptlet. 2) We somehow flag those directories/files that will change permissions. This will stop the directory permission warnings and -Qkk errors. 3) I opened a bug a couple of years ago: https://bugs.archlinux.org/task/30185 . Most (all?) of the directory permission warnings are for directories owned by an individual package. So we should just fix the permissions. This will still leave -Qkk errors. Any other thoughts on this? A

2 2

[pacman-dev] [PATCH] repo-add: improve delta file detection on removal
by Allan McRae 27 Jan '15

27 Jan '15

This allows use to remove a package with the name "foo.delta" from the repos. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4864d46..b2789a8 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -561,7 +561,7 @@ add() { } remove() { - if [[ $1 == "*-*-*_to_*-*-*.delta" ]]; then + if [[ $1 = *-*-*_to_*-*-*.delta ]]; then deltafile=$1 msg "$(gettext "Searching for delta '%s'...")" "$deltafile" if db_remove_delta "$deltafile"; then -- 2.2.2

1 0

[pacman-dev] [PATCH v2] repo-add: always create files database
by Allan McRae 27 Jan '15

27 Jan '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2 - fix updating repos scripts/repo-add.sh.in | 220 +++++++++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 98 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 21cb2aa..8601fbb 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -32,7 +32,6 @@ QUIET=0 DELTA=0 ONLYADDNEW=0 RMEXISTING=0 -WITHFILES=0 SIGN=0 KEY=0 VERIFY=0 @@ -61,7 +60,6 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -R, --remove remove old package file from disk after updating database\n")" - printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" printf -- "\n" @@ -115,7 +113,7 @@ format_entry() { find_pkgentry() { local pkgname=$1 local pkgentry - for pkgentry in "$tmpdir/tree/$pkgname"*; do + for pkgentry in "$tmpdir/repo/$pkgname"*; do name=${pkgentry##*/} if [[ ${name%-*-*} = $pkgname ]]; then echo $pkgentry @@ -145,6 +143,7 @@ db_write_delta() { return 1 fi deltas=$pkgentry/deltas + files_deltas=$(echo "$deltas" | sed 's/$.*$\/repo\//\1\/files\//') if [[ ! -f $deltas ]]; then echo -e "%DELTAS%" >"$deltas" fi @@ -161,6 +160,7 @@ db_write_delta() { fi msg2 "$(gettext "Adding 'deltas' entry : %s -> %s")" "$oldfile" "$newfile" echo "${deltafile##*/} $md5sum $csize $oldfile $newfile" >> "$deltas" + cp "$deltas" "$files_deltas" return 0 } # end db_write_delta @@ -177,16 +177,18 @@ db_remove_delta() { return 1 fi deltas=$pkgentry/deltas + files_deltas=$(echo "${deltas}" | sed 's/$.*$\/repo\//\1\/files\//') if [[ ! -f $deltas ]]; then return 1 fi if grep -q "$filename" "$deltas"; then - sed -i.backup "/$filename/d" "$deltas" && rm -f "$deltas.backup" msg2 "$(gettext "Removing existing entry '%s'...")" "$filename" + sed -i.backup "/$filename/d" "$deltas" && rm -f "$deltas.backup" + cp "$deltas" "$files_deltas" # empty deltas file contains only "%DELTAS%" if (( $(wc -l < "$deltas") == 1 )); then msg2 "$(gettext "Removing empty deltas file ...")" - rm "$deltas" + rm "$deltas" "$files_deltas" fi return 0 fi @@ -256,11 +258,11 @@ verify_repo_extension() { local repofile=$1 case $repofile in - *.@(db|files).tar.gz) TAR_OPT="z" ;; - *.@(db|files).tar.bz2) TAR_OPT="j" ;; - *.@(db|files).tar.xz) TAR_OPT="J" ;; - *.@(db|files).tar.Z) TAR_OPT="Z" ;; - *.@(db|files).tar) TAR_OPT="" ;; + *.db.tar.gz) TAR_OPT="z" ;; + *.db.tar.bz2) TAR_OPT="j" ;; + *.db.tar.xz) TAR_OPT="J" ;; + *.db.tar.Z) TAR_OPT="Z" ;; + *.db.tar) TAR_OPT="" ;; *) error "$(gettext "'%s' does not have a valid database archive extension.")" \ "$repofile" exit 1 ;; @@ -306,7 +308,7 @@ db_write_entry() { return 1 fi - if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then + if [[ -d $tmpdir/repo/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" if (( ONLYADDNEW )); then return 0; @@ -353,7 +355,7 @@ db_write_entry() { db_remove_entry "$pkgname" # create package directory - pushd "$tmpdir/tree" >/dev/null + pushd "$tmpdir/repo" >/dev/null mkdir "$pkgname-$pkgver" pushd "$pkgname-$pkgver" >/dev/null @@ -402,12 +404,11 @@ db_write_entry() { popd >/dev/null # create files file if wanted - if (( WITHFILES )); then - msg2 "$(gettext "Creating '%s' db entry...")" 'files' - local files_path="$tmpdir/tree/$pkgname-$pkgver/files" - echo "%FILES%" >"$files_path" - bsdtar --exclude='^.*' -tf "$pkgfile" >>"$files_path" - fi + msg2 "$(gettext "Creating '%s' db entry...")" 'files' + local files_dir="$tmpdir/files/$pkgname-$pkgver" + mkdir "${files_dir}" + echo "%FILES%" >"$files_dir/files" + bsdtar --exclude='^.*' -tf "$pkgfile" >>"$files_dir/files" # create a delta file if (( DELTA )); then @@ -423,6 +424,10 @@ db_write_entry() { fi fi + # sync files db with main db + rm -f $tmpdir/files/$pkgname-$pkgver/{desc,depends,deltas} + cp $tmpdir/repo/$pkgname-$pkgver/* $tmpdir/files/$pkgname-$pkgver/ + if (( RMEXISTING )); then msg2 "$(gettext "Removing old package file '%s'")" "$oldfilename" rm -f ${oldfile} ${oldfile}.sig @@ -437,14 +442,16 @@ db_remove_entry() { local pkgname=$1 local notfound=1 local pkgentry=$(find_pkgentry "$pkgname") + while [[ -n $pkgentry ]]; do notfound=0 + local files_pkgentry=$(echo "$pkgentry" | sed 's/$.*$\/repo\//\1\/files\//') if [[ -f $pkgentry/deltas ]]; then - mv "$pkgentry/deltas" "$tmpdir/tree/$pkgname.deltas" + mv "$pkgentry/deltas" "$tmpdir/repo/$pkgname.deltas" fi msg2 "$(gettext "Removing existing entry '%s'...")" \ "${pkgentry##*/}" - rm -rf "$pkgentry" + rm -rf "$pkgentry" "$files_pkgentry" pkgentry=$(find_pkgentry "$pkgname") done return $notfound @@ -465,57 +472,63 @@ elephant() { esac | openssl base64 -d | gzip -d } -check_repo_db() { - local repodir - - # ensure the path to the DB exists; $LOCKFILE is always an absolute path - repodir=${LOCKFILE%/*}/ - - if [[ ! -d $repodir ]]; then - error "$(gettext "%s does not exist or is not a directory.")" "$repodir" - exit 1 - fi - - # check lock file - if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then - CLEAN_LOCK=1 - else - error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE" - [[ -f $LOCKFILE ]] && error "$(gettext "Held by process %s")" "$(cat "$LOCKFILE")" - exit 1 - fi +validate_repo() { + local type=$1 repo=$2 - if [[ -f $REPO_DB_FILE ]]; then + if [[ -f $repo ]]; then # there are two situations we can have here- a DB with some entries, # or a DB with no contents at all. - if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then + if ! bsdtar -tqf "$repo" '*/desc' >/dev/null 2>&1; then # check empty case - if [[ -n $(bsdtar -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then + if [[ -n $(bsdtar -tqf "$repo" '*' 2>/dev/null) ]]; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 fi fi - verify_signature "$REPO_DB_FILE" - msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$tmpdir/tree" + verify_signature "$repo" + bsdtar -xf "$repo" -C "$tmpdir/$type" else case $cmd in repo-remove) - error "$(gettext "Repository file '%s' was not found.")" "$REPO_DB_FILE" + error "$(gettext "Repository file '%s' was not found.")" "$repo" exit 1 ;; repo-add) # check if the file can be created (write permission, directory existence, etc) - if ! touch "$REPO_DB_FILE"; then - error "$(gettext "Repository file '%s' could not be created.")" "$REPO_DB_FILE" + if ! touch "$repo"; then + error "$(gettext "Repository file '%s' could not be created.")" "$repo" exit 1 fi - rm -f "$REPO_DB_FILE" + rm -f "$repo" ;; esac fi } +check_repo_dbs() { + local repodir + + # ensure the path to the DB exists; $LOCKFILE is always an absolute path + repodir=${LOCKFILE%/*}/ + + if [[ ! -d $repodir ]]; then + error "$(gettext "%s does not exist or is not a directory.")" "$repodir" + exit 1 + fi + + # check lock file + if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; then + CLEAN_LOCK=1 + else + error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE" + [[ -f $LOCKFILE ]] && error "$(gettext "Held by process %s")" "$(cat "$LOCKFILE")" + exit 1 + fi + + validate_repo repo $REPO_DB_FILE + validate_repo files $FILES_DB_FILE +} + add() { if [[ ! -f $1 ]]; then error "$(gettext "File '%s' not found.")" "$1" @@ -563,7 +576,7 @@ remove() { msg "$(gettext "Searching for package '%s'...")" "$pkgname" if db_remove_entry "$pkgname"; then - rm -f "$tmpdir/tree/$pkgname.deltas" + rm -f "$tmpdir/repo/$pkgname.deltas" return 0 else error "$(gettext "Package matching '%s' not found.")" "$pkgname" @@ -571,40 +584,64 @@ remove() { fi } -rotate_db() { - filename=${REPO_DB_FILE##*/} - tempname=$dirname/.tmp.$filename +create_db() { + local type=$1 db=$2 - # hardlink or move the previous version of the database and signature to .old - # extension as a backup measure - if [[ -f $REPO_DB_FILE ]]; then - ln -f "$REPO_DB_FILE" "$REPO_DB_FILE.old" 2>/dev/null || \ - mv -f "$REPO_DB_FILE" "$REPO_DB_FILE.old" + dirname=${LOCKFILE%/*} + filename=${db##*/} + # this ensures we create it on the same filesystem, making moves atomic + tempname=$dirname/.tmp.$filename - if [[ -f $REPO_DB_FILE.sig ]]; then - ln -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" 2>/dev/null || \ - mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" + pushd "$tmpdir/$type" >/dev/null + if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then + bsdtar -c${TAR_OPT}f "$tempname" * else - rm -f "$REPO_DB_FILE.old.sig" + # we have no packages remaining? zip up some emptyness + warning "$(gettext "No packages remain, creating empty database.")" + bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null fi - fi + popd >/dev/null - # rotate the newly-created database and signature into place - mv "$tempname" "$REPO_DB_FILE" - if [[ -f $tempname.sig ]]; then - mv "$tempname.sig" "$REPO_DB_FILE.sig" - fi + create_signature "$tempname" +} - dblink=${REPO_DB_FILE%.tar*} - rm -f "$dblink" "$dblink.sig" - ln -s "$filename" "$dblink" 2>/dev/null || \ - ln "$filename" "$dblink" 2>/dev/null || \ - cp "$REPO_DB_FILE" "$dblink" - if [[ -f "$REPO_DB_FILE.sig" ]]; then - ln -s "$filename.sig" "$dblink.sig" 2>/dev/null || \ - ln "$filename.sig" "$dblink.sig" 2>/dev/null || \ - cp "$REPO_DB_FILE.sig" "$dblink.sig" - fi +rotate_dbs() { + for db in "$REPO_DB_FILE" "$FILES_DB_FILE"; do + + filename=${db##*/} + tempname=$dirname/.tmp.$filename + + # hardlink or move the previous version of the database and signature to .old + # extension as a backup measure + if [[ -f $db ]]; then + ln -f "$db" "$db.old" 2>/dev/null || \ + mv -f "$db" "$db.old" + + if [[ -f $db.sig ]]; then + ln -f "$db.sig" "$db.old.sig" 2>/dev/null || \ + mv -f "$db.sig" "$db.old.sig" + else + rm -f "$db.old.sig" + fi + fi + + # rotate the newly-created database and signature into place + mv "$tempname" "$db" + if [[ -f $tempname.sig ]]; then + mv "$tempname.sig" "$db.sig" + fi + + dblink=${db%.tar*} + rm -f "$dblink" "$dblink.sig" + ln -s "$filename" "$dblink" 2>/dev/null || \ + ln "$filename" "$dblink" 2>/dev/null || \ + cp "$db" "$dblink" + if [[ -f "$db.sig" ]]; then + ln -s "$filename.sig" "$dblink.sig" 2>/dev/null || \ + ln "$filename.sig" "$dblink.sig" 2>/dev/null || \ + cp "$db.sig" "$dblink.sig" + fi + done } trap_exit() { @@ -657,7 +694,7 @@ fi tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) -mkdir "$tmpdir/tree" +mkdir "$tmpdir/repo" "$tmpdir/files" trap 'clean_up' EXIT for signal in TERM HUP QUIT; do @@ -675,7 +712,6 @@ while (( $# )); do -d|--delta) DELTA=1;; -n|--new) ONLYADDNEW=1;; -R|--remove) RMEXISTING=1;; - -f|--files) WITHFILES=1;; --nocolor) USE_COLOR='n';; -s|--sign) SIGN=1 @@ -703,6 +739,8 @@ if [[ -z $REPO_DB_FILE ]]; then exit 1 fi +FILES_DB_FILE=${REPO_DB_FILE%db.tar*}files.tar${REPO_DB_FILE##*.db.tar} + if [[ $REPO_DB_FILE == /* ]]; then LOCKFILE=$REPO_DB_FILE.lck else @@ -710,7 +748,7 @@ else fi verify_repo_extension "$REPO_DB_FILE" >/dev/null -check_repo_db +check_repo_dbs if (( SIGN || KEY || VERIFY )); then check_gpg @@ -729,24 +767,10 @@ if (( success )); then TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE") # $LOCKFILE is already guaranteed to be absolute so this is safe - dirname=${LOCKFILE%/*} - filename=${REPO_DB_FILE##*/} - # this ensures we create it on the same filesystem, making moves atomic - tempname=$dirname/.tmp.$filename - - pushd "$tmpdir/tree" >/dev/null - if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then - bsdtar -c${TAR_OPT}f "$tempname" * - else - # we have no packages remaining? zip up some emptyness - warning "$(gettext "No packages remain, creating empty database.")" - bsdtar -c${TAR_OPT}f "$tempname" -T /dev/null - fi - popd >/dev/null - - create_signature "$tempname" - rotate_db + create_db repo $REPO_DB_FILE + create_db files $FILES_DB_FILE + rotate_dbs else msg "$(gettext "No packages modified, nothing to do.")" exit 1 -- 2.2.2

1 1

[pacman-dev] Splitting makepkg and copyright years.
by Allan McRae 27 Jan '15

27 Jan '15

I would like some help with two things: 1) have people got opinions on what I have posted so far with the splitting up of makepkg. I have decreased the size of the makepkg script by 6% so far! So much more to do... I think it has a few real advantages: a) testing can be done on individual sections more easily b) it is less daunting to patch a section rather than a ~4000 line script c) I think we can have drop in modules (e.g. something like the UPX compression or optipng could be added by just dropping a file into the /usr/share/makepkg/tidy folder). 2) copyright years. So far I just use git blame and take the year range for a piece of code. I think this works well on the bigger pieces of code, but smaller things have had minor changes and the year range is quite minimal. For example, I know the code to remove libtool files was around longer than "2013-2015". Is there a solution to this? Do these files even need copyrights? I note that non of the files included by m4 in scripts/library have any copyright (which makes sense as they are being included into the final script file). We also have the global copyright notice in the source root. Cheers, Allan

1 0