September 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-428-g31b9862
by allan＠archlinux.org 25 Sep '14

25 Sep '14

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 31b98626003fec9e33483152552906a601c072d4 (commit) via 24e0bd215c3afc5b0a80f6e292561b237acb19e0 (commit) via c792262b137a5f2daddac22f82e7d8d98d0d7d31 (commit) via 9c066dff439ba453f4c362e1875b794cf3f362ed (commit) via 85c055da73022838c13acae0554e6efa75dacf83 (commit) via e1f6fe652d8796ed259d248b9aa82d0ed8ec9637 (commit) via eab8cf6241119b2c1c44d5ec68ea53c7e4224a3b (commit) via f0c351b3fa9ca56ae180b2b10fc2f0f41cde0ac7 (commit) via d02efd2f204cfdd99d6e161b1ce9d4478b08b8e2 (commit) via 1660ed3cf9069f84d96670b5443a9f1542b7865d (commit) via 7e9ad22ac21329adcf470bb00f2d0a386376fddf (commit) via d3f5ab0e706071b8724575eb356b865d55da8df6 (commit) via 793b9c3b42c1af9b18a3cc8d08dd058f9cb96d93 (commit) via e4773b1b82a737a74434d778c1043367a480205a (commit) via 8bf2c753f57bfb6f8cd0271613000af64ce58020 (commit) from d9cf14ff1d69ac8834b84015c7971f55ce77645b (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 31b98626003fec9e33483152552906a601c072d4 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Thu Aug 14 04:21:42 2014 +0200 pacman.c: Add -gg, -ii, and -yy to help summary The sync help summaries was missing the information about: * -gg: View all groups and members * -ii: View extended information * -yy: Force refresh even if DBs are up to date Fixes FS#41388. Original-work-by: Earnestly <zibeon(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24e0bd215c3afc5b0a80f6e292561b237acb19e0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 6 16:53:16 2014 -0400 pacman: set SA_RESTART for signal handler Calling a signal handler interrupts some functions, most notably read() and therefore fgets(). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit c792262b137a5f2daddac22f82e7d8d98d0d7d31 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 6 16:36:00 2014 -0400 wrap fgets to retry on EINTR The read() underlying fgets() can be interrupted by a signal handler causing fgets() to return NULL. Before we started handling SIGWINCH, the odds of interrupting a read were low and typically resulted in termination anyway. Replace all fgets calls with a wrapper that retries in EINTR. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> commit 9c066dff439ba453f4c362e1875b794cf3f362ed Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 9 18:08:13 2014 -0400 makepkg: disallow values of 'arch' which might be problematic We rely on values in the arch array to be valid as part of variable names, so extend the arch lint check to catch this. This also cleans up lint_arch to restrict the use of "lint" only to the package-specific architecture checks. It previously had an odd declaration with a conditional expansion that would never be true. commit 85c055da73022838c13acae0554e6efa75dacf83 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 9 17:26:24 2014 -0400 makepkg: let --source imply --ignorearch Since source package creation is architecture independent, we should ignore architecture-dependent behaviors such as the lint check which will halt execution when the host machine is not a supported arch. https://github.com/falconindy/pkgbuild-introspection/issues/15 commit e1f6fe652d8796ed259d248b9aa82d0ed8ec9637 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 7 14:56:52 2014 -0400 makepkg: use correct terminology unix has no "folders". commit eab8cf6241119b2c1c44d5ec68ea53c7e4224a3b Author: Wolfgang Bumiller <wry.git(a)bumiller.com> Date: Sun Aug 10 19:39:12 2014 +1000 replace --reference on chmod/chown commands Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f0c351b3fa9ca56ae180b2b10fc2f0f41cde0ac7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Sep 18 02:19:45 2014 -0400 alpm.h: remove outdated pkg_get_backup doxygen alpm_pkg_get_backup hasn't returned strings since 54ef162a1a9e27e362732d873f0739bc0a2cf1bf in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d02efd2f204cfdd99d6e161b1ce9d4478b08b8e2 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:51:16 2013 +1000 Check the version of the local database during validation When we check the database version directly, there is no longer a need to scan for depends files. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1660ed3cf9069f84d96670b5443a9f1542b7865d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:48:38 2013 +1000 Add version file to empty local database If a user manually creates the local database directory, or has an empty local database for some other reason, we silently add a version file Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e9ad22ac21329adcf470bb00f2d0a386376fddf Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jul 16 21:34:54 2013 +1000 Add version file when creating local database directory The version of the local pacman database is stored in its root in the file ALPM_DB_VERSION. The version is starting at 9, corresponding to the next libalpm library version. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d3f5ab0e706071b8724575eb356b865d55da8df6 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 22 21:12:04 2014 +1000 Create local database directory if it is missing This means that a missing local database becomes an error (as it should be immediately created). Note this only creates the "local" directory and not its parent, which is checked for during locking. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 793b9c3b42c1af9b18a3cc8d08dd058f9cb96d93 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 20:46:08 2014 +0000 Extend database upgrade script to handle alpm db version 9 Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e4773b1b82a737a74434d778c1043367a480205a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 20:46:07 2014 +0000 pacman-db-upgrade: use pacman-style options * convert dbpath from argument to option * add --config and --root options * read dbpath and root from config file * if root is set but not dbpath, dbpath is set relative to root Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8bf2c753f57bfb6f8cd0271613000af64ce58020 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Aug 20 21:09:52 2014 +0000 fix improper FREELIST calls * conflicts need to be freed with alpm_conflict_free * sync dbs need to be unregistered and are handled by alpm_release Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 10 +++ lib/libalpm/alpm.h | 3 - lib/libalpm/be_local.c | 135 +++++++++++++++++++++----------- lib/libalpm/conflict.c | 8 +- lib/libalpm/handle.c | 1 - lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 3 +- scripts/Makefile.am | 3 + scripts/makepkg.sh.in | 30 +++++-- scripts/pacman-db-upgrade.sh.in | 169 ++++++++++++++++++++++++++++++++-------- scripts/pacman-optimize.sh.in | 4 +- src/common/util-common.c | 25 ++++++ src/common/util-common.h | 3 + src/pacman/ini.c | 2 +- src/pacman/pacman.c | 12 +-- src/pacman/util.c | 8 +- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 + 18 files changed, 318 insertions(+), 105 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: do not strip bzr+ from bzr+ssh urls
by Andrew Gregory 23 Sep '14

23 Sep '14

bzr does not recognize bare ssh:// urls. Fixes FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 913c901..f58afda 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -446,7 +446,9 @@ download_bzr() { local netfile=$1 local url=$(get_url "$netfile") - url=${url##*bzr+} + if [[ $url != bzr+ssh* ]]; then + url=${url##*bzr+} + fi url=${url%%#*} local repo=$(get_filename "$netfile") -- 2.1.0

1 1

[pacman-dev] [PATCH v2 0/4] Handle .alpm_db_version file
by Allan McRae 23 Sep '14

23 Sep '14

This is v2 of a patchset submitted long ago. It has been rebased and had its memory leaks fixed. With this patchset, pacman will create a local database directory if it is missing (but not the root of the database - i.e. /var/lib/pacman/ still needs to be present). When creating the database or finding an empty local database it will add the .alpm_db_version file and add the version. For existing pacman databases this file is created by the pacman-db-upgrade script. Finally the version of the local database is checked during db validation. Allan McRae (4): Create local database directory if it is missing Add version file when creating local database directory Add version file to empty local database Check the version of the local database during validation lib/libalpm/be_local.c | 119 +++++++++++++++++++++++++++++++++---------------- test/pacman/pmdb.py | 2 + test/pacman/pmtest.py | 3 ++ 3 files changed, 85 insertions(+), 39 deletions(-) -- 2.1.0

3 9

[pacman-dev] [PATCH] table_display: only check width when non-zero
by Andrew Gregory 18 Sep '14

18 Sep '14

A width of 0 indicates that either pacman is not attached to a tty or the user does not want line wrapping. Either way pacman should not fall back to the basic display. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index e91d654..e1880ec 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -640,7 +640,7 @@ static int table_display(const alpm_list_t *header, totalwidth = table_calc_widths(first, rows, padding, totalcols, &widths, &has_data); /* return -1 if terminal is not wide enough */ - if(totalwidth > cols) { + if(cols && totalwidth > cols) { pm_printf(ALPM_LOG_WARNING, _("insufficient columns available for table display\n")); ret = -1; -- 2.1.0

1 0

[pacman-dev] [PATCH] alpm.h: remove outdated pkg_get_backup doxygen
by Andrew Gregory 18 Sep '14

18 Sep '14

alpm_pkg_get_backup hasn't returned strings since 54ef162a1a9e27e362732d873f0739bc0a2cf1bf in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/alpm.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 29a2dda..751fa63 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1240,9 +1240,6 @@ alpm_list_t *alpm_pkg_get_replaces(alpm_pkg_t *pkg); alpm_filelist_t *alpm_pkg_get_files(alpm_pkg_t *pkg); /** Returns the list of files backed up when installing pkg. - * The elements of the returned list have the form - * "<filename>\t<md5sum>", where the given md5sum is that of - * the file as provided by the package. * @param pkg a pointer to package * @return a reference to a list of alpm_backup_t objects */ -- 2.1.0

1 0

[pacman-dev] [RFC] [IDEA] Possibility to ignore specific dependencies
by Florian Pritz 17 Sep '14

17 Sep '14

Hi, I'm thinking about having perl packages depend on a more specific perl version (like a provided perl-5.20 instead of simply perl), but that brings the same issues we currently have with kernel modules. Everything that's not in the repos will prevent a clean upgrade because it depends on the old package. One idea to get around this would be to add an option like --ignore-dependency perl-5.18 which means that something like -Syu (or -S, -U and similar) will error when there are dependencies for perl-5.20, but will not error when there are packages installed that depend on perl-5.18. Side note: Not yet sure how the final syntax will look like, that - as a separator seems like a bad choice because it's ambiguous (where does the pkgname end if there doesn't have to be a pkgver?) This is a more controlled form of -d if you will. Optionally I'd also want this to work like -dd if used as "--ignore-dependency perl" which means that all perl dependencies will be ignored, but dependencies on other packages will not. Obviously this will not only be useful for perl, but also for linux modules, though I don't have any of those installed from AUR so I don't know if people for other workarounds. This is only an idea for now, depending on feedback I'd look into implementing it.

5 19

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-413-gd9cf14f
by allan＠archlinux.org 16 Sep '14

16 Sep '14

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 d9cf14ff1d69ac8834b84015c7971f55ce77645b (commit) via ee207d7c7b34ca54ad9bf65952eb1d567ef41ceb (commit) via 95e1a1ef8223dea2b8eb41e60428858b1c39f47f (commit) via 38b6de937cdbf581d13b404b50183d1b7e457413 (commit) via 8122fae51abf382838d9e2fd58d51cd42d475579 (commit) via b00269d9c86c7992951e6dcf2591f709ccc71dc1 (commit) via 879e4665c4ed76376c9e2d9f2c597bb9cdabb79a (commit) from 3e19cd366add23390ce4d0c9531b2c07e009a217 (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 d9cf14ff1d69ac8834b84015c7971f55ce77645b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 7 12:37:34 2014 -0400 updpkgsums: use a throwaway build dir This prevents updpkgsums from potentially dirtying an otherwise pristine directory (likely $PWD) when makepkg creates the srclinks. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ee207d7c7b34ca54ad9bf65952eb1d567ef41ceb Author: lolilolicon <lolilolicon(a)gmail.com> Date: Mon Sep 8 00:57:31 2014 +0800 makepkg: do not eval dlcmd This eval enables the following in a PKGBUILD to "just work": source=('$pkgname-$pkgver.tar.gz'::'https://host/$pkgver.tar.gz') This has at least two problems: - It violated the principle of least surprise. - It could be a security issue since URLs are arbitrary input. Instead, expand the dlagent command line into an array, replace the %o, %u place holders, and run the resultant command line as is. Embedded spaces in the DLAGENTS entry can be escaped with a backslash. Fixes FS#41682 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 95e1a1ef8223dea2b8eb41e60428858b1c39f47f Author: William Giokas <1007380(a)gmail.com> Date: Mon Apr 28 14:16:04 2014 -0500 makepkg: Allow using sources with :: in them Git has the ability to use helper applications for interfacing with hg, and from what we had before, the following url:: foo::git+hg::http://foo.bar/foobar would get converted to something along the lines of: filename: foo URL: http://foo.bar/foobar and the 'git+hg' part would essentially be ignored when it's getting set up in the 'get_protocol' and 'get_downloadclient' functions. With this patch it is possible to have a source link with '::' in it, however it is not possible to have a filename with '::', which is the current behavior. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 38b6de937cdbf581d13b404b50183d1b7e457413 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jun 7 15:35:25 2014 -0400 paccache: read default cachedir from pacman.conf Implements FS#40738. commit 8122fae51abf382838d9e2fd58d51cd42d475579 Author: Maxim Andersson <thesilentboatman(a)gmail.com> Date: Thu Aug 28 00:43:02 2014 +0200 paccache: add support for multiple cachedirs Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> commit b00269d9c86c7992951e6dcf2591f709ccc71dc1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 10 09:33:23 2014 -0400 PKGBUILD(5): arch-specific fields are always additional Change e10775340 should have included this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 879e4665c4ed76376c9e2d9f2c597bb9cdabb79a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 9 16:36:42 2014 +1000 pacman-key: stricter parsing for -verify Prevents trust being spoofed by using TRUST_FULLY in the signatory's name or in an added notation. Fixes FS#41147. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 81 ++++++++++++++++++++++++++++++++++-------------- contrib/updpkgsums.sh.in | 2 ++ doc/PKGBUILD.5.txt | 4 +-- scripts/makepkg.sh.in | 27 ++++++++-------- scripts/pacman-key.sh.in | 2 +- 5 files changed, 75 insertions(+), 41 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: treat pkgrel more similarly to pkgver
by Luke Shumaker 14 Sep '14

14 Sep '14

This is perfectly fine with libalpm; it was only makepkg that was more strict with pkgrel than pkgver. Further, the former error message about invalid pkgrel formats claimed that pkgrel was a "decimal", which would mean that `1.1 == 1.10`. This was not the case; alpm parsed pkgrel as a version, not a decimal. In that light, enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly. --- doc/PKGBUILD.5.txt | 4 ++-- scripts/makepkg.sh.in | 5 +---- test/util/vercmptest.sh | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e2389cb..159adbb 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -48,7 +48,7 @@ similar to `$_basekernver`. *pkgver*:: The version of the software as released from the author (e.g., '2.7.1'). - The variable is not allowed to contain colons or hyphens. + The variable is not allowed to contain colons, hyphens or whitespace. + The `pkgver` variable can be automatically updated by providing a `pkgver()` function in the PKGBUILD that outputs the new package version. @@ -62,7 +62,7 @@ below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is not allowed to contain hyphens. + variable is not allowed to contain colons, hyphens or whitespace. *pkgdesc*:: This should be a brief description of the package and its functionality. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8e8a64c..552d305 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2337,10 +2337,7 @@ lint_pkgrel() { return 1 fi - if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then - error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" - return 1 - fi + validate_pkgver "$pkgrel" } lint_pkgver() { diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 9032cbf..32fb3e7 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -142,6 +142,24 @@ runtest 1:1.0 1.0 1 runtest 1:1.0 1.1 1 runtest 1:1.1 1.1 1 +# complex pkgrel values +runtest 1-1.5.0 1-1.5.0 0 +runtest 1-1.5.1 1-1.5.0 1 +runtest 1-1.5.1 1-1.5 1 +runtest 1-1.5b 1-1.5 -1 +runtest 1-1.5b 1-1.5.1 -1 +runtest 1-1.0a 1-1.0alpha -1 +runtest 1-1.0alpha 1-1.0b -1 +runtest 1-1.0b 1-1.0beta -1 +runtest 1-1.0beta 1-1.0rc -1 +runtest 1-1.0rc 1-1.0 -1 +runtest 1-1.5.a 1-1.5 1 +runtest 1-1.5.b 1-1.5.a 1 +runtest 1-1.5.1 1-1.5.b 1 +runtest 1-2 1-2.par1 1 +runtest 1-2 1-2.par1 1 +runtest 1-3 1-2.par1 -1 + #END TESTS if [[ $failure -eq 0 ]]; then -- 2.1.0

3 3

[pacman-dev] [PATCH] updpkgsums: use a throwaway build dir
by Dave Reisner 07 Sep '14

07 Sep '14

This prevents updpkgsums from potentially dirtying an otherwise pristine directory (likely $PWD) when makepkg creates the srclinks. --- contrib/updpkgsums.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 7e680b8..d41e362 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -79,6 +79,8 @@ fi # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. + export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) + trap "rm -rf '$BUILDDIR'" EXIT newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && exec awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { -- 2.1.0

1 0