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 f5d904d97f66d5e3337578541f2f440e846b9490 (commit)
via 422a4021e482c51d4f21303dfd4eff4c15ba1114 (commit)
via a9ad5a75f29c1175ec7916c715b007c2d388e0cb (commit)
via 1dc3de3f69efe11d112e23c19db3e23695b426eb (commit)
via 95f566d98a5ee361c0a7aca234e152d4f4ded791 (commit)
via 53d610e0a5d39e544812c85d77a7049d6578c148 (commit)
via 0c74ffd6b6e8f96d388c1e8219902beb369bf1b8 (commit)
via 964640fbfcde48b7937a6c18964c78a3b11db3de (commit)
via c8417f3386155028015f7f9fc43f4c64a60acf4c (commit)
via 5a5e712c749edb8bca448f119769d8bbe381c348 (commit)
via 8e736e1c9a4fb4ba375fe1f02be9e956f5f472d9 (commit)
via 62f1c590fc26efe7047f7dcbeac8a0910cfb50a5 (commit)
via 7a24f909fc21deb16271be5bc2cc5178f880c77a (commit)
via d0e5cd2c7faef6159ab353714fa5227739994b2f (commit)
via 9a24f1ffc50deb7d979430ac85475b10b4a98d28 (commit)
via 63a2874fe4db43ab1b0299163b1ceb82c4d8e00b (commit)
via eb9e74ecc7b7aa489de07bc52bb6d5220943154e (commit)
via 0c2edbdd4992f3107d7a2bd600829fcb3f344d48 (commit)
via 4a427dbc1bca50c516c41e4ae2cb0122c686f88d (commit)
via 5a247ccbd4953e9bdd383ad30ca90ed740c9db3d (commit)
via 927fdc0079c48b5bb401ac6e112d2d864919c5cc (commit)
via 1c2cfc5bad81b242c06a88361b6d8fca9160949a (commit)
via 9cd7ff807dc1014d8335b551524aca1994bb1e0d (commit)
via 948f135a73dec553b6e9983740b0e501f3a6e8c2 (commit)
via 88e7ea421ebbef86daa20ee0f9aff768a445b467 (commit)
via 28d404f16aca8ae1b7640b32c221c8b8860f8ce0 (commit)
via 80bc89c14768590e6ce3d33efaea8852a4db586c (commit)
via 2fad78974d74338fa6bf895b8b092c38ab41bd10 (commit)
via c1abfeae1ec39a196262622662850b7d277a4734 (commit)
via 6860e2f7032aed392f2526a7fb72cbf08dd3c25f (commit)
from 254329f6fb10a1fa59a0259fa5b2930530f63aae (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 f5d904d97f66d5e3337578541f2f440e846b9490
Author: Allan McRae <allan(a)archlinux.org>
Date: Mon Oct 29 15:35:41 2012 +1000
Do not warn about missing database if being downloaded
When a configured repo database is not already downloaded, a warning
message such as "warning: database file for 'testing' does not exist"
is printed. Disable this warning when the database is scheduled to
be downloaded in the transaction.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 422a4021e482c51d4f21303dfd4eff4c15ba1114
Author: Allan McRae <allan(a)archlinux.org>
Date: Tue Nov 13 16:49:01 2012 +1000
Fix future signature timestamp warning
The warning given for a signature timstamp being in the future compared
to the system time stated the opposite.
Also, move this warning to debug output. It is useless in its current
form as the package or database that is giving the error is not
mentioned and so other debug output is needed to find the offending
signature.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit a9ad5a75f29c1175ec7916c715b007c2d388e0cb
Author: Jason St. John <jstjohn(a)purdue.edu>
Date: Fri Nov 16 18:31:43 2012 -0500
Replace space-based indents in prototypes with tabs
The previous commit removed the Vim modelines which replaced tabs with
spaces. This commit replaces the space-based indents with tabs.
Tabs are generally more compatible with various user preferences
regarding indentation of code. Using space-based indents is not flexible
regarding user preferences at all.
Signed-off-by: Jason St. John <jstjohn(a)purdue.edu>
commit 1dc3de3f69efe11d112e23c19db3e23695b426eb
Author: Jason St. John <jstjohn(a)purdue.edu>
Date: Fri Nov 16 18:31:42 2012 -0500
Remove Vim modelines in prototype files
It makes little sense to "force" users to replace tabs with spaces, with
a width of 2. These settings should be configured by the user in their
own ~/.vimrc.
This is a resubmission based on Allan's feedback on the ML.
Signed-off-by: Jason St. John <jstjohn(a)purdue.edu>
commit 95f566d98a5ee361c0a7aca234e152d4f4ded791
Author: Simon Gomizelj <simongmzlj(a)gmail.com>
Date: Tue Dec 11 06:34:35 2012 -0500
Print package name before changelog entry with -Qc
Fixes FS#32362
Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 53d610e0a5d39e544812c85d77a7049d6578c148
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Sat Dec 1 00:40:46 2012 -0500
query.c: simplify is_foreign
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 0c74ffd6b6e8f96d388c1e8219902beb369bf1b8
Author: William Giokas <1007380(a)gmail.com>
Date: Thu Nov 29 01:08:55 2012 -0600
Added LOGDEST variable
Places logs in a pre-defined location. The logs are always neatly
labeled with package names and numbers, and this way can be more easily
sent to network shares as they are written or compressed/cleaned en
masse.
Signed-off-by: William Giokas <1007380(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 964640fbfcde48b7937a6c18964c78a3b11db3de
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Sat Nov 24 13:15:04 2012 -0500
Plug various minor memory leaks
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit c8417f3386155028015f7f9fc43f4c64a60acf4c
Author: Dave Reisner <dreisner(a)archlinux.org>
Date: Sun Nov 25 16:02:47 2012 -0500
makepkg: normalize whitespace in $pkgdesc when writing .PKGINFO
Specifically, we shouldn't allow newlines in the pkgdesc field, as
pacman will ignore the continuation and end the description prematurely
as written to the local DB. Normalize ALL whitespace, replacing it with
single whitespace characters.
Fixes strange errors as seen by FS#32852.
Signed-off-by: Dave Reisner <dreisner(a)archlinux.org>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 5a5e712c749edb8bca448f119769d8bbe381c348
Author: Dave Reisner <dreisner(a)archlinux.org>
Date: Sun Nov 25 16:00:58 2012 -0500
pkgdelta: avoid use of eval and IFS manipulation
Instead of blindly consuming data from the .PKGINFO file, parse it more
closely and only declare variables as needed.
Should help to avoid nonsensical errors and possibly dangerous command
execution as seen in FS#32852.
Signed-off-by: Dave Reisner <dreisner(a)archlinux.org>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 8e736e1c9a4fb4ba375fe1f02be9e956f5f472d9
Author: Allan McRae <allan(a)archlinux.org>
Date: Sun Aug 12 21:03:04 2012 +1000
Display install status of optdependencies
When a packages (new) optdepends are printed in install (update),
add a note of their current installation status. Packages currently
installed are labelled with [installed] and packages to be installed
in this transaction are labelled [pending].
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 62f1c590fc26efe7047f7dcbeac8a0910cfb50a5
Author: Allan McRae <allan(a)archlinux.org>
Date: Sun Aug 12 20:48:53 2012 +1000
Make alpm_pkg_find public
This function is particularly useful, so make it public.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 7a24f909fc21deb16271be5bc2cc5178f880c77a
Author: Benedikt Morbach <benedikt.morbach(a)googlemail.com>
Date: Sun Aug 12 16:40:04 2012 +1000
Add pactest for "Optional for" output
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit d0e5cd2c7faef6159ab353714fa5227739994b2f
Author: Allan McRae <allan(a)archlinux.org>
Date: Sun Aug 12 16:28:42 2012 +1000
Add "Optional for" to package information output
Much like packages that require a give package are displayed in the
"Required by" field of its information output, alos display packages
that optionally require the package.
Inspired-by: Benedikt Morbach <benedikt.morbach(a)googlemail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 9a24f1ffc50deb7d979430ac85475b10b4a98d28
Author: Benedikt Morbach <benedikt.morbach(a)googlemail.com>
Date: Sat Aug 11 22:29:04 2012 +1000
Add pactests for displaying optdep installation status
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 63a2874fe4db43ab1b0299163b1ceb82c4d8e00b
Author: Allan McRae <allan(a)archlinux.org>
Date: Sat Aug 11 21:42:37 2012 +1000
Display optdep install status in package query output
Indicate which optional dependencies are installed when viewing
local package information (-Qi).
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit eb9e74ecc7b7aa489de07bc52bb6d5220943154e
Author: Allan McRae <allan(a)archlinux.org>
Date: Sat Aug 11 16:07:44 2012 +1000
Notify of removed package required as optdepend
When a package is being removed, provide a notification (via a callback)
if any local package requires it as an optdepend.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 0c2edbdd4992f3107d7a2bd600829fcb3f344d48
Author: Allan McRae <allan(a)archlinux.org>
Date: Thu Dec 6 22:35:22 2012 +1000
It turns out we do care about directories...
This is a bug that has been around since at least 2007. On a package
upgrade (either by -S or -U) a new directory could overwrite any file.
This is caused by the filelist difference calculation ignoring all
directories and thus no new directories were checked for conflicting
files on the filesystem.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 4a427dbc1bca50c516c41e4ae2cb0122c686f88d
Author: Florian Pritz <bluewind(a)xinu.at>
Date: Wed Dec 12 00:29:50 2012 +1000
Add pactests for not detecting directory conflicts with upgrades
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 5a247ccbd4953e9bdd383ad30ca90ed740c9db3d
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Sun Sep 16 12:53:40 2012 -0400
Fix overzealous package removal with unmet dependencies
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
[Allan: Remove expected failure from fixed pactests]
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 927fdc0079c48b5bb401ac6e112d2d864919c5cc
Author: Allan McRae <allan(a)archlinux.org>
Date: Sun Sep 16 03:59:43 2012 +1000
pactest: variant of package removal due to unmet dependencies
Duplicate of sync140.py but with the alphabetical ordering of the
packages changed.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 1c2cfc5bad81b242c06a88361b6d8fca9160949a
Author: Allan McRae <allan(a)archlinux.org>
Date: Sun Sep 16 01:41:33 2012 +1000
pactest: removal of packages with unmet dependencies
Provide a package for removing packages with unmet dependencies.
Currently pacman removes too many packages from the transaction
(FS#30649).
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 9cd7ff807dc1014d8335b551524aca1994bb1e0d
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Mon Aug 6 22:18:15 2012 -0400
_alpm_filelist_resolve: add useful return code
Return -1 if a path is too long to resolve or we run out of memory.
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 948f135a73dec553b6e9983740b0e501f3a6e8c2
Author: Allan McRae <allan(a)archlinux.org>
Date: Sat Jul 21 00:17:18 2012 +1000
Avoid upgrade conflict with unchanged effective path
This applies to a case such as when /lib is a symlink to /usr/lib. If a
package is installed which contains /lib/libfoo.so, pacman will complain
if this package is then "fixed" to contain /usr/lib/libfoo.so. Since
these have the same effective path and it exists within the same
package, ignore the conflict.
Fixes FS#30681.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 88e7ea421ebbef86daa20ee0f9aff768a445b467
Author: Allan McRae <allan(a)archlinux.org>
Date: Fri Jul 20 22:25:18 2012 +1000
Resolve file paths during inter-package conflict check
File paths are resolved if necessary during inter-package conflict
checks so that packages carrying the same effective file due to
directory symlinks on the filesystem are flagged as conflicting.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 28d404f16aca8ae1b7640b32c221c8b8860f8ce0
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Mon Aug 6 22:18:14 2012 -0400
_alpm_filelist_resolve: use original filenames where possible
If a filename isn't resolved, the original can be used instead of strdup()ing
it.
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 80bc89c14768590e6ce3d33efaea8852a4db586c
Author: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Date: Mon Aug 6 22:08:04 2012 -0400
Add _alpm_filelist_resolve
The _alpm_filelist_resolve function takes a filelist and creates
a list with any symlinks in directory paths resolved.
Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com>
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 2fad78974d74338fa6bf895b8b092c38ab41bd10
Author: Allan McRae <allan(a)archlinux.org>
Date: Wed Jul 18 23:34:32 2012 +1000
Add resolved_path to alpm_filelist_t
Add an array to hold the resolved paths of the files in alpm_filelist_t.
When the file name and its resolved file name are identical, the pointer
to the original file name is used to avoid duplicate memory allocation.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit c1abfeae1ec39a196262622662850b7d277a4734
Author: Allan McRae <allan(a)archlinux.org>
Date: Wed Jul 18 12:25:37 2012 +1000
Detect inter-package conflicts between files and directories
Detect a conflict between a file/symlink in one package and a directory
in another when both are being installed at once.
A side effect is the creation of conflicts between a directory symlink
and a real directory (e.g lib -> usr/lib in pkg1 and /lib in pkg2).
Given we can not guarantee pkg1 is installed before pkg2, this is a
genuine conflict.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
commit 6860e2f7032aed392f2526a7fb72cbf08dd3c25f
Author: Allan McRae <allan(a)archlinux.org>
Date: Tue Jul 17 20:44:18 2012 +1000
pactest: Provide a full filelist to the pactests that need it
It turns out when you set the filelist for a package to include
"usr/lib/foo" in the pactest suite, it thinks there is only the
file "usr/lib/foo" in there... No "usr/" or "usr/lib/" directory.
This makes life difficult when testing code that scrolls through
a filelist looking for directory entries.
Signed-off-by: Allan McRae <allan(a)archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
doc/makepkg.conf.5.txt | 5 +
etc/makepkg.conf.in | 2 +
lib/libalpm/add.c | 2 +-
lib/libalpm/alpm.h | 23 +-
lib/libalpm/be_local.c | 1 +
lib/libalpm/be_sync.c | 3 +-
lib/libalpm/conflict.c | 6 +
lib/libalpm/deps.c | 94 +++----
lib/libalpm/dload.c | 1 +
lib/libalpm/filelist.c | 279 ++++++++++++++++++---
lib/libalpm/filelist.h | 3 +
lib/libalpm/package.c | 58 ++++-
lib/libalpm/package.h | 1 -
lib/libalpm/remove.c | 35 ++-
lib/libalpm/signing.c | 11 +-
lib/libalpm/sync.c | 22 +-
proto/PKGBUILD-split.proto | 58 ++---
proto/PKGBUILD.proto | 16 +-
proto/proto.install | 14 +-
scripts/makepkg.sh.in | 13 +-
scripts/pkgdelta.sh.in | 28 +--
src/pacman/callback.c | 10 +
src/pacman/package.c | 25 +-
src/pacman/pacman.c | 5 +-
src/pacman/query.c | 13 +-
src/pacman/util.c | 22 +-
test/pacman/tests/fileconflict001.py | 10 +-
test/pacman/tests/fileconflict002.py | 2 -
test/pacman/tests/fileconflict013.py | 2 -
test/pacman/tests/fileconflict015.py | 2 -
test/pacman/tests/fileconflict016.py | 9 +-
.../{fileconflict016.py => fileconflict017.py} | 13 +-
test/pacman/tests/fileconflict020.py | 18 ++
.../{fileconflict012.py => fileconflict021.py} | 9 +-
test/pacman/tests/query010.py | 12 +
test/pacman/tests/query011.py | 15 ++
test/pacman/tests/query012.py | 13 +
test/pacman/tests/sync140.py | 26 ++
test/pacman/tests/sync141.py | 26 ++
test/pacman/tests/unresolvable001.py | 2 -
40 files changed, 678 insertions(+), 231 deletions(-)
copy test/pacman/tests/{fileconflict016.py => fileconflict017.py} (66%)
create mode 100644 test/pacman/tests/fileconflict020.py
copy test/pacman/tests/{fileconflict012.py => fileconflict021.py} (50%)
create mode 100644 test/pacman/tests/query010.py
create mode 100644 test/pacman/tests/query011.py
create mode 100644 test/pacman/tests/query012.py
create mode 100644 test/pacman/tests/sync140.py
create mode 100644 test/pacman/tests/sync141.py
hooks/post-receive
--
The official pacman repository