May 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add simple vercmp test script
by Dan McGee 31 May '08

31 May '08

Commit 84283672853350a84d2a71b72dc06e180cad1587 updated the versioncmp code in libalpm. Unfortunately for us, it also introduced the regression that becomes apparant with the following upgrade: warning: sonata: local (1.5-2) is newer than extra (1.5.1-2) Add a vercmptest.sh test script that is run during the make check phase which now points out three regressions in the version comparison function that will need fixing. All current tests in this script pass with the old versioncmp code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Makefile.am | 6 ++- pactest/vercmptest.sh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100755 pactest/vercmptest.sh diff --git a/Makefile.am b/Makefile.am index dc08542..ea3b0e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,12 +11,14 @@ EXTRA_DIST = HACKING pkgdatadir = ${datadir}/${PACKAGE} dist_pkgdata_DATA = PKGBUILD.proto proto.install ChangeLog.proto -# run the pactest test suite -check-local: src/pacman +# run the pactest test suite and vercmp tests +check-local: pactest src/pacman src/util $(PYTHON) $(top_srcdir)/pactest/pactest.py --debug=1 \ --test $(top_srcdir)/pactest/tests/*.py \ -p $(top_builddir)/src/pacman/pacman rm -rf $(top_builddir)/root + $(SH) $(top_srcdir)/pactest/vercmptest.sh \ + $(top_builddir)/src/util/vercmp # create the pacman DB and cache directories upon install install-data-local: diff --git a/pactest/vercmptest.sh b/pactest/vercmptest.sh new file mode 100755 index 0000000..62a3e32 --- /dev/null +++ b/pactest/vercmptest.sh @@ -0,0 +1,77 @@ +#!/bin/sh +# +# vercmptest - a test suite for the vercmp/libalpm program +# +# Copyright (c) 2008 by Dan McGee <dan(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/>. + +# default binary if one was not specified as $1 +bin='vercmp' +# holds count of failed tests +failure=0 + +# args: +# fail ver1 ver2 ret expected +fail() { + echo "unexpected failure:" + echo " ver1: $1 ver2: $2 ret: $3 expected: $4" + failure=$(expr $failure + 1) +} + +# args: +# runtest ver1 ver2 expected +runtest() { + ret=$($bin $1 $2) + [ $ret -eq $3 ] || fail $1 $2 $ret $3 +} + +# use first arg as our binary if specified +[ -n "$1" ] && bin="$1" + +# BEGIN TESTS + +# all similar length, no pkgrel +runtest 1.5.0 1.5.0 0 +runtest 1.5.0 1.5.1 -1 +runtest 1.5.1 1.5.0 1 + +# mixed length +runtest 1.5 1.5.1 -1 +runtest 1.5.1 1.5 1 + +# with pkgrel, simple +runtest 1.5.0-1 1.5.0-1 0 +runtest 1.5.0-1 1.5.0-2 -1 +runtest 1.5.0-1 1.5.1-1 -1 +runtest 1.5.0-2 1.5.1-1 -1 + +# with pkgrel, mixed lengths +runtest 1.5-1 1.5.1-1 -1 +runtest 1.5-2 1.5.1-1 -1 +runtest 1.5-2 1.5.1-2 -1 + +# mixed pkgrel inclusion +runtest 1.5 1.5-1 0 +runtest 1.5-1 1.5 0 + +#END TESTS + +if [ $failure -eq 0 ]; then + echo "All tests successful" + exit 0 +fi + +echo "$failure failed tests" +exit 1 -- 1.5.5.3

1 1

Re: [pacman-dev] vercomp test - Was: [GIT] The official pacman repository branch, master, updated. v3.1.4-182-gb48f703
by Dan McGee 30 May '08

30 May '08

On Thu, May 29, 2008 at 11:50 PM, Allan McRae <mcrae_allan(a)hotmail.com> wrote: > Dan McGee wrote: >> >> On Thu, May 29, 2008 at 10:55 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: >> >> Let me know what you think of my latest working branch commit, this >> solves the original problem as well as makes the vercmptest.sh script >> a bit more powerful. >> >> http://code.toofishes.net/gitweb.cgi?p=pacman.git;a=commitdiff;h=c574bfd8e3… >> > > Are these comparison really what is wanted? > runtest 1.5 1.5-1 0 > runtest 1.5-1 1.5 0 > runtest 1.1-1 1.1 0 Yes, quite sure. First off, we have the old behavior, which matches the above. Second, we have the reason for the old behavior, which is that a depend can be specified as such: foobar<=1.5 and foobar 1.5-13 needs to meet this requirement (aka 1.5 cmp 1.5-13 should yield 0). So a pkgrel is no sign of being newer, only a sign of something different to compare, and not to be compared until the versions are identical. > I would have assumed the package with the pkgrel is newer. In the current > situation version 1.5 is equivalent to 1.5-1, 1.5-2, 1.5-3, etc. I think > this would be better: > > } else if(*ptr1 == '-') { > /* ptr1 has hit the pkgrel and ptr2 has not. > * version 2 is newer iff we are not at the end of ptr2 > */ > - ret = *ptr2 ? -1 : 0; > + ret = *ptr2 ? -1 : 1; > goto cleanup; > } else if(*ptr2 == '-') { > /* ptr2 has hit the pkgrel and ptr1 has not. > * version 1 is newer iff we are not at the end of ptr1 > */ > - ret = *ptr1 ? 1 : 0; > + ret = *ptr1 ? 1 : -1; > goto cleanup; > } > > Allan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-182-gb48f703
by Dan McGee 30 May '08

30 May '08

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 b48f703aa6da7d9863501df1488f851313998ebe (commit) via 009f89c4d21fc08f16d648d8341137d36b0cde96 (commit) via b32aa81b5eb00b5e07295f6bdfeb294a340842b8 (commit) via 62ee1bfff08b358a11e08194adc5774a8a1cdf51 (commit) via 1cca4ef764519c00326dc81669b2bbd4bf1b978f (commit) via b262ddb2edb8a4622a9cd3c50f245a6fa7f35f75 (commit) via f30dab4b5a382bc4886af6b64f721fd2b4884283 (commit) via c1a5616c26a5c175c65dea61ca74a622c6930df8 (commit) via da1c11cc30d0286f07d46bf2d910482c9a72f31c (commit) via ad54b286802fd739532c9fd6f3bc6c7c431bddf4 (commit) via ae40d1c05b2a164e922a19ddece1334bf5e55330 (commit) via 9577c07d867eb0887bd524dc1cdaaa188fbe82f3 (commit) via c33cabd6751d1d5903898c911701ce20cf77598d (commit) via 20ae871940b8b7f773b0fdc31f8e053cc3cf4884 (commit) via b9369a747d0c2fa3ee8371f99f5ca7acbc89f7f9 (commit) via 149839c5391e9a93465f86dbb8d095a0150d755d (commit) via 1d71079c5b57af2feb53fbfa98f93122a32ca154 (commit) via 398d4aff2dc25585e51310ba2f7f8d64a9f52081 (commit) from bf2964dc5841f49d1d5ab60181b0caa4670c1874 (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 b48f703aa6da7d9863501df1488f851313998ebe Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 29 17:21:46 2008 -0500 Add missing NULL set in group printing If we don't set the pkgname var to NULL, we run into all sorts of beautiful segfault behavior when a group spans multiple repositories and we try to print out the location of the former list. Easy fix. This regression was introduced in bf8670036907b3ede18d37b7a3f0f7e14542a5ac. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 009f89c4d21fc08f16d648d8341137d36b0cde96 Merge: b32aa81b5eb00b5e07295f6bdfeb294a340842b8 398d4aff2dc25585e51310ba2f7f8d64a9f52081 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 29 06:39:29 2008 -0500 Merge branch 'maint' commit b32aa81b5eb00b5e07295f6bdfeb294a340842b8 Author: Geoffroy Carrier <geoffroy.carrier(a)koon.fr> Date: Mon May 26 23:35:28 2008 +0200 Add trailing / to DESTDIR for stupid Makefiles. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62ee1bfff08b358a11e08194adc5774a8a1cdf51 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon May 26 16:27:06 2008 +1000 Tidy up of the handle struct in libalpm Removed unused handle->uid from pmhandle_t. The need to check permissions should be determined by the frontend (and is in pacman). Fixed comment on noextract in pmhandle_t. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1cca4ef764519c00326dc81669b2bbd4bf1b978f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon May 26 23:28:34 2008 +0200 Remove PM_TRANS_EVT_EXTRACT_START. This event was unused, was missing the equivalent EXTRACT_DONE event, and was useless because we already have ADD / UPGRADE START and DONE events. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b262ddb2edb8a4622a9cd3c50f245a6fa7f35f75 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu May 22 23:59:10 2008 +0200 be_files : stores REPLACES and FORCE in desc. repo-add and db_read both assume that REPLACES and FORCE fields are in the desc file, so do that for db_write as well (instead of depends file). Note that db_write is currently only used on the local database. And the only purpose of replaces and force in local database is for information purpose (available on -Qi operations). So this is not a big problem. Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-May/011859.html Acked-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f30dab4b5a382bc4886af6b64f721fd2b4884283 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon May 19 21:39:59 2008 +1000 Pactests for sync operations with NoUpgrade and NoExtract This adds the sync equivalents of upgrade010.py and upgrade070.py. Both additional test pass. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Acked-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c1a5616c26a5c175c65dea61ca74a622c6930df8 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Tue May 13 20:26:11 2008 +1000 makepkg - add check for valid options in PKGBUILD This patch removes the code block in makepkg that checked for depreciated options in a PKGBUILD and provided a workaround. Unknown and depreciated options are upgraded to error conditions. Also, removed TODO regarding including install script if exists and $install is unset. That should never happen. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit da1c11cc30d0286f07d46bf2d910482c9a72f31c Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat May 3 19:59:11 2008 +0200 Add some verbosity to _alpm_db_read. Name and version are computed from "/var/lib/pacman/..." pathname. And the %NAME% and %VERSION% fields from the desc file were not even read. So now, when we read the desc file, we make sure the %NAME% and %VERSION% fields are consistent. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad54b286802fd739532c9fd6f3bc6c7c431bddf4 Author: Nagy Gabor <ngaba at bibl.u-szeged.hu> Date: Sat Apr 19 22:31:22 2008 +0200 Fix for remove052.py by moving recursedeps before checkdeps. In the case of -Rs operation, first pulling the dependencies with recursedeps before calling checkdeps takes care of the dependency chain of remove052 pactest. In the case of -Rcs, we can keep the old behavior because we have no problem there (any dependency returned by checkdeps will be added to the remove list because of -Rc) and we have to run recursedeps on the final remove list anyway to catch all orphans. Ref.: http://www.archlinux.org/pipermail/pacman-dev/2008-April/011569.html Signed-off-by: Nagy Gabor <ngaba at bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae40d1c05b2a164e922a19ddece1334bf5e55330 Author: Allan McRae <mcrae_allan at hotmail.com> Date: Thu Apr 3 16:35:14 2008 +1000 Pactest for removing multiple items in a dependency chain. This adds a test for when removing multilpe packages recursively from a chain of dependent packages. This situation can occur when removing installed dependencies with makepkg if a "makedepend" recursively depends on a "depend" or if redundant dependancies are included. Signed-off-by: Allan McRae <mcrae_allan at hotmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9577c07d867eb0887bd524dc1cdaaa188fbe82f3 Author: Allan McRae <mcrae_allan at hotmail.com> Date: Thu Apr 3 01:07:25 2008 +1000 No error in makepkg when removing deps fails Catches error from when pacman is unable to remove dependencies after successfully building package and prints warning. Fixes FS#10039. Signed-off-by: Allan McRae <mcrae_allan at hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c33cabd6751d1d5903898c911701ce20cf77598d Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Wed May 28 03:22:08 2008 +0800 Use chown 0:0 instead of root.root On BSD systems using a dot as a separator is not allowed. On Mac OSX it is deprecated. A colon should be used instead. BSD systems also use the "wheel" group instead of "root" to indicate the "super user" group. Both groups use the id of 0. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Acked-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Acked-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20ae871940b8b7f773b0fdc31f8e053cc3cf4884 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Wed May 28 03:23:56 2008 +0800 Use "legacy mode" on Mac OSX (for file command) For some reason `file` on Mac OSX has different arguments than BSD and Linux; -i no longer prints out the mime strings. With the environment variable COMMAND_MODE set to "legacy", `file` behaves more like it does on Linux and BSD, i.e., `file -i` prints the mime type. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Acked-by: Dan McGee <dan(a)archlinux.org> Acked-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9369a747d0c2fa3ee8371f99f5ca7acbc89f7f9 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Tue May 27 14:00:51 2008 +0800 Allow an unprivileged user to create packages without fakeroot When fakeroot was not in BUILDENV and the user was not root, makepkg still tried to use fakeroot for building packages. BUILDENV is now checked to see if fakeroot is enabled. If it is not enabled the package can still be built, but root will not have ownership of files. This is useful when users want to make packages for personal use and don't care about ownership. Closes FS#10450. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 149839c5391e9a93465f86dbb8d095a0150d755d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon May 26 23:46:01 2008 +0200 du -b is not available on BSD, use du -k instead. This fixes FS#10459. There is apparently no portable ways to get the apparent size of a file, like du -b does. So the best compromise seems to get the block size in kB, and then convert that to byte so that we keep compatibility. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d71079c5b57af2feb53fbfa98f93122a32ca154 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Wed May 21 01:51:38 2008 +0800 Replace usage of "cp -s" with the more portable "ln -s" The "-s" argument does not exist on BSD, and neither does "--remove-destination". This patch replaces the calls to "cp -s --remove-destination" with the equivalent "rm -f" and "ln -s" calls, in order to increase portability. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 2 +- lib/libalpm/add.c | 1 - lib/libalpm/alpm.h | 2 - lib/libalpm/be_files.c | 41 ++++-- lib/libalpm/handle.c | 3 - lib/libalpm/handle.h | 3 +- lib/libalpm/remove.c | 8 +- pactest/tests/{remove051.py => remove052.py} | 9 +- pactest/tests/{upgrade070.py => sync500.py} | 12 +- pactest/tests/{upgrade010.py => sync501.py} | 10 +- po/zh_CN.po | 178 +++++++++++++------------- scripts/makepkg.sh.in | 74 +++++++----- scripts/repo-add.sh.in | 4 +- src/pacman/callback.c | 1 - src/pacman/sync.c | 6 +- 15 files changed, 192 insertions(+), 162 deletions(-) copy pactest/tests/{remove051.py => remove052.py} (63%) copy pactest/tests/{upgrade070.py => sync500.py} (50%) copy pactest/tests/{upgrade010.py => sync501.py} (76%) hooks/post-receive -- The official pacman repository

4 4

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-12-g398d4af
by Dan McGee 30 May '08

30 May '08

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 398d4aff2dc25585e51310ba2f7f8d64a9f52081 (commit) from e3d35b3274f13cc9ed8d79fa873d6348e424259e (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: po/zh_CN.po | 178 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 89 insertions(+), 89 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Fixing command line argument parsing in makepkg
by Sebastian Nowicki 28 May '08

28 May '08

I have not tested this on many systems, but when running into another "bug", I noticed that makepkg doesn't parse command line options correctly on Mac OS X: > $ sudo makepkg --asroot > ==> ERROR: Running makepkg as root is a BAD idea and can cause > permanent, catastrophic damage to your system. If you > wish to run as root, please use the --asroot option. I'm not sure if this has something to do with my settings, or zsh (I did test in bash), but there is a problem. After running getopt, it appears $@ gets altered. The following is the output of makepkg with an additional "echo $@" just after running getopt: > $ makepkg -h > -- AbcCdefFghiLmop:rRsSV -l > ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,fo > rcever:,geninteg,help,holdver,install,log,nocolor,nobuild,rmdeps,repac > kage,source,syncdeps,usesudo,version,noconfirm,noprogressbar > -n makepkg -- -h makepkg proceeds as if -h was not supplied. The patch in the following mail attempts to fix this by using $ARGLIST, which does have the correct command line arguments. I did not test this patch on linux or other systems, or really tested it much at all, but the command line arguments do seem to get noticed and parsed properly. I didn't really write the patch as a solution, I just wanted to bring something to the table. I am not familiar with makepkg so it'd be best for other people to look into this. After applying the patch, $@ no longer gets shifted, and I saw use of OPT_IND, which never gets used, but it did scare me off a bit. Not shifting the command line arguments may result in regressions, but the solution provided is a simple one.

6 25

[pacman-dev] [PATCH] Use colon instead of dot separator for chown
by Sebastian Nowicki 28 May '08

28 May '08

On BSD systems using a dot as a separator is not allowed. On Mac OSX it is deprecated. A colon should be used instead. BSD systems also use the "wheel" group instead of "root" to indicate the "super user" group. Both groups use the id of 0. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..1209bd0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -629,8 +629,8 @@ extract_sources() { done if [ $EUID -eq 0 ]; then - # chown all source files to root.root - chown -R root.root "$srcdir" + # chown all source files to root:0 + chown -R root:0 "$srcdir" fi } -- 1.5.5.1

4 6

[pacman-dev] [PATCH] Replace usage of "cp -s" with the more portable "ln -s"
by Sebastian Nowicki 28 May '08

28 May '08

The "-s" argument does not exist on BSD, and neither does "--remove-destination". This patch replaces the calls to "cp -s --remove-destination" with the equivalent "rm -f" and "ln -s" calls, in order to increase portability. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f56bcda..9da3687 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -435,11 +435,13 @@ download_sources() { local file=$(strip_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" - cp -s --remove-destination "$startdir/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$startdir/$file" "$srcdir/" continue elif [ -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Using cached copy of %s")" "$file" - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" continue fi @@ -464,7 +466,8 @@ download_sources() { if echo "$dlclient" | grep -q "%o" ; then mv -f "$SRCDEST/$file.part" "$SRCDEST/$file" fi - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" done popd &>/dev/null -- 1.5.4.5

4 15

[pacman-dev] [PATCH] Tidy up of the handle struct in libalpm
by Allan McRae 27 May '08

27 May '08

Removed unused handle->uid from pmhandle_t. The need to check permissions should be determined by the frontend (and is in pacman). Fixed comment on noextract in pmhandle_t. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/handle.c | 3 --- lib/libalpm/handle.h | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5f209d4..c01dd55 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <limits.h> #include <sys/types.h> #include <syslog.h> @@ -53,8 +52,6 @@ pmhandle_t *_alpm_handle_new() handle->lckfd = -1; handle->logstream = NULL; - /* see if we're root or not */ - handle->uid = geteuid(); handle->root = NULL; handle->dbpath = NULL; handle->cachedirs = NULL; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5051917..9c537b1 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -30,7 +30,6 @@ typedef struct _pmhandle_t { /* internal usage */ - uid_t uid; /* current UID */ /* TODO is this used? */ pmdb_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (pmdb_t *) */ FILE *logstream; /* log file stream pointer */ @@ -50,7 +49,7 @@ typedef struct _pmhandle_t { /* package lists */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ - alpm_list_t *noextract; /* List of packages NOT to extract */ /*TODO is this used?*/ + alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ alpm_list_t *ignoregrp; /* List of groups to ignore */ -- 1.5.5.1

3 2

[pacman-dev] pacman-contrib package
by Allan McRae 27 May '08

27 May '08

Hi everyone, With the release of pacman 3.1.2 I was reminded to get around to putting a pacman-contrib package into AUR/community like I said I would [1]. I have categorized the files in the contrib directory below. Utilities: pacdiff pacsearch re-pacman (needs some updates? [2]) wget-xdelta.sh vim: PKGBUILD.vim vimproject (needs updated - developer use only) Included in pacman package: bash_completion zsh_completion Old: gensync updatesync I think the pacman-contib package should only include pacdiff, pacserach, re-pacman, PKGBUILD.vim. I did a very quick review of the files to check if they still work with the current pacman. As far as I can tell pacdiff and pacsearch don't need updated. I will look into updating re-pacman as I don't see any commits to this file since [2]. No idea about the status with PKGBUILD.vim - I don't use vim for PKGBUILDs so can someone else comment here. Any comments on the status of these scripts or list of scripts to be included? Thanks, Allan [1] http://www.archlinux.org/pipermail/pacman-dev/2008-February/011076.html [2] http://www.archlinux.org/pipermail/pacman-dev/2008-January/010788.html

6 15

[pacman-dev] [PATCHES] Refreshed PKGBUILDs
by Geoffroy Carrier 26 May '08

26 May '08

Hi! See patches as attachments. Globally cosmetic changes. Assumptions: - $startdir should be used as $srcdir and $pkgdir parent, as it could be useful, for example, to have $pkgdir in a tmpfs => Removed any reference to "$startdir/pkg" or "$startdir/src" => Relative paths to switch between $srcdir and $pkgdir should be avoided. E.g.: cd $srcdir/A patch [...] < ../../pkg/ is non-sense - $pkgdir and $srcdir could contain namespaces, etc. and we shouldn't try to guess about $IFS => "$srcdir/A" instead of $srcdir/A (use of "") - Still, lightweight means smater => Don't use "$_svntrunk" ${something} instead of $_svntrunk $something - "folder" is prefered to "folder/" in our scripts, but we should not suppose a makefile doesn't use something like "${DESTDIR}usr/bin" => DESTDIR="$pkgdir/", "$pkgdir" otherwise Have a nice day ;) -- Geoffroy Carrier http://gcarrier.koon.fr/

4 3