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 d5536d3eb382fa8a00d5d5820c3d0c947fb90e33 (commit) via d568a4335bd372e490f28acd25f8b2bd1b560730 (commit) via 99c7b1b0882ccf816fcabdc937b05260422df1f3 (commit) via 9a9e0203de9a440be0e359a36bf55151ffb51ca6 (commit) via 1545a042535a8c73c1fa5e0a8bc399394f553a4f (commit) via e4af5e3c9787a37103e71c7814564435ec241d4c (commit) via ae7067440c20c49b3d11c63844d583381282c6b2 (commit) via f9423cfa5d5b9f2041b70676438082faad1cd1ee (commit) via 1040ad4e71dc8ade4418f7de8f5d5578658638f3 (commit) via b0ae59724ed36242459a91c0f9c5ce036c46de41 (commit) via d4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 (commit) via 54067c390f622807b78bc1a7950db113c3a8747c (commit) via 4dbac804a3d00a7bcc6405aa1f28cc5d1aa21f44 (commit) via 4e6848dbea7251b4c612503362848574d8ce75e0 (commit) from e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 (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 d5536d3eb382fa8a00d5d5820c3d0c947fb90e33 Author: David Macek <david.macek.0@gmail.com> Date: Fri Apr 17 17:31:01 2015 +0200 libalpm: Do a sanity check before manipulating final DB URL The change in commit 9d96bed9d6b57 causes download errors for the .db.sig file in case the final URL for the .db file contains query strings or other unexpected stuff. This commit isn't intended to be a total solution, but it should eliminate the problem in the most obvious cases. Signed-off-by: Allan McRae <allan@archlinux.org> commit d568a4335bd372e490f28acd25f8b2bd1b560730 Author: David Macek <david.macek.0@gmail.com> Date: Fri Apr 17 17:31:19 2015 +0200 Fix comment in alpm_db_update Fix comment to better explain the magic constant used when allocating a buffer for ".db.sig" URL. Signed-off-by: Allan McRae <allan@archlinux.org> commit 99c7b1b0882ccf816fcabdc937b05260422df1f3 Author: Allan McRae <allan@archlinux.org> Date: Tue May 12 11:56:59 2015 +1000 libmakepkg: fix test bracket style Signed-off-by: Allan McRae <allan@archlinux.org> commit 9a9e0203de9a440be0e359a36bf55151ffb51ca6 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sun Apr 12 00:01:23 2015 -0400 alpm_logaction: implement documented return value "return 0 on success, -1 on error (pm_errno is set accordingly)" Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit 1545a042535a8c73c1fa5e0a8bc399394f553a4f Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sun Apr 12 00:01:22 2015 -0400 alpm_logaction: allow falling back to syslog Even if opening the log file fails, if a user has enabled syslog we may still be able to log to that. Set the error return value and continue instead of bailing out. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit e4af5e3c9787a37103e71c7814564435ec241d4c Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sun Apr 12 00:01:21 2015 -0400 alpm_logaction: check logfile before opening valgrind does not like calling open(NULL, ...). This also makes the return value 0 if logfile has not been set. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit ae7067440c20c49b3d11c63844d583381282c6b2 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Sun Apr 12 00:01:20 2015 -0400 merge _alpm_logaction into alpm_logaction Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> commit f9423cfa5d5b9f2041b70676438082faad1cd1ee Author: David Macek <david.macek.0@gmail.com> Date: Thu Mar 26 19:59:41 2015 +0100 makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD Currently makepkg clears the whole $pkgbasedir which is needless. Moreover, in the obscure case of multiple makepkg runs (with different $pkgname) that share a $pkgdirbase, only $pkgdir's from the last run will remain. Since I consider the contents of $pkgdir an important artifact, this commit restricts the deletion to individual $pkgdir's. When CLEANUP is set, the behavior is unchanged. Discussed in: https://lists.archlinux.org/pipermail/pacman-dev/2015-February/019939.html Signed-off-by: Allan McRae <allan@archlinux.org> commit 1040ad4e71dc8ade4418f7de8f5d5578658638f3 Author: Charles Duffy <chaduffy@cisco.com> Date: Tue Apr 7 15:29:28 2015 -0500 Fix compilation if libarchive headers are not in standard location With commit 097d5a478b32, including alpm.h also drags in archive.h. Ensure the tools we build that depend on ALPM also include the necessary flags to find libarchive headers if they are not installed in a standard location. [Dan: Add commit message] Signed-off-by: Dan McGee <dan@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit b0ae59724ed36242459a91c0f9c5ce036c46de41 Author: Dominik Fischer <d.f.fischer@web.de> Date: Thu Apr 23 16:41:46 2015 +0200 makepkg-template: support multiple --template-dirs Especially when maintaining local templates in addition to the ones stored in /usr/share/makepkg-template, it can be useful to include templates stored in multiple different locations into one PKGBUILD. This patch makes this possible by allowing --template-dir to be specified multiple times. This also introduces a dedicated error message when a template cannot be found, in contrast to the already existing "Couldn't detect version for template '%s'". If a template of the same name is present in more than one of the given directories, the last one always takes precedence. Neither the default behaviour without the option given, nor the handling of a single template dir is changed. Signed-off-by: Dominik Fischer <d.f.fischer@web.de> Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org> commit d4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 Author: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Thu Apr 23 16:45:51 2015 +1000 pacsort: fix warning about signed overflow potential during comparison. Some crazy person assumed we would have fewer than INT_MAX columns. Signed-off-by: Allan McRae <allan@archlinux.org> commit 54067c390f622807b78bc1a7950db113c3a8747c Author: Allan McRae <allan@archlinux.org> Date: Thu Apr 23 16:01:16 2015 +1000 Silence warning from clang clang is wrong - dbfile is always used initialized in that function. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit 4dbac804a3d00a7bcc6405aa1f28cc5d1aa21f44 Author: Allan McRae <allan@archlinux.org> Date: Tue Apr 14 20:46:04 2015 +1000 Pluralize callback string In English, this string only has it plural form. However, we need to use the pluralized translation as some languages can have multiple plural formats. Signed-off-by: Allan McRae <allan@archlinux.org> commit 4e6848dbea7251b4c612503362848574d8ce75e0 Author: Allan McRae <allan@archlinux.org> Date: Fri Mar 27 14:41:50 2015 +1000 Update source URL Signed-off-by: Allan McRae <allan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 +- doc/makepkg-template.1.txt | 4 +- lib/libalpm/add.c | 2 +- lib/libalpm/be_sync.c | 17 +++++--- lib/libalpm/log.c | 48 ++++++++++++++++++---- lib/libalpm/util.c | 44 -------------------- lib/libalpm/util.h | 3 -- scripts/libmakepkg/lint_package.sh.in | 2 +- .../libmakepkg/lint_package/build_references.sh.in | 2 +- .../libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/optipng.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/upx.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/makepkg-template.pl.in | 37 +++++++++-------- scripts/makepkg.sh.in | 7 +++- src/pacman/Makefile.am | 3 +- src/pacman/callback.c | 5 ++- src/util/Makefile.am | 3 +- src/util/pacsort.c | 2 +- .../compose-multiple-template-dirs/PKGBUILD | 5 +++ .../templates/build/build-1.template | 1 + .../templates/package/package-1.template | 1 + .../compose-multiple-template-dirs/testcase-config | 18 ++++++++ .../last-template-dir-has-precedece/PKGBUILD | 4 ++ .../PKGBUILD.expanded} | 3 +- .../templates/first/perl-module-1.0.template | 1 + .../templates/last/perl-module-1.0.template | 1 + .../testcase-config | 15 +++++++ .../missing-template-file/testcase-config | 2 +- .../missing-template-symlink/testcase-config | 4 +- .../template-without-version/testcase-config | 2 +- 39 files changed, 155 insertions(+), 107 deletions(-) create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/build/build-1.template create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/package/package-1.template create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/testcase-config create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/PKGBUILD copy test/scripts/makepkg-template-tests/{missing-template-file/PKGBUILD => last-template-dir-has-precedece/PKGBUILD.expanded} (78%) create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/templates/first/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/templates/last/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/testcase-config hooks/post-receive -- The official pacman repository