- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-188-g13a2847
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 13a2847aa14cb7643d50ca82b00180b440e401fe (commit) via d98bacd4ec4289750e740b2dff8c4adaaa7a028a (commit) via 8f3b485517a401ece348a1c5166d951ec4a8a28f (commit) via 21833d90e26635fdd2c6af247790a9bf374b4d80 (commit) via 209d0643e5fd38f8add70cfb3651012993d861f1 (commit) via b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d (commit) from 3030542d10d4e87997a894a9eb63122cd2426a94 (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 13a2847aa14cb7643d50ca82b00180b440e401fe Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 21:40:24 2010 -0600 pacman-optimize: ensure database directory contains local/ And also default dbpath to the one we may find in pacman.conf. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d98bacd4ec4289750e740b2dff8c4adaaa7a028a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 22:16:37 2010 +1000 Add script to update pacman database format The pacman-db-upgrade script was added to detect old pacman database formats and upgrade them. Currently performs the merging of depends files into desc files in the local database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f3b485517a401ece348a1c5166d951ec4a8a28f Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 16:01:30 2010 +1000 Update pactest suite for change in db structure Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db Whenever depends is needed from the local db, so is desc. The only disadvantage to merging them is the additional time taken to read the depends entries when they are not needed. As depends is in general relatively small, the additional time taken to read it in will be negligable. Also, merging these files will speed up local database access due to less file seeks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 209d0643e5fd38f8add70cfb3651012993d861f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 22:43:55 2008 -0500 Attempt to stop installation when we encounter problems This should hopefully address some of the concerns raised in FS#11639 with regards to continuing after filling the disk up. Add some more checks and passing of error conditions between our functions. When a libarchive warning is encountered, check if it is due to lack of disk space and if so upgrade it to an error condition. A review of other libarchive warnings suggests that these are less critical and can remain as informative warning messages at this stage. Note the presence of errors after extraction of an entire package is complete. If so, we abort the transaction to be on the safe side and keep damage to a minimum. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: make ENOSPC warning into an error] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 12 21:08:39 2008 -0500 Turn libarchive warnings into libalpm warnings Rather than hiding these warnings, show them to the user as they happen. This will prevent things such as hiding full filesystem errors (ENOSPC) from the user as seen in FS#11639. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: adjust warning wording and add gettext calls] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 80 +++++++++++++--------- lib/libalpm/be_local.c | 144 +++++++++++++++------------------------ lib/libalpm/be_package.c | 2 +- lib/libalpm/db.h | 9 +-- lib/libalpm/util.c | 2 +- scripts/Makefile.am | 3 + scripts/pacman-db-upgrade.sh.in | 121 ++++++++++++++++++++++++++++++++ scripts/pacman-optimize.sh.in | 6 +- test/pacman/pmdb.py | 62 +++++------------ test/pacman/pmpkg.py | 4 - 10 files changed, 256 insertions(+), 177 deletions(-) create mode 100644 scripts/pacman-db-upgrade.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-18-g5c8083b
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (commit) via eedf4f4e630f98350090ef2824b0981ffb4b7a4a (commit) via bd08581d2e5c67cc084b7ccb8f67df456bbd9ada (commit) from a91250b7bb718c7e36c9784d51bdcb6e0051c259 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 7 ++++--- lib/libalpm/trans.c | 2 +- po/ru.po | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-182-g3030542
by dan＠archlinux.org 13 Dec '10

13 Dec '10

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 3030542d10d4e87997a894a9eb63122cd2426a94 (commit) via 9f96c5433a4867cce9dc0c3ff23cb3ba8029be20 (commit) via ef977865a143eb682baf0d4f598c0c6924aeaa1a (commit) via b7015af0fc9325740950223e719f6dec153e264b (commit) via ec136784d4328b4c75f622c08273cf9dc6cac40f (commit) via 24684a616ed46c635a2236873c8168b9153b5bc1 (commit) via e22aa23c8f5adb0fd4b7ccbee480a4906ede0346 (commit) via 3f0d98c124db1547d6595762bd2d125b4350b861 (commit) via e527699dddca41e3af6c1872e851405a4f5212a0 (commit) via 695656d25279342f80c307035721ced6d37ee08b (commit) via f4e9deb6d74614ac427b37513359d91588dd1542 (commit) via adb10c3ab244cc00eb863d5b036fa7bdd76f8152 (commit) via f0051a7678d138ffc88a4c9c6d9add8966abe4f9 (commit) via fc74ef93b6945dfac299433a9418fdd31798f6b6 (commit) via 8e9a69e8f66b9b1a13e01ef0b67a78f2014754fa (commit) via a44c7b8956f1f445d554a742870c72ca7dacaae5 (commit) via 889c260cbf6cf497169ca9b75df121d04140441d (commit) via 579533d1a07808c3e0458d6042d6039e56c38de2 (commit) via 330951200c8a0bb90937e0578510a41220154726 (commit) via 970ffbb4c77bb2121f5aec8391bcc04e3a54986c (commit) via d4bab6f8fcfea7783c260d28c7c598055617b181 (commit) via 622e7fdd4fffcaf28679ba063505fa18755b7ba0 (commit) via 65a96e900d9b3f970fd184986303092e4735de0e (commit) via 6b928fc0bf6a2dc88c413d4bc88c7923d4741bc6 (commit) via 7c06e66c24953a6c8a15e8460be8ed3b1585c469 (commit) via abefa23341caa995cc0d155d30baa7faeb7a6c0e (commit) via 3a9dec104858a64489b004296d009c8222e7f040 (commit) via c78f5fb99ab7551868b3b2b8cd2b56807d457f59 (commit) via d0d8f605d5f3ff8fc306af90ea2a516174354bfc (commit) via d5a7dc67d93f5e530a6b3611f567eff5afe76efb (commit) via 8791ae0fdac16419d25e18acd245a65879807eb8 (commit) via a03daad0734428ded0398c9d71582f90063f3493 (commit) via c2cce1f46a754c04c3623088a9e43922a6c10e2d (commit) via 0e39cf9275c6a6f965e364792527c2704327bd02 (commit) via a35610beba1b12c37ec26ec878d3701dd669db42 (commit) via 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (commit) via eedf4f4e630f98350090ef2824b0981ffb4b7a4a (commit) via bd08581d2e5c67cc084b7ccb8f67df456bbd9ada (commit) via 4fb3cfc48f626f84329c78351d6a8710255a35e3 (commit) via a91250b7bb718c7e36c9784d51bdcb6e0051c259 (commit) via a08638edc8cdacf7840414d82bc687727d7b2363 (commit) via 592211b6dc4b9997a60543309378f1595cf38056 (commit) via d901646f7a2e67d27bcae43f90490299857646fc (commit) from 0f3957ab48f34df8e151ec026dfac0d9d2df5aec (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 3030542d10d4e87997a894a9eb63122cd2426a94 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:38:20 2010 -0600 Make reading from any file possible in sync DB Whether it be "desc", "depends", or "deltas", it really doesn't matter- treat them all the same and have the ability to read any data from any file in that list. This continues the work in a44c7b8956. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f96c5433a4867cce9dc0c3ff23cb3ba8029be20 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 13:51:31 2010 +1000 Explicitly test time difference is greater than zero We are comparing a floating point number so should use an inequality rather than implicitly testing != 0. Prevents warning given by -Wfloat-equal. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef977865a143eb682baf0d4f598c0c6924aeaa1a Author: Allan McRae <allan(a)archlinux.org> Date: Tue Dec 7 17:48:16 2010 +1000 makepkg: perform sanity checks on variables in package functions Check the over-ridden entries for provides, backup, optdepends and options for illegal entries. Partially fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b7015af0fc9325740950223e719f6dec153e264b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:12:27 2010 -0600 diskspace style cleanups and small fixes * Use our normal return() function syntax * Rework a few things to reduce number of casts * Fix void function argument declaration * Add missing gettext _() call * Remove need for seperate malloc() of statvfs/statfs structure * Unify argument order of static functions- mountpoints now always passed first * Count all files that start with '.' in a package against the DB * Rename db to db_local in check_diskspace to clarify some code * Fix some line wrapping to respect 80 characters Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec136784d4328b4c75f622c08273cf9dc6cac40f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:12:26 2010 -0600 Refactor statfs/statvfs type check Turn it into a configure-type typedef, which allows us to reduce the amount of duplicated code and clean up some #ifdef magic in the code itself. Adjust some of the other defined checks to look at the headers available rather than trying to pull in the right ones based on configure checks. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24684a616ed46c635a2236873c8168b9153b5bc1 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 17:07:43 2010 +1000 Display progress bar for disk space checking Checking disk space needed for a transaction can take a while so add an informative progress bar. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e22aa23c8f5adb0fd4b7ccbee480a4906ede0346 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:54:30 2010 +1000 Add configuration option to control disk space checking Disk space checking is likely to be an unnecessary bottleneck to people with reasonable partition sizes so add a configuration option to allow it to be disabled/enabled as wanted. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3f0d98c124db1547d6595762bd2d125b4350b861 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:43:45 2010 +1000 Implement disk space checking Pull together the work of the previous commits to implement a check for enough free space before performing an install transaction. Abort if there is not enough free space with an appropriate pm_errno.. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e527699dddca41e3af6c1872e851405a4f5212a0 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:30:33 2010 +1000 Add functions to calculate approximate disk usage by packages Two helper function are added to calculate the disk usage from packages that are either currently installed on the system or from a package archive. Some minor approximations have been made: 1. Size for directories is not considered when removing a package from the filesystem to avoid multiple counting across packages. Also, these are reported to take zero size while installing. 2. Symlinks are reported to contribute zero size towards removal as libarchive reports them to have zero size for install. 3. Package data files (.PKGINFO, .INSTALL, .CHANGELOG) are counted towards usage on dbpath on install, but their size is not counted on package removal. 4. No handling of extra size needed for .pacsave/.pacnew files. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 695656d25279342f80c307035721ced6d37ee08b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:24:52 2010 +1000 Add function to match file to mount point For a given file, determine which mount point it is on or will be installed to. Take into account that we might be using an alternative installation root. Add additional helper function added to sort mount point list for easier matching. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f4e9deb6d74614ac427b37513359d91588dd1542 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 16:15:21 2010 +1000 Add function for listing system mount points Add a mount_point_list() function that attempts to portably obtain a list of system mount points and a struct to hold needed mount point information. Abort the transaction if we are unable to determine the mount points. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit adb10c3ab244cc00eb863d5b036fa7bdd76f8152 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 16 15:57:39 2010 +1000 Prototype disk space checking functionality Very basic prototyping for adding functionality to check free disk space before performing package installs. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0051a7678d138ffc88a4c9c6d9add8966abe4f9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:13:37 2010 -0600 Remove AC_TYPE_SIGNAL usage This macro is deemed unnecessary by even the autoconf guys, so we really don't need to use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fc74ef93b6945dfac299433a9418fdd31798f6b6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 16 20:13:36 2010 -0600 dirent usage cleanup We were including the header in a lot of places it is no longer used. Additionally, use the correct autoconf macro for determining whether d_type is available as a member: HAVE_STRUCT_DIRENT_D_TYPE. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e9a69e8f66b9b1a13e01ef0b67a78f2014754fa Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 7 21:39:55 2010 +1000 Move MAX_DELTA_RATIO definition This is a delta specific definition so it makes more sense to put it in the delta specific header file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a44c7b8956f1f445d554a742870c72ca7dacaae5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 14:50:04 2010 +1000 Combine reading from depends and desc in sync db This will allow us to eventually combine the depends and desc entries within the sync database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 889c260cbf6cf497169ca9b75df121d04140441d Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:38 2010 -0430 makepkg: remove dead code from handle_deps The error message that has been removed never gets to print because, given the same condition, handle_deps throws the same error and then immediately exits makepkg. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 579533d1a07808c3e0458d6042d6039e56c38de2 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:37 2010 -0430 makepkg: do not ignore errors from pacman when checking deps As check_deps is run in a subshell, exit had the same meaning as return. Since the intention is to halt makepkg when pacman throws an error other than 127, the enclosing function has to handle error control instead. Fixes FS#19840 Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 330951200c8a0bb90937e0578510a41220154726 Author: Carlos Diaz <839273(a)gmail.com> Date: Thu Oct 14 12:02:46 2010 -0430 makepkg: use portable escape sequence for terminal escapes The escape string isn't necesarily \033; it's determined by what the particular termcap/info entry for that terminal contains. Bash uses ncurses functions to expand \e to the _correct_ terminal escape. Signed-off-by: Carlos Diaz <839273(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 970ffbb4c77bb2121f5aec8391bcc04e3a54986c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 10:42:41 2010 +1000 Add epoch to PKGBUILD prototypes Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d4bab6f8fcfea7783c260d28c7c598055617b181 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:23:25 2010 -0600 src/util: update .gitignore Add pactree and sort entries. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 622e7fdd4fffcaf28679ba063505fa18755b7ba0 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 18:07:31 2010 +0200 contrib: remove bash pactree This has been rewitten in C which is much much faster. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 65a96e900d9b3f970fd184986303092e4735de0e Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 17:11:14 2010 +0200 pactree: use variables for color and tree output This allows to very easily support non-color and linear mode, by just setting the variables to an empty string, very much like it was done in the bash script. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 6b928fc0bf6a2dc88c413d4bc88c7923d4741bc6 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Oct 13 15:50:13 2010 +0200 pactree: separate dependency and print logic The deps walking code simply calls print_start, print, print_end, and all the printing logic is handled there. The unresolvable printing is disabled for now because it does not handle linear mode, and the linear and color output will be re-written. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit 7c06e66c24953a6c8a15e8460be8ed3b1585c469 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Oct 12 14:46:12 2010 -0400 pactree: rewrite in C Use the bash script in contrib as the basis for a C rewrite using libalpm. The speedup can go from dozens of seconds to less than one second. Colorized output is preserved. The --graph option generates output that graphviz's `dot' utility will understand to draw us a graph. Output is written to stdout and it is left up to the user to pipe the data and determine the output characteristics. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> commit abefa23341caa995cc0d155d30baa7faeb7a6c0e Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 00:42:04 2010 +0200 alpm/remove.c : respect --dbonly during remove-upgrade When a -Sk or -Uk operation induced a removal of an existing local package, --dbonly was not in effect and the files were all removed. Fixing this behavior was already marked as TODO in database012 pactest ------------ TODO: I honestly think the above should NOT delete the original les, it hould upgrade the DB entry without touching anything on the file stem. E.g. this test should be the same as: pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz ------------ Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> [Dan: small coding style touchup] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a9dec104858a64489b004296d009c8222e7f040 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 10:02:38 2010 +0200 pacman: sort --help output Example with pacman -Uh : $ pacman -Uh options: -b, --dbpath <path> set an alternate database location -d, --nodeps skip dependency checks -f, --force force install, overwrite conflicting files -k, --dbonly only modify database entries, not package files -r, --root <path> set an alternate installation root -v, --verbose be verbose --arch <arch> set an alternate architecture --asdeps install packages as non-explicitly installed --asexplicit install packages as explicitly installed --cachedir <dir> set an alternate package cache location --config <path> set an alternate configuration file --debug display debug messages --ignore <pkg> ignore a package upgrade (can be used more than once) --ignoregroup <grp> ignore a group upgrade (can be used more than once) --logfile <path> set an alternate log file --noconfirm do not ask for any confirmation --noprogressbar do not show a progress bar when downloading files --noscriptlet do not execute the install scriptlet if one exists --print only print the targets instead of performing the operation --print-format <string> specify how the targets should be printed Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> [Dan: small coding style touchups] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c78f5fb99ab7551868b3b2b8cd2b56807d457f59 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 10 18:57:41 2010 +0200 CLI args: update --help and manpage The three parts (help, manpage and code) are now organized in the same way and much easier to compare : - specific options - install/upgrade options for -S and -U - transaction options for -S -R and -U - global options After this re-organization, it was easy to update and sync the three components together. Duplication is also avoided. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d0d8f605d5f3ff8fc306af90ea2a516174354bfc Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 21:47:40 2010 +0200 alpm: don't expose alpm_depcmp Either we expose all low levels function dealing with pmdepend_t (splitdep and depfree come to mind), or we don't. Since none of the tools use depcmp, I chose to remove it. In the future, we might want to expose higher level functions such as alpm_find_satisfier, or just lower level functions like splitdep and depfree together with depcmp. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d5a7dc67d93f5e530a6b3611f567eff5afe76efb Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 21:41:55 2010 +0200 alpm: kill alpm_deptest This has been replaced by the more flexible alpm_find_satisfier function, and alpm_deptest was completely unsused now. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8791ae0fdac16419d25e18acd245a65879807eb8 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 20:27:49 2010 +0200 pacman/deptest: reimplement with alpm_find_satisfier It's very easy to re-implement the -T feature with the more generic alpm_find_satisfier rather then the more specific and less useful alpm_deptest. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a03daad0734428ded0398c9d71582f90063f3493 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Tue Oct 12 20:13:32 2010 +0200 alpm: add new alpm_find_satisfier function whatprovides and splitdep were removed, so depcmp alone is quite useless now without splitdep, and deptest is not flexible enough. Introduce a new alpm_find_satisfier which is hopefully more flexible, this should make implementation of deptest very easy, and also help alpm tools such as pactree. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2cce1f46a754c04c3623088a9e43922a6c10e2d Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 31 21:39:31 2010 +0100 Fix a few problems reported by clang-analyzer One missing NULL-check and 3 dead assignments. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e39cf9275c6a6f965e364792527c2704327bd02 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 20:01:14 2010 -0600 Ensure stdin args are correctly terminated And don't require pm_targets to be empty to read from stdin either. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a35610beba1b12c37ec26ec878d3701dd669db42 Merge: 4fb3cfc 5c8083b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 19:53:20 2010 -0600 Merge branch 'maint' Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c commit 4fb3cfc48f626f84329c78351d6a8710255a35e3 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Nov 4 16:05:28 2010 -0400 Support reading package args from stdin Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: NEWS | 6 + PKGBUILD-split.proto | 1 + PKGBUILD.proto | 1 + acinclude.m4 | 28 +++- configure.ac | 15 +- contrib/Makefile.am | 2 - contrib/PKGBUILD.vim | 9 +- contrib/README | 3 - contrib/pactree.in | 322 ------------------------------- doc/pacman.8.txt | 108 +++++------ doc/pacman.conf.5.txt | 4 + etc/pacman.conf.in | 1 + lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 14 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 3 +- lib/libalpm/be_sync.c | 40 ++--- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 1 - lib/libalpm/delta.h | 3 + lib/libalpm/deps.c | 41 ++--- lib/libalpm/deps.h | 1 + lib/libalpm/diskspace.c | 319 +++++++++++++++++++++++++++++++ lib/libalpm/{log.h => diskspace.h} | 36 +++-- lib/libalpm/dload.c | 2 +- lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 14 ++ lib/libalpm/handle.h | 1 + lib/libalpm/remove.c | 5 + lib/libalpm/sync.c | 19 ++- lib/libalpm/trans.c | 2 +- lib/libalpm/util.h | 3 - po/es.po | 40 ++-- po/ru.po | 2 +- po/sv.po | 168 +++++++--------- scripts/makepkg.sh.in | 46 +++-- src/pacman/callback.c | 12 +- src/pacman/deptest.c | 14 +- src/pacman/pacman.c | 312 +++++++++++++++++++----------- src/pacman/util.c | 1 - src/pacman/util.h | 1 + src/util/.gitignore | 15 +- src/util/Makefile.am | 5 +- src/util/pactree.c | 372 ++++++++++++++++++++++++++++++++++++ test/pacman/tests/database012.py | 8 +- 45 files changed, 1261 insertions(+), 746 deletions(-) delete mode 100755 contrib/pactree.in create mode 100644 lib/libalpm/diskspace.c copy lib/libalpm/{log.h => diskspace.h} (55%) create mode 100644 src/util/pactree.c hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix possible null pointer deref in check_arch
by Dan McGee 11 Dec '10

11 Dec '10

If we have a corrupted database, a package can come through without an arch, causing the code to blow up when making strcmp() calls. It might even be possible with perfectly valid database entries lacking an 'arch =' line. This behavior was seen as at least one of the problems in FS#21668. Ensure pkgarch is not null before doing anything further. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 49fc0f6..02612ec 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -107,7 +107,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) for(i = pkgs; i; i = i->next) { pmpkg_t *pkg = i->data; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) { + if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { char *string; const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgver = alpm_pkg_get_version(pkg); -- 1.7.3.3

1 0

[pacman-dev] Alternative dependencies.
by Xyne 10 Dec '10

10 Dec '10

Hi, Would it be possible to implement support for alternative dependencies, e.g. a package that could use either wget or curl to handle downloads? I'm not asking for this to be implemented. I'm just asking whether there are any technical limitations to such an approach. I know that "provides" can be used to do this, e.g. openjdk6 and jre both provide java-runtime to satisfy that dependency in other packages. The approach is limited though. Using the example above, we couldn't simply add "provides=('download-client')" to both curl and wget because they are not interchangeable. The basic usage case is when an application is capable of detecting any one of a number of different external apps that it can use to satisfy a given dependency. There is currently no way to depend on "at least one" of those. I can imagine a very simple syntax for this too, e.g. "depends=('curl || wget')" so the question is whether the dependency-handling mechanism could be adapted to check for alternatives. If none are found, it could probably use the upcoming "provides" selection dialogue to allow the user to choose the desired dependency. So, would that be possible? Also, would that be acceptable? Again, I'm not asking anyone to do this. I'm just inquiring about the possibility. Regards, Xyne

5 7

[pacman-dev] [PATCH] Add script to update pacman database format
by Allan McRae 08 Dec '10

08 Dec '10

The pacman-db-upgrade script was added to detect old pacman database formats and upgrade them. Currently performs the merging of depends files into desc files in the local database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 7 +++++-- scripts/pacman-db-upgrade.sh.in | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 scripts/pacman-db-upgrade.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 78deb0b..7448691 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -10,14 +10,16 @@ OURSCRIPTS = \ pacman-optimize \ pkgdelta \ rankmirrors \ - repo-add + repo-add \ + pacman-db-upgrade EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ rankmirrors.sh.in \ - repo-add.sh.in + repo-add.sh.in \ + pacman-db-upgrade.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -68,5 +70,6 @@ repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +pacman-db-update: $(srcdir)/pacman-db-update.sh.in # vim:set ts=2 sw=2 noet: diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in new file mode 100644 index 0000000..e28b1d2 --- /dev/null +++ b/scripts/pacman-db-upgrade.sh.in @@ -0,0 +1,34 @@ +#!@BASH_SHELL@ -e +# +# pacman-db-upgrade - upgrade the local pacman db to a newer format +# @configure_input@ +# +# Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +DBPath="${DBPath:-@localstatedir@/lib/pacman/}/local" + +# pacman-3.4 to 3.5 upgrade - merge depends into desc +if [[ $(find $DBPath -name depends) ]]; then + echo "==> pacman-3.4 database format dectected - upgrading" + for i in $DBPath/*; do + if [[ -f $i/depends ]]; then + cat $i/depends >> $i/desc + rm $i/depends + fi + done +fi -- 1.7.3.3

2 3

[pacman-dev] [PATCH] Use size_t for alpm_list sizes
by Allan McRae 08 Dec '10

08 Dec '10

There is a lot of swtiching between size_t and int for alpm_list sizes in the codebase. Start converting these to all be size_t by adjusting the return type of alpm_list_count and fixing all additional warnings given by -Wconversion that are generated by this change. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 6 +++--- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 4 ++-- lib/libalpm/diskspace.c | 6 +++--- lib/libalpm/remove.c | 6 +++--- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 5 +++-- src/pacman/callback.h | 2 +- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b0b5a53..31a7928 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -477,7 +477,7 @@ static int extract_single_file(struct archive *archive, return(errors); } -static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, +static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, size_t pkg_count, pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0; @@ -715,7 +715,7 @@ cleanup: int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db) { - int pkg_count, pkg_current; + size_t pkg_count, pkg_current; int skip_ldconfig = 0, ret = 0; alpm_list_t *targ; diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 08d0269..86212a4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -405,7 +405,7 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, void *, int *); /* Transaction Progress callback */ -typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, int, int); +typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); int alpm_trans_get_flags(); alpm_list_t * alpm_trans_get_add(); diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80ba1ee..185295c 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -269,7 +269,7 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a * * @return the resultant list */ -alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn) +alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn) { if (n > 1) { alpm_list_t *left = list; @@ -511,7 +511,7 @@ inline alpm_list_t SYMEXPORT *alpm_list_first(const alpm_list_t *list) * * @return an alpm_list_t node for index `n` */ -alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, int n) +alpm_list_t SYMEXPORT *alpm_list_nth(const alpm_list_t *list, size_t n) { const alpm_list_t *i = list; while(n--) { @@ -574,9 +574,9 @@ void SYMEXPORT *alpm_list_getdata(const alpm_list_t *node) * * @return the number of list items */ -int SYMEXPORT alpm_list_count(const alpm_list_t *list) +size_t SYMEXPORT alpm_list_count(const alpm_list_t *list) { - unsigned int i = 0; + size_t i = 0; const alpm_list_t *lp = list; while(lp) { ++i; diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index bd639f7..19fe548 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -56,7 +56,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data); alpm_list_t *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_join(alpm_list_t *first, alpm_list_t *second); alpm_list_t *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn); -alpm_list_t *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cmp fn); +alpm_list_t *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn_cmp fn); alpm_list_t *alpm_list_remove(alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn, void **data); alpm_list_t *alpm_list_remove_str(alpm_list_t *haystack, const char *needle, char **data); alpm_list_t *alpm_list_remove_dupes(const alpm_list_t *list); @@ -67,13 +67,13 @@ alpm_list_t *alpm_list_reverse(alpm_list_t *list); /* item accessors */ alpm_list_t *alpm_list_first(const alpm_list_t *list); -alpm_list_t *alpm_list_nth(const alpm_list_t *list, int n); +alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n); alpm_list_t *alpm_list_next(const alpm_list_t *list); alpm_list_t *alpm_list_last(const alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); /* misc */ -int alpm_list_count(const alpm_list_t *list); +size_t alpm_list_count(const alpm_list_t *list); void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_fn_cmp fn); void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9dce66d..fec8979 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -422,7 +422,7 @@ int _alpm_local_db_populate(pmdb_t *db) } closedir(dbdir); - db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp); + db->pkgcache = alpm_list_msort(db->pkgcache, (size_t)count, _alpm_pkg_cmp); return(count); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b6c9937..5951f2f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -191,7 +191,7 @@ int _alpm_sync_db_populate(pmdb_t *db) } } - db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp); + db->pkgcache = alpm_list_msort(db->pkgcache, (size_t)count, _alpm_pkg_cmp); archive_read_finish(archive); return(count); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 2b0efa5..e64a00b 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -402,8 +402,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, alpm_list_t *upgrade, alpm_list_t *remove) { alpm_list_t *i, *j, *conflicts = NULL; - int numtargs = alpm_list_count(upgrade); - int current; + size_t numtargs = alpm_list_count(upgrade); + size_t current; ALPM_LOG_FUNC; diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 5ed8e0b..728fd2c 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -243,11 +243,11 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; - int replaces = 0, abort = 0; + size_t replaces = 0, current = 0; + int abort = 0; alpm_list_t *targ; pmpkg_t *pkg; - int numtargs = alpm_list_count(trans->add); - int current = 0; + size_t numtargs = alpm_list_count(trans->add); mount_points = mount_point_list(); if(mount_points == NULL) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 90848dc..fa870c1 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -368,7 +368,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) { pmpkg_t *info; alpm_list_t *targ, *lp; - int pkg_count; + size_t pkg_count; ALPM_LOG_FUNC; @@ -382,7 +382,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) char scriptlet[PATH_MAX]; info = (pmpkg_t*)targ->data; const char *pkgname = NULL; - int targcount = alpm_list_count(targ); + size_t targcount = alpm_list_count(targ); if(handle->trans->state == STATE_INTERRUPTED) { return(0); @@ -413,7 +413,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) } } - int filenum = alpm_list_count(files); + size_t filenum = alpm_list_count(files); alpm_list_t *newfiles; _alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8af32e4..2d0a899 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -801,7 +801,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) { alpm_list_t *i, *j, *files = NULL; alpm_list_t *deltas = NULL; - int replaces = 0; + size_t replaces = 0; int errors = 0; const char *cachedir = NULL; int ret = -1; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c8f604f..ec4a683 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -325,13 +325,14 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, /* callback to handle display of transaction progress */ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, - int howmany, int remain) + size_t howmany, size_t remain) { float timediff; /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; - int tmp, digits, textlen; + int digits, textlen; + size_t tmp; char *opr = NULL; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; diff --git a/src/pacman/callback.h b/src/pacman/callback.h index c56eaa7..09fe8bd 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -33,7 +33,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, /* callback to handle display of transaction progress */ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, - int howmany, int remain); + size_t howmany, size_t remain); /* callback to handle receipt of total download value */ void cb_dl_total(off_t total); -- 1.7.3.3

1 1

[pacman-dev] [PATCH] Explicitly test time difference is greater than zero
by Allan McRae 08 Dec '10

08 Dec '10

We are comparing a floating point number so should use an inequality rather than implicitly testing != 0. Prevents warning given by -Wfloat-equal. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f585b28..c8f604f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -352,7 +352,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, timediff = get_update_timediff(0); } - if(percent > 0 && percent < 100 && !timediff) { + if(percent > 0 && percent < 100 && timediff > 0) { /* only update the progress bar when * a) we first start * b) we end the progress -- 1.7.3.3

1 0

[pacman-dev] [PATCH] makepkg: perform sanity checks on variables in package functions
by Allan McRae 08 Dec '10

08 Dec '10

Check the over-ridden entries for provides, backup, optdepends and options for illegal entries. Partially fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Resubmit of patch: - Added check for valid overridden options as it uses the same technique as the other checks that were added. - Fixed PKGBUILD vs $BUILDFILE usage scripts/makepkg.sh.in | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e321d1..ac10ad3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), +# awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization @@ -1222,21 +1222,27 @@ check_sanity() { fi fi - for i in ${provides[@]}; do + local provides_list + eval $(awk '/^[[:space:]]*provides=/,/)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") + for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi done - for i in "${backup[@]}"; do + local backup_list + eval $(awk '/^[[:space:]]*backup=/,/)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") + for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" return 1 fi done - for i in "${optdepends[@]}"; do + local optdepends_list + eval $(awk '/^[[:space:]]*optdepends=/,/)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" @@ -1257,8 +1263,9 @@ check_sanity() { done local valid_options=1 - local known kopt - for i in ${options[@]}; do + local known kopt options_list + eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/") + for i in ${options_list[@]}; do known=0 # check if option matches a known option or its inverse for kopt in ${packaging_options[@]} ${other_options[@]}; do -- 1.7.3.3

1 0

[pacman-dev] [PATCH] makepkg: perform sanity checks on variables in package functions
by Allan McRae 07 Dec '10

07 Dec '10

Check the over-ridden entries for provides, backup and optdepends for illegal entries. Fixes FS#16004. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e321d1..d5ccdbf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), +# awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), # gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization @@ -1222,21 +1222,27 @@ check_sanity() { fi fi - for i in ${provides[@]}; do + local provides_list + eval $(awk '/^[[:space:]]*provides=/,/)/' PKGBUILD | sed "s/provides=/provides_list+=/") + for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi done - for i in "${backup[@]}"; do + local backup_list + eval $(awk '/^[[:space:]]*backup=/,/)/' PKGBUILD | sed "s/backup=/backup_list+=/") + for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" return 1 fi done - for i in "${optdepends[@]}"; do + local optdepends_list + eval $(awk '/^[[:space:]]*optdepends=/,/)/' PKGBUILD | sed "s/optdepends=/optdepends_list+=/") + for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" -- 1.7.3.3

2 2