January 2015 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Set the working copy destination explicitly when cloning in extract_git
by Lukáš Jirkovský 23 Jan '15

23 Jan '15

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> --- 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 00beb76..028cc60 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -605,7 +605,7 @@ extract_git() { exit 1 fi cd_safe "$srcdir" - elif ! git clone "$dir"; then + elif ! git clone "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.2.2

2 1

[pacman-dev] [PATCH 1/2] Remove --asroot from makepkg's completions
by Jeffrey Tolar 22 Jan '15

22 Jan '15

Signed-off-by: Jeffrey Tolar <tolar.jeffrey(a)gmail.com> --- contrib/bash_completion.in | 8 ++++---- contrib/zsh_completion.in | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 15e1dac..224b8f9 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -75,10 +75,10 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract - noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg - skippgpcheck source syncdeps verifysource version' + opts=('allsource asdeps check clean config force geninteg help holdver ignorearch install + key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare + noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck + source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f2ff7c8..0905800 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -586,7 +586,6 @@ _makepkg_longopts=( '--syncdeps[Install missing dependencies with pacman]' '--source[Generate a source-only tarball without downloading sources]' '--allsource[Generate a source-only tarball including downloaded source]' - '--asroot[Allow makepkg to run as root user]' '--check[Run check() function in the PKGBUILD]' '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' -- 2.2.2

2 2

[pacman-dev] [PATCH 1/3] Add make rule to update copyright years
by Allan McRae 21 Jan '15

21 Jan '15

Usage: make update-copyright OLD=2014 NEW=2015 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d2a11eb..6c97b29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,11 @@ update-po: $(MAKE) -C scripts/po update-po $(MAKE) -C src/pacman/po update-po -.PHONY: update-po +update-copyright: + for file in $(shell sh -c 'git grep -l "Copyright .* Pacman Development" | grep -v "\.po"'); do \ + sed -i -e "/Copyright (/s/-$(OLD)/-$(NEW)/" -e "/Copyright (/s/ $(OLD)/ $(NEW)/" "$$file"; \ + done + +.PHONY: update-po update-copyright # vim:set noet: -- 2.2.2

1 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-102-g5167160
by allan＠archlinux.org 21 Jan '15

21 Jan '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 5167160c0cd6007c0ed77534f02f78e5ad04e719 (commit) via ba0d225d93d4254e08e48b97ca6b55861cc8e54f (commit) via 926280cfc7da5aa6d8a4e7dc60f9831176758e7e (commit) via a82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 (commit) via 4ba0561fe722aa5e68b8e4d68eb368cba5a9a0cb (commit) via f917a4a55a30c7e4e38e5efc8401519677794617 (commit) via 63660afbc78102c704aba093a735bd82fabcfdcb (commit) via 3b20561748ff6b36ae99ff4fc1829035240cba33 (commit) via ea96b567221e1426c6f6ab2b31891d1301fd00f4 (commit) via e7d8e2b5acfbe9169c809e1e8fd31d22b7c365c5 (commit) via 4ccafc484d43710d66d2622210cf33461b1b1c49 (commit) via 09cfe2a4c061a4b2c08d93c1d99f60c8879f5cf2 (commit) via 9eb07a81fa359f323bfa540f8fbefa4c11e2260c (commit) via 7ed0d60a0db26e8ac2224196b3a629676a0b9c21 (commit) via 95121cc4f1b63fccaa27dfb567e5a2dfa628671e (commit) via 2aa85c3bfdb17a11213495558c493bc68408efe7 (commit) via 92febc847cf60b12706c64e4786dae909a9396ac (commit) via c6263da168f7d612ea221e868fe42ad2ed706fa9 (commit) via 21281e9b69fa061bb64b6fb4e25f04bd0e530554 (commit) from 018fa2b48c95492312ff3830b368a1f6036d6cf6 (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 5167160c0cd6007c0ed77534f02f78e5ad04e719 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 02:26:14 2014 -0400 extract_single_file: consolidate extraction logic Also adds checks that the filename does not exceed PATH_MAX. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit ba0d225d93d4254e08e48b97ca6b55861cc8e54f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 02:06:49 2014 -0400 extract_single_file: use .pacnew for check files Prevents the need to rename the file if we end up keeping it and ensures that pacnew files always reflect the most recent version by overwriting stale copies. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 926280cfc7da5aa6d8a4e7dc60f9831176758e7e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 01:57:44 2014 -0400 remove support for .pacorig files Leave user files in place and save new config files with a .pacnew extension. This reduces the complexity of file extraction and respects the principle that pacman shouldn't modify files it didn't create. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit a82a5cf3f71e38c54a5ac1b5eaf3c83374d0e515 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 01:45:40 2014 -0400 extract_single_file: use full path in messages If an error occurs the actual path being extracted is more useful than the original path from the package file list. The original path is still used for checks that use it directly. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 4ba0561fe722aa5e68b8e4d68eb368cba5a9a0cb Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 01:35:31 2014 -0400 extract_single_file: factor out db file extraction alpm's database files (.INSTALL, .MTREE, etc.) should be extracted no matter what; skip mtree/needbackup/noextract/noupgrade checks for them. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit f917a4a55a30c7e4e38e5efc8401519677794617 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 01:26:33 2014 -0400 extract_single_file: reduce indentation Puts all of the conflict cases at the same level. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 63660afbc78102c704aba093a735bd82fabcfdcb Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Oct 1 01:14:57 2014 -0400 extract_single_file: consolidate needbackup checks We need to know if a file needs to be backed up for all extracted files. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 3b20561748ff6b36ae99ff4fc1829035240cba33 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:40:40 2014 -0400 ini.c: move error output into conf.c Move the remaining output into conf.c by notifying the callback of read errors. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit ea96b567221e1426c6f6ab2b31891d1301fd00f4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:34:27 2014 -0400 ini.c: remove useless key check key points to a statically allocated string so it can't be NULL and empty keys are rejected by the callback. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit e7d8e2b5acfbe9169c809e1e8fd31d22b7c365c5 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:34:11 2014 -0400 ini.c: remove empty section name restriction alpm will reject empty database names already. Reduces error handling in the ini parser. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 4ccafc484d43710d66d2622210cf33461b1b1c49 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:32:58 2014 -0400 ini.c: remove unnecessary helper function Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 09cfe2a4c061a4b2c08d93c1d99f60c8879f5cf2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:31:33 2014 -0400 ini.c: move Include parsing to conf.c Reduces the number of errors the ini parser must handle to make it more suitable for sharing with the backend. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 9eb07a81fa359f323bfa540f8fbefa4c11e2260c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:21:21 2014 -0400 ini.c: remove final callback call Storing repo information removes the need for the final callback. This allows the call signature to be re-purposed for indicating read errors. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 7ed0d60a0db26e8ac2224196b3a629676a0b9c21 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 12:19:03 2014 -0400 conf.c: parse config in a single pass Fixes FS#28255 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 95121cc4f1b63fccaa27dfb567e5a2dfa628671e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 11:53:47 2014 -0400 conf.c: use masks for siglevel inheritance This will allow pacman to parse its config file in a single pass and removes the need for the *_SET siglevels in alpm that were only required for pacman's siglevel inheritance. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 2aa85c3bfdb17a11213495558c493bc68408efe7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Apr 26 11:24:13 2014 -0400 conf.c: store repo settings in dedicated struct Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 92febc847cf60b12706c64e4786dae909a9396ac Merge: 018fa2b c6263da Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 21 14:27:25 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: README | 7 + contrib/README | 2 +- contrib/pacdiff.sh.in | 4 +- doc/pacman.8.txt | 5 +- lib/libalpm/add.c | 413 +++++++++++++++------------------------- lib/libalpm/alpm.h | 18 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/util.c | 2 +- src/pacman/callback.c | 16 -- src/pacman/conf.c | 303 ++++++++++++++++------------- src/pacman/conf.h | 16 ++ src/pacman/ini.c | 147 +++----------- test/pacman/README | 1 - test/pacman/pmrule.py | 3 - test/pacman/tests/upgrade015.py | 1 - test/pacman/tests/upgrade016.py | 5 +- test/pacman/tests/upgrade027.py | 1 - test/pacman/tests/upgrade028.py | 1 - test/pacman/tests/upgrade029.py | 1 - 20 files changed, 390 insertions(+), 560 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-24-gc6263da
by allan＠archlinux.org 21 Jan '15

21 Jan '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 c6263da168f7d612ea221e868fe42ad2ed706fa9 (commit) via 21281e9b69fa061bb64b6fb4e25f04bd0e530554 (commit) from a31426d3ea79f7b22d5000f2bfecb52f95246444 (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 c6263da168f7d612ea221e868fe42ad2ed706fa9 Author: Daniel Micay <danielmicay(a)gmail.com> Date: Wed Jan 14 07:27:41 2015 -0500 fix geometric growth in _alpm_greedy_grow It was allocating the required size rather than the calculated new size, resulting in pathological incremental reallocations. Signed-off-by: Daniel Micay <danielmicay(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 21281e9b69fa061bb64b6fb4e25f04bd0e530554 Author: Daniel Micay <danielmicay(a)gmail.com> Date: Wed Jan 14 07:21:29 2015 -0500 be_local: fix _alpm_greedy_grow usage The files_size variable contains the current capacity (in bytes) and should not be used to calculate the next length increment. It only works because _alpm_greedy_grow currently results in incremental growth. Signed-off-by: Daniel Micay <danielmicay(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 2 +- lib/libalpm/util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Changed copyright to 2006 - 2015 in version info
by Robin de Rooij 21 Jan '15

21 Jan '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 - From 749dde01efdde4c69491c36c1244a112de54ce52 Mon Sep 17 00:00:00 2001 From: Robin de Rooij <rderooij685(a)famousgoglemailhoster.com> Date: Fri, 16 Jan 2015 22:36:00 +0100 Subject: [PATCH] Changed copyright to 2006 - 2015 in version info The copyright notice still displayed: 2006 - 2014. I changed the version method to 2006 - 2015 Signed-off-by: Robin de Rooij <rderooij685<at>famousgooglemailhoster.com> (Everyone knows the name of Google's email service, replace famousgoglemailhoster with Google's real email service - --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 792c994..28df482 100644 - --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -224,7 +224,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2014 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2015 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" - -- 2.2.2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJUvp3rAAoJELLn5Yq1geB/M5kP/10w686cpq5gohnQe7RGZEHa biQshe0CQbKVhpsie0DRX8ybwDDpFkarymo/g8BBVRbei1aAN7k+3gH+g1kaLUue nUVKesO95/DMBbRrGnwMBUOkg/oG0GWZ5KlMVv4bBgJQou5vMhlPP9sFbLmPH5YX FQKqUm6u3oods0OPHIKbdhInWSZBrJM7tnMjVTN9C1BtKCFqJ4dlvqctGzqarXr5 p+aCJNNtukUTCM3xz5wYaAf6Aeosfi9GM+gOoJyfHyz00WTKhFnpQBWgYGot0Frm poMfxjpt4G62MthHBOWzNdIzgLq3AtLVhSxMrrbunAxdzfk7sWypTx9j8+w6eKcl kWqfZTrsz8otV3DG8IBkdisHGGvnWbjtDbT/XJ7gq9zqFrAmnNxxBwnDhHV0cItN hp9ZScv5g16E9JQKTW/uhYlb09wtbwkO13SN1C1gmeyKqYYWDFQg3qUT+54LDND3 6AF6TNmQo/uLV5+xsioiPyDgoFdpbYnO1zDQzUv57URYm74SVKbakDb0JgY11Vlb bcDKNKXE5vJBxO9GkbMHueJE3zeLORkb8blo8x69AIR5B81z3Oh15sO6FecDSDM+ k6kd44dGH11pxbu13woLEDk2SmGSt8bdfd73kKYNb4zEveWicdNljrVNAoONGAW7 Kpr7vY/4AVGiKCt0rO2J =yAYP -----END PGP SIGNATURE-----

5 7

[pacman-dev] [PATCH] fix geometric growth in _alpm_greedy_grow
by Daniel Micay 12 Jan '15

12 Jan '15

It was allocating the required size rather than the calculated new size, resulting in pathological incremental reallocations. Signed-off-by: Daniel Micay <danielmicay(a)gmail.com> --- lib/libalpm/be_local.c | 2 +- lib/libalpm/util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2454cdc..300660b 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -789,7 +789,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) while(safe_fgets(line, sizeof(line), fp) && (len = _alpm_strip_newline(line, 0))) { if(!_alpm_greedy_grow((void **)&files, &files_size, - (files_size ? files_size + sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { + (files_count ? (files_count + 1) * sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { goto error; } /* since we know the length of the file string already, diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 22408d7..ffd3c73 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1328,7 +1328,7 @@ void *_alpm_greedy_grow(void **data, size_t *current, const size_t required) return NULL; } - return _alpm_realloc(data, current, required); + return _alpm_realloc(data, current, newsize); } void _alpm_alloc_fail(size_t size) -- 2.2.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-83-g018fa2b
by allan＠archlinux.org 12 Jan '15

12 Jan '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 018fa2b48c95492312ff3830b368a1f6036d6cf6 (commit) via a31426d3ea79f7b22d5000f2bfecb52f95246444 (commit) from 0108884952415b4e7c5fe93a1422f441f4bea0aa (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 018fa2b48c95492312ff3830b368a1f6036d6cf6 Merge: 0108884 a31426d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jan 12 15:23:30 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-22-ga31426d
by allan＠archlinux.org 12 Jan '15

12 Jan '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 a31426d3ea79f7b22d5000f2bfecb52f95246444 (commit) from e8d757b6ba9ca545266c43279cfef1a48971c013 (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 a31426d3ea79f7b22d5000f2bfecb52f95246444 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jan 12 12:47:38 2015 +1000 makepkg: clear destination array in array_build If an already used array is passed array_build, some entries from the old array could be carried over if the old array was longer than the new one. Clear the destination array before adding elements to it to prevent this issue. Fixes: https://bugs.archlinux.org/task/43387 Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: clear destination array in array_build
by Allan McRae 12 Jan '15

12 Jan '15

If an already used array is passed array_build, some entries from the old array could be carried over if the old array was longer than the new one. Clear the destination array before adding elements to it to prevent this issue. Fixes: https://bugs.archlinux.org/task/43387 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1720e64..00beb76 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2467,6 +2467,9 @@ array_build() { # Build an array of the indicies of the source array. eval "keys=(\"\${!$2[@]}\")" + # Clear the destination array + eval "$dest=()" + # Read values indirectly via their index. This approach gives us support # for associative arrays, sparse arrays, and empty strings as elements. for i in "${keys[@]}"; do -- 2.2.1

1 0