- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-97-g8a8dfc9
by dan＠archlinux.org 16 Nov '09

16 Nov '09

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 8a8dfc9d55c6045d59bed6cde4ae6e2307b335ea (commit) via d2dbb04a9af7a18da217fb21b9152626c43461da (commit) via be266b43647ef57632d7bcfd07a4441f737b5aed (commit) from 120cd312e49b9fbb844dd36c71fe1f2e2910b707 (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 8a8dfc9d55c6045d59bed6cde4ae6e2307b335ea Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 15 20:21:50 2009 -0600 HACKING: add some notes about valgrind/gdb usage Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2dbb04a9af7a18da217fb21b9152626c43461da Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 11 23:39:26 2009 -0600 download: major refactor to address lingering issues Sorry for this being such a huge patch, but I believe it is necessary for quite a few reasons which I will attempt to explain herein. I've been mulling this over for a while, but wasn't super happy with making the download interface more complex. Instead, if we carefully order things in the internal download code, we can actually make the interface simpler. 1. FS#15657 - This involves `name.db.tar.gz.part` files being left around the filesystem, and then causing all sorts of issues when someone attempts to rerun the operation they canceled. We need to ensure that if we resume a download, we are resuming it on exactly the same file; if we cannot be almost postive of that then we need to start over. 2. http://www.mail-archive.com/pacman-dev@archlinux.org/msg03536.html - Here we have a lighttpd bug to ruin the day. If we send both a Range: header and If-Modified-Since: header across the wire in a GET request, lighttpd doesn't do what we want in several cases. If the file hadn't been modified, it returns a '304 Not Modified' instead of a '206 Partial Content'. We need to do a stat (e.g. HEAD in HTTP terms) operation here, and the proceed accordingly based off the values we get back from it. 3. The mtime stuff was rather ugly, and relied on the called function to write back to a passed in reference, which isn't the greatest. Instead, use the power of the filesystem to contain this info. Every file downloaded internally is now carefully timestamped with the remote file time. This should allow the resume logic to work. In order to guarantee this, we need to implement a signal handler that catches interrupts, notifies the running code, and causes it to set the mtimes on the file. It then rethrows the signal so the pacman signal handler (or any frontend) works as expected. 4. We did a lot of funky stuff in trying to track the DB last modified time. It is a lot easier to just keep the downloaded DB file around and track the time on that rather than in a funky dot file. It also kills a lot of code. 5. For GPG verification of the databases down the road, we are going to need the DB file around for at least a short bit of time anyway, so this gets us closer to that. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Xav: fixed printf with off_t] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit be266b43647ef57632d7bcfd07a4441f737b5aed Author: Laszlo Papp <djszapi2(a)gmail.com> Date: Fri Nov 13 00:59:34 2009 +0100 Refactor do/while cycle and multiple while cycles * It makes the code clearer to read/understand * Cppcheck tool doesn't show this anymore: [./util.c:215]: (error) Resource leak: fd [Dan: don't change the coding style] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 13 ++++ lib/libalpm/alpm.h | 8 +-- lib/libalpm/be_files.c | 96 ++------------------------- lib/libalpm/dload.c | 177 +++++++++++++++++++++++++++++++++--------------- lib/libalpm/dload.h | 4 +- lib/libalpm/trans.c | 5 +- lib/libalpm/util.c | 11 ++- src/pacman/pacman.c | 15 ++++- 8 files changed, 168 insertions(+), 161 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-94-g120cd31
by dan＠archlinux.org 16 Nov '09

16 Nov '09

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 120cd312e49b9fbb844dd36c71fe1f2e2910b707 (commit) via 4d2ec3751c6e7ee47cdb784ed5cab0992f03c9dc (commit) via 564352c4a2d12050d7b4c386e972976a24f1f993 (commit) via 9c34dfd908480baed06bb2e618d8899fb8728dbd (commit) via c2999619d2af0c4fa3cbee13a4f12d95c6ab059e (commit) via 966c815881350e90628a6825c4c51bc77428c0d5 (commit) via 5d5070f47d6542a530c8cbe954bb331389b7393f (commit) via fb310fc01ed752b4e046138c3695f5482ca54e16 (commit) via 77023978c568dbb912f9c103cbe14d32153c6f89 (commit) via 77e84bea71e3dfe87a8009e7e7a913d1a12b7585 (commit) via 0199a7ee717f0848e336fda8dc1f5b9364ce3478 (commit) via 88706168f2fb9ccd91f97b4647b715cc9076d5ed (commit) from 7ae15768e5558def8bdf88fe6c5c49fa6c9b08ad (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 120cd312e49b9fbb844dd36c71fe1f2e2910b707 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Tue Nov 3 08:47:18 2009 -0500 makepkg: Fixed logging for split packages Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d2ec3751c6e7ee47cdb784ed5cab0992f03c9dc Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Oct 27 12:56:13 2009 +0100 makepkg: allow the use of only a package() function For some packages, generally the 'any' arch ones, a build step is not required and therefore can be skipped. In these cases, a package() function without a build() one is sufficient. As a side effect, this commit makes meta packages without any function at all in the PKGBUILD possible. Fixes FS#15147. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 564352c4a2d12050d7b4c386e972976a24f1f993 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Mon Oct 26 13:21:43 2009 +0100 makepkg: extend test for hyphen prefixes to pkgbase and all pkgnames Since commit fb97d32, which brought in this test, support for split PKGBUILDs was added, and therefore, all values of pkgname and also pkgbase have to be checked now. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9c34dfd908480baed06bb2e618d8899fb8728dbd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 25 14:33:47 2009 +1000 makepkg: Add fallback to package function makepkg looks for a package() function when building a single package but package_$pkgname() style package functions when building a split package. This patch allows the use of a package_$pkgname() function when building a single package for consistency. This is achieved by having makepkg consider a non-split package with a package_$pkgname() function as a split package (creating just the one package). Fixes FS#16622. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2999619d2af0c4fa3cbee13a4f12d95c6ab059e Author: Isaac Good <pacman(a)isaac.otherinbox.com> Date: Thu Nov 12 15:09:05 2009 -0500 makepkg: use bash test operators, part two * FS#16623, second half of makepkg * Includes stuff like -o to ||, -a to &&, etc. * if [ $(type ... preserved due to a bash bug with [[ and set -e and ERR traps Signed-off-by: Isaac Good <pacman(a)isaac.otherinbox.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 966c815881350e90628a6825c4c51bc77428c0d5 Author: Isaac Good <pacman(a)isaac.otherinbox.com> Date: Thu Nov 12 15:07:34 2009 -0500 makepkg: use bash test operators, part one * FS#16623, first half of makepkg * Includes stuff like -o to ||, -a to &&, etc. * if [ $(type ... preserved due to a bash bug with [[ and set -e and ERR traps Signed-off-by: Isaac Good <pacman(a)isaac.otherinbox.com> [Dan: made commit message useful] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5d5070f47d6542a530c8cbe954bb331389b7393f Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Nov 5 16:55:48 2009 +0100 scripts: replace test builtin [ with shell keywords [[ and (( FS#16623 suggested this change for makepkg; this patch applies it to the remaining files in the scripts directory. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb310fc01ed752b4e046138c3695f5482ca54e16 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Nov 14 17:12:06 2009 +0100 pacman.conf : enable resuming for curl Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77023978c568dbb912f9c103cbe14d32153c6f89 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Fri Nov 6 10:16:49 2009 -0500 makepkg: Clarified error message when a sourceball exist already Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77e84bea71e3dfe87a8009e7e7a913d1a12b7585 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Nov 10 20:47:09 2009 +0100 makepkg: fix abortion after sourcing /etc/profile The source command triggers / might trigger the ERR trap which makes makepkg abort right after a successful installation of missing dependencies. Thanks to Xavier Chantry <shiningxc(a)gmail.com> for finding this solution. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0199a7ee717f0848e336fda8dc1f5b9364ce3478 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 15 20:24:24 2009 +1000 contrib/bacman: fix checking if file has been added Fixes FS#17140. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 88706168f2fb9ccd91f97b4647b715cc9076d5ed Author: Manuel Tortosa <manutortosa(a)gmail.com> Date: Mon Nov 16 00:29:16 2009 +0100 Add Catalan translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman | 4 +- doc/PKGBUILD.5.txt | 12 +- etc/pacman.conf.in | 2 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{es.po => ca.po} | 306 ++++---- po/LINGUAS | 1 + po/ca.po | 1755 +++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 465 ++++++----- scripts/pacman-optimize.sh.in | 22 +- scripts/pkgdelta.sh.in | 22 +- scripts/rankmirrors.sh.in | 12 +- scripts/repo-add.sh.in | 74 +- 12 files changed, 2225 insertions(+), 451 deletions(-) copy lib/libalpm/po/{es.po => ca.po} (51%) create mode 100644 po/ca.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] Catalan translation patch for Pacman
by Manuel Tortosa 16 Nov '09

16 Nov '09

Hi, here's the patch to add the Catalan language to Pacman. it includes both modofications to LINGUAS files + both ca.po files (pacman+libalpm) Tanks. Manuel Tortosa manutortosa(a)gmail.com

2 1

[pacman-dev] Another proposal for the "-Sy libjpeg" problem
by Nagy Gabor 15 Nov '09

15 Nov '09

Hi! I think the problem is known for everyone, if a user upgrades a package (without -Su), he can easily get "error while loading shared libraries". The most perfect (but maybe overkill) solution is Florian's one: http://www.archlinux.org/pipermail/pacman-dev/2009-August/009158.html (that patch needs some work on optdepends side, but that is not so complicated.) I mention a simpler one: Add a new switch to upgrade reversedeps too (recursively), ie. "pacman -S --reversedeps libjpeg" would upgrade all packages depend on (the local) libjpeg. This should be straightforward to implement and imho this is a bit more sophisticated than the "pacman -Syu libjpeg" request (see bugs.archlinux.org :-P). Opinions? Bye

3 2

[pacman-dev] [PATCH] contrib/bacman: fix checking if file has been added
by Allan McRae 15 Nov '09

15 Nov '09

Fixes FS#17140. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index 22940ec..dfd53e8 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -21,7 +21,7 @@ # readonly progname="bacman" -readonly progver="0.2.0" +readonly progver="0.2.1" # # User Friendliness @@ -137,7 +137,7 @@ while read i; do bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - # Workaround to bsdtar not reporting a missing file as an error - if [ ! -e "$work_dir/$i" ] && [ -L "$work_dir/$i"]; then + if [ ! -e "$work_dir/$i" -a ! -L "$work_dir/$i" ]; then echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then" -- 1.6.5.2

1 0

[pacman-dev] [PATCH] makepkg: fix abortion after sourcing /etc/profile
by Cedric Staniewski 15 Nov '09

15 Nov '09

The source command triggers / could trigger the ERR trap which makes makepkg abort right after a successful installation of missing dependencies. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- It works, but I'm totally clueless why. I would prefer a more obvious solution if we can find one (set +E ... set -E did not work for me). scripts/makepkg.sh.in | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..81f20bb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -371,10 +371,9 @@ handle_deps() { fi # we might need the new system environment - # set -e can cause problems during sourcing profile scripts - set +e - source /etc/profile &>/dev/null - set -e + # avoid triggering the ERR trap by running the + # source command in a subshell + $(source /etc/profile &>/dev/null) return $R_DEPS_SATISFIED } -- 1.6.5.2

3 6

[pacman-dev] [PATCH] pacman.conf : enable resuming for curl
by Xavier Chantry 15 Nov '09

15 Nov '09

Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- etc/pacman.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index fc841b7..3207119 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl %u > %o +#XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled Architecture = auto -- 1.6.5.2

3 2

[pacman-dev] makepkg enhancements: globstar and variable expansions in PURGE_TARGETS, MAN_DIRS, etc.
by Ciprian Dorin, Craciun 14 Nov '09

14 Nov '09

Hy everybody! While building some custom packages for a stripped down Linux server, I've hit the following problems: * the cause of the problems is from the pact that my packages are each in it's own folder like: /packages/bash--4.0--1, /packages/busybox--1.15.2--1, etc., and thus, * MAN_DIRS, DOC_DIRS, STRIP_DIRS and PRUNE_TARGETS doesn't work, as I have no way to use ${pkgname}, etc in there; * in PRUNE_TARGETS there is no way to specify file patterns (like '*.a', or '*.la'), but only from certain folders; (for example I can say '*.a', but not '../lib/*.a'; also I can not specify unknown number of parents, like '.../lib/**/*.a'; As a consequence, I propose (and if accepted I also have the patches for) the following enhancements: * allow the patterns in MAN_DIRS, etc. to be evaluated at the proper time execution time (when we access MAN_DIRS), not at configuration time (when we define MAN_DIRS); this can be achieved by (single) quoting the patterns like: 'package/${pkgname}--${pkgver}--${pkgrel}/{,share/}man' and then expansion by using eval; * allow enhanced pattern types for PURGE_TARGETS, like: * the same lazy evaluation as above; * if a pattern starts with '=' then it must exactly match a file name; * if a pattern starts with '+' then it is a glob pattern (or globstar), like: 'packages/${pkgname}--${pkgver}--${pkgrel}/lib/**/*.a' * if a pattern ends with '/' then we use `rm -Rf`, else we use `rm -f` * maybe if a pattern starts with '@' then it is a regular expression, etc. (this I have not implemented); Any comments? Also one more question: just before packaging we remove the pkg folder. Shouldn't we also do the same with src when rebuilding a package? (We are re-extracting the contents of archives, but some packages leave garbage behind when building, and this garbage could interfere with a new build...) Thanks, Ciprian.

2 10

[pacman-dev] [translation]
by Manuel Tortosa 14 Nov '09

14 Nov '09

Hello, today i start the CATALAN translation of Pacman. ------------------------------------------------------------------------------------ Manuel Tortosa manutortosa(a)gmail.com The Catalan KDE translation Team

2 1

[pacman-dev] [PATCH] Print error on duplicated database entries
by Nagy Gabor 14 Nov '09

14 Nov '09

Some users reported duplicated database entries in /var/lib/pacman/local/, for example, both foo-1.0-1 and foo-2.0-1 subdirectories existed. (Bogus 3rd-party scripts, backup?) In this case pacman reported no error and its behaviour was mysterious. >From now on, pacman detects this situation and prints an error message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/be_files.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..feb71f8 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -348,6 +348,13 @@ int _alpm_db_populate(pmdb_t *db) continue; } + /* duplicated database entries are not allowed */ + if(_alpm_pkg_find(db->pkgcache, pkg->name)) { + _alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name); + _alpm_pkg_free(pkg); + continue; + } + /* explicitly read with only 'BASE' data, accessors will handle the rest */ if(_alpm_db_read(db, pkg, INFRQ_BASE) == -1) { _alpm_log(PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name); -- 1.6.5.2

3 4