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 d21f6ca4aa3209938fa312f29ac03446f57e6a66 (commit) via 06cb713f3915cc858de0388b0a5232326101a9fa (commit) via e27e658033d500c22b9dd4974fa3fbcc378f35b9 (commit) via 53f4e431918fdfd4e2433c387da1c89c697613bf (commit) via 4272b37d3d9f112b9f089dafc2e7538c4c24f7b2 (commit) via 6f3a2145b0de7f27a1bf5932af3fe0a67171a881 (commit) via 5f404f2cb78f48ddd90be0334fa2528961b17871 (commit) via e92083798cdd98961e0d2befe25af7a8f96c9ab5 (commit) via 5b33f48389531e47a0093e84feedce0f63a94c77 (commit) via 700a5374f1c3ab87a194ad7e5472b72072d04454 (commit) via 6eee3f6781b62f3a80697fbc7e3eeac0544e49e8 (commit) via 4664a095a497de1b47d980863228860a6d19f286 (commit) via 82a701401cd31621f87956dc60c97ab6fbee4add (commit) via ef3ec2603dcef448399d20f1363b5d34c1443f56 (commit) via 2f5f15727457260179c9328d96b6e2980b097f8c (commit) via 71fd34e59603e95be79ab3399d9968b89f9df396 (commit) via ee015f086f3c40390659bbc0129b7c08ffd0ed5f (commit) via be972767358e6dfbb08686555d8e2c0176a55106 (commit) via 76a991c117f3419e5cd630355b90876084d27c4b (commit) via ba63e31cc7ecc9e7fccb68e9fa4e09c90a8d5c66 (commit) via 0074cadb3bfdf5d89065e69eb93788ebcc9a6b58 (commit) from c206b3a6d503e57691664b94e68ba85760bd0b6c (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 d21f6ca4aa3209938fa312f29ac03446f57e6a66 Author: Allan McRae <allan@archlinux.org> Date: Wed Jun 15 16:02:22 2011 +1000 makepkg: create source package inside fakeroot Create source package files inside the fakeroot environment to ensure reasonable ownership of files within the archive. Fixes FS#24330. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 06cb713f3915cc858de0388b0a5232326101a9fa Author: Allan McRae <allan@archlinux.org> Date: Wed Jun 15 13:52:56 2011 +1000 Clean up makefile for script generation We no longer have any python scripts in our scripts/ directory so we can simplify the makefile a bit. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit e27e658033d500c22b9dd4974fa3fbcc378f35b9 Author: Allan McRae <allan@archlinux.org> Date: Mon Jun 13 22:36:41 2011 +1000 parse_options: adjust error messages Provide consistent error messages for unknown long and short options. Also get full string translation for the messages. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 53f4e431918fdfd4e2433c387da1c89c697613bf Author: Allan McRae <allan@archlinux.org> Date: Thu Jun 9 21:08:40 2011 +1000 scripts/library: add README file Add a README file to briefly document the code snippets in the scripts library folder. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 4272b37d3d9f112b9f089dafc2e7538c4c24f7b2 Author: Allan McRae <allan@archlinux.org> Date: Thu Jun 9 20:43:25 2011 +1000 scripts: refactor output formatting functions Move the common output formatting functions into a separate library file and import that into each script. makepkg is excluded due to its additional color formatting. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 6f3a2145b0de7f27a1bf5932af3fe0a67171a881 Author: Allan McRae <allan@archlinux.org> Date: Wed Jun 8 23:36:46 2011 +1000 makepkg: move option parsing code to separate file This move the getopt replacement function parse_options out of makepkg.sh.in and into a separate file. The code is inserted into the relevant place in makepkg using m4. This will allow the reuse of the option parsing code in other scripts (i.e. pacman-key) while avoiding code duplication. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 5f404f2cb78f48ddd90be0334fa2528961b17871 Merge: e920837 6eee3f6 Author: Dan McGee <dan@archlinux.org> Date: Wed Jun 15 09:16:08 2011 -0500 Merge branch 'maint' commit e92083798cdd98961e0d2befe25af7a8f96c9ab5 Author: Jakob Gruber <jakob.gruber@gmail.com> Date: Wed Jun 15 11:04:09 2011 +0200 Ensure humanize_size works for negative values Signed-off-by: Jakob Gruber <jakob.gruber@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org> commit 5b33f48389531e47a0093e84feedce0f63a94c77 Author: Jakob Gruber <jakob.gruber@gmail.com> Date: Wed Jun 15 10:54:38 2011 +0200 Use pm_fprintpf in table_create_format Signed-off-by: Jakob Gruber <jakob.gruber@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org> commit 700a5374f1c3ab87a194ad7e5472b72072d04454 Author: Allan McRae <allan@archlinux.org> Date: Sat Jun 11 12:00:20 2011 +1000 makepkg: reword purge message Clarfiy that it is unwanted files are being removed rather than "other" files (whatever they are...). Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org> commit 82a701401cd31621f87956dc60c97ab6fbee4add Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 10:31:51 2011 -0500 valgrind.supp: add known leak exposed by cURL This one comes courtesy of OpenSSL and some static initialization. Signed-off-by: Dan McGee <dan@archlinux.org> commit ef3ec2603dcef448399d20f1363b5d34c1443f56 Author: Florian Pritz <bluewind@xinu.at> Date: Thu Jun 9 23:17:06 2011 +0200 doc/PKGBUILD: misc changes Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Florian Pritz <bluewind@xinu.at> commit 2f5f15727457260179c9328d96b6e2980b097f8c Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 10:15:43 2011 -0500 Rename and rework signing helper methods * Don't name static methods with a gpgme_ prefix to avoid confusion with methods provided by the library. These are static and local to our file so just give them sane non-prefixed names. * Rework sigsum_test_bit() to not require assignment. * Don't balk if there is more than one signature available (for now, only check the first). * Fix error codes in publicly visible methods to return -1, not 0, if pkg or db are not provided. Signed-off-by: Dan McGee <dan@archlinux.org> commit 71fd34e59603e95be79ab3399d9968b89f9df396 Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 10:09:35 2011 -0500 Alpm pkg accessors: ensure pkg argument is non-NULL Signed-off-by: Dan McGee <dan@archlinux.org> commit ee015f086f3c40390659bbc0129b7c08ffd0ed5f Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 10:01:08 2011 -0500 Ensure handle is valid and pm_errno is reset when calling into API We didn't do due diligence before and ensure prior pm_errno values weren't influencing what happened in further ALPM calls. I observed one case of early setup code setting pm_errno to PM_ERR_WRONG_ARGS and that flag persisting the entire time we were calling library code. Add a new CHECK_HANDLE() macro that does two things: 1) ensures the handle variable passed to it is non-NULL and 2) clears any existing pm_errno flag set on the handle. This macro can replace many places we used the ASSERT(handle != NULL, ...) pattern before. Several other other places only need a simple 'set to zero' of the pm_errno field. Signed-off-by: Dan McGee <dan@archlinux.org> commit be972767358e6dfbb08686555d8e2c0176a55106 Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 09:32:39 2011 -0500 Avoid setting sigverify option twice Signed-off-by: Dan McGee <dan@archlinux.org> commit 76a991c117f3419e5cd630355b90876084d27c4b Author: Dan McGee <dan@archlinux.org> Date: Tue Jun 14 09:30:46 2011 -0500 Conflict check and skip_remove code cleanups * Move several variables into better scope * const-ify a few variables * Avoid duplicating filelists if it is unnecessary * Better handling out out of memory condition when adding file conflicts to our list Signed-off-by: Dan McGee <dan@archlinux.org> commit ba63e31cc7ecc9e7fccb68e9fa4e09c90a8d5c66 Author: Dan McGee <dan@archlinux.org> Date: Thu Jun 9 15:23:24 2011 -0500 Small handle related cleanups Signed-off-by: Dan McGee <dan@archlinux.org> commit 0074cadb3bfdf5d89065e69eb93788ebcc9a6b58 Author: Dan McGee <dan@archlinux.org> Date: Thu Jun 9 15:18:47 2011 -0500 Add handle argument to _alpm_pkg_should_ignore() This allows callers to retrieve it from wherever is convenient, which may or may not be on the package object itself. Signed-off-by: Dan McGee <dan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 7 +- doc/PKGBUILD.5.txt | 26 +++--- lib/libalpm/add.c | 5 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 1 + lib/libalpm/conflict.c | 85 +++++++++++++-------- lib/libalpm/db.c | 20 ++++- lib/libalpm/deps.c | 9 ++- lib/libalpm/dload.c | 2 + lib/libalpm/handle.c | 94 ++++++++++++------------ lib/libalpm/package.c | 74 +++++++++++++++++-- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 12 ++-- lib/libalpm/signing.c | 76 +++++++++--------- lib/libalpm/sync.c | 23 +++--- lib/libalpm/trans.c | 16 ++-- lib/libalpm/util.h | 2 + scripts/Makefile.am | 50 +++++++++---- scripts/library/README | 15 ++++ scripts/library/output_format.sh | 21 +++++ scripts/library/parse_options.sh | 87 +++++++++++++++++++++ scripts/makepkg.sh.in | 155 ++++++++++--------------------------- scripts/pacman-db-upgrade.sh.in | 9 +-- scripts/pacman-key.sh.in | 21 +----- scripts/pkgdelta.sh.in | 16 +---- scripts/repo-add.sh.in | 22 +----- src/pacman/conf.c | 1 - src/pacman/util.c | 6 +- valgrind.supp | 10 +++ 30 files changed, 498 insertions(+), 376 deletions(-) create mode 100644 scripts/library/README create mode 100644 scripts/library/output_format.sh create mode 100644 scripts/library/parse_options.sh hooks/post-receive -- The official pacman repository