- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint now at v3.0.0-54-g09253b4
by Dan McGee 26 Oct '07

26 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, maint, as a new branch to 09253b48d60589d42d9486dd361eaaf30e364e59 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/heads/maint \ 0000000000000000000000000000000000000000 \ 09253b48d60589d42d9486dd361eaaf30e364e59

1 0

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-482-g0cff7c6
by Dan McGee 25 Oct '07

25 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 0cff7c6bdf5461c3286edc940aabb88d63345381 (commit) via 89ac8aa9c45486aa4f4b9599bb094f1d54ff1b66 (commit) via 581769b72d882fdc05bdbdc588db97187329e5b5 (commit) via aa545f6798e526dfd23779b488a86296d1f52d12 (commit) via 616668fb71db5045ae727586031ce32fd18e92cc (commit) via bd15c23e1690d0c85632d7950cd79d17c65a4e17 (commit) via 8b1fb61df26649e1dec626ef9120fc787a831fcc (commit) via 0c4f7d821c1cd4ce559476595e2108f75b3dde7c (commit) via 46eaa5c54200bfda402412e2f5b7df0eddc0230a (commit) from f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 (commit) - Log ----------------------------------------------------------------- commit 0cff7c6bdf5461c3286edc940aabb88d63345381 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Oct 25 02:31:28 2007 +0200 Add alpm_dep_get_string method Public alpm_dep_get_string function is introduced, which converts a pmdepend_t structure to printable string in %DEPENDS% format. This function is now used in pacman to print dependency error messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89ac8aa9c45486aa4f4b9599bb094f1d54ff1b66 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Oct 24 22:58:34 2007 +0200 _alpm_depmiss_isin fix The old code used memcmp, which is not good for comparing strings: "pkgname"'\0''\0' should be equal to "pkgname"'\0''a' for example. The new code uses strcmp. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 581769b72d882fdc05bdbdc588db97187329e5b5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 24 00:37:50 2007 -0500 Add strndup implemention for environments that are missing it Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa545f6798e526dfd23779b488a86296d1f52d12 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 23:27:03 2007 -0500 One more added include to help compilation elsewhere Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 616668fb71db5045ae727586031ce32fd18e92cc Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 19:24:39 2007 -0500 Replace UK mirror with a new updated one Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bd15c23e1690d0c85632d7950cd79d17c65a4e17 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 00:35:42 2007 -0500 Print and typecast time_t correctly The recommended C99 way to print the value of a time_t is to cast it to uintmax_t or intmax_t. Do this to ensure compatability with all platforms. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8b1fb61df26649e1dec626ef9120fc787a831fcc Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 23:52:55 2007 -0500 Ensure all localization stuff is correctly guarded Anything dealing with libintl and localization should be correctly guarded inside an ENABLE_NLS block on both the pacman and libalpm sides. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c4f7d821c1cd4ce559476595e2108f75b3dde7c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 21:33:47 2007 -0700 Fix broken or missing includes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 46eaa5c54200bfda402412e2f5b7df0eddc0230a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 01:43:34 2007 -0700 Fix invalid static scoping of strverscmp Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 2 +- lib/libalpm/alpm.c | 3 +++ lib/libalpm/alpm.h | 1 + lib/libalpm/be_files.c | 7 +++---- lib/libalpm/deps.c | 41 +++++++++++++++++++++++++++++++++++++++-- lib/libalpm/server.c | 5 +++-- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 16 +++++++++------- src/pacman/add.c | 18 +++--------------- src/pacman/pacman.c | 5 ++++- src/pacman/remove.c | 4 +++- src/pacman/sync.c | 19 ++++--------------- src/pacman/util.c | 23 +++++++++++++++++++++++ src/pacman/util.h | 14 +++++++++----- src/util/testdb.c | 1 + 15 files changed, 107 insertions(+), 54 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 \ 0cff7c6bdf5461c3286edc940aabb88d63345381

1 0

[pacman-dev] [PATCH] alpm_dep_get_string
by Nagy Gabor 25 Oct '07

25 Oct '07

Hi! If you look into libalpm code, you will realize that usually only depend->name is used in log/error messages; which can be confusing in some context (sometimes, alpm assumes that the missing dependency is a canonical package name). See my note here, for example: http://www.archlinux.org/pipermail/pacman-dev/2007-October/009671.html So I started to work on this. Most cases dependency is "created" with alpm_splitdep from a string; in these cases we can use that string in error messages. However, in few cases dependency "comes from" pmdepmissing_t, so we have to convert pmdepend_t to string. As a first step, I coded this converter-function; which is going to be used in resolvedeps only (in libalpm). ---------------------------- From 074e80216543c631f51079b4c27efbf8dcefff16 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba@@bibl..u-szeged..hu> Date: Thu, 25 Oct 2007 02:16:48 +0200 Subject: [PATCH] alpm_dep_get_string Public alpm_dep_get_string function is introduced, which converts a pmdepend_t structure to printable string in %DEPENDS% format. This function is now used in pacman to print dependency error messages. --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 34 ++++++++++++++++++++++++++++++++++ src/pacman/add.c | 18 +++--------------- src/pacman/remove.c | 4 +++- src/pacman/sync.c | 18 +++--------------- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 880bbeb..2000db4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); const char *alpm_dep_get_name(pmdepend_t *dep); const char *alpm_dep_get_version(pmdepend_t *dep); +char *alpm_dep_get_string(pmdepend_t *dep); /* * File conflicts diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index b7e49be..55d3ee7 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -835,4 +835,38 @@ const char SYMEXPORT *alpm_dep_get_version(pmdepend_t *dep) return dep->version; } +/* the return-string must be freed! */ +char SYMEXPORT *alpm_dep_get_string(pmdepend_t *dep) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(NULL)); + ASSERT(dep != NULL, return(NULL)); + + char *ptr; + char *depstring = malloc(sizeof(pmdepend_t)); + if(depstring == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdepend_t)); + return NULL; + } + + strcpy(depstring, dep->name); + ptr = depstring + strlen(depstring); + switch(dep->mod) { + case PM_DEP_MOD_ANY: + break; + case PM_DEP_MOD_EQ: + sprintf(ptr, "=%s", dep->version); + break; + case PM_DEP_MOD_GE: + sprintf(ptr, ">=%s", dep->version); + break; + case PM_DEP_MOD_LE: + sprintf(ptr, "<=%s", dep->version); + break; + } + + return(depstring); +} /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/add.c b/src/pacman/add.c index 0b59a23..f883a6b 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -137,26 +137,14 @@ int pacman_add(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); /* TODO indicate if the error was a virtual package or not: * :: %s: requires %s, provided by %s */ printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); - switch(alpm_dep_get_mod(dep)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(dep)); - break; - } - printf("\n"); + depstring); + free(depstring); } break; case PM_ERR_CONFLICTING_DEPS: diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 860bf49..dce479e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -129,8 +129,10 @@ int pacman_remove(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); + depstring); + free(depstring); } alpm_list_free(data); break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index bf6eed1..2da7f55 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -558,22 +558,10 @@ int sync_trans(alpm_list_t *targets, int sync_only) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); - switch(alpm_dep_get_mod(dep)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(dep)); - break; - } - printf("\n"); + depstring); + free(depstring); } break; case PM_ERR_CONFLICTING_DEPS: -- 1.5.3.4

3 2

[pacman-dev] _alpm_depmiss_isin is wrong
by Nagy Gabor 24 Oct '07

24 Oct '07

Hi! It is not a good idea to compare strings with memcmp: (abc'\0'd should be equivalent with abc'\0') Bye, ngaba

4 9

[pacman-dev] bsd port?
by Xavier 24 Oct '07

24 Oct '07

On Tue, Oct 23, 2007 at 04:03:34PM -0500, Aaron Griffin wrote: > The above applies here as well, BUT, I wanted to know where this was > being discussed. If pacman was ported to BSD, I've never seen, nor > heard of, patches for it. This would be valuable information for us. > Not only would it save us work, but Dan is doing this _right now_. > I just read the above on arch-dev-public. A while ago, someone came on IRC while no one was around to report the status of getting pacman running on freebsd : "got pacman to compile on libfetch and libdownload that are in FreeBSD 6.2 1. cut out with that damn bashism and linux non-posix crap 2. check the makefiles, they're full of bugs but all this du -cb and cp -a crap... and then the "source" syntax instead of "." and there's also chown root.root, which should be root:root, or even better 0:0" I just noted it because I thought it could be interesting, but I don't know anything about this stuff. And I thought no one else cared. But if Dan is interested in doing this, I just thought he should know about the last 3 lines of this report. If that doesn't help at all, sorry, just ignore this mail :)

5 7

[pacman-dev] Submitting Patches
by Aaron Griffin 24 Oct '07

24 Oct '07

I want to bring this up a little bit. There's lots of ideas thrown around on this list, but more often than not, no code, or cryptic patches. This does nothing. All it does is waste both mine and Dan's time. On 10/24/07, Xavier <shiningxc(a)gmail.com> wrote: > But if your patch is rejected, then you should probably also provide one > separate patch with only the small bug fixes. This should ALWAYS be the case. Submitting a patch with 5 different changes is NOT acceptable. "One feature per patch" is the way this works. This is not just pacman either. Most other open source projects do it this way. Think of it this way: if you submit a patch with 5 changes, and one change is rejected, then you need to resubmit the whole thing. If you submit 5 patches, and 4 get merged, you only need to resubmit one small patch AND you get listed in the SCM history 4 times. Yay. Secondly, if a patch is submitted, and it's broken, resubmit the patch. Don't say "oh change this". If you'd like a shining example of how this process works, take a look at Nathan's recent patches. He submitted them, in git format, they were commented on, he changed them, resubmitted, and they were merged. It's really that simple. Dan and I do not need all this extra work. What Nathan did is EXACTLY how this process should work (PS Thanks a lot Nathan) Going forward, I think we're going to have to do the following: If you want a change made, a patch MUST be sent in git format. Otherwise it will simply be rejected, not for lack of effort but for the simple fact that it's a waste of our time to have to deal with.

3 6

[pacman-dev] feature request: -Sug
by Nagy Gabor 22 Oct '07

22 Oct '07

Hi! We discussed here, that after "pacman -S group" you have to answer tons of annoying questions (even if your 'foo' package is up-to-date, you are asked if you want to install it or not) or install needless packages. Usually I want to _upgrade_ my whole _installed_ group (when my net is slow, and -Su would download hundreds of MBs); then I must do pacman -S `pacman -Qg group|awk ...` magic. Or in more general: we may add a new option to -S: upgrade-only -- not add. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 3

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-473-gf5b77eb
by Dan McGee 20 Oct '07

20 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 (commit) via e472e80c084c5e94fdc15d2f6565c50e65854372 (commit) via 520db578daf4dfe4863f9c32026460ada9131b78 (commit) via 0c2cc108d332837de4a33ca9cabe717bd414c407 (commit) via 1118e00fe91125e464e8c3487f58f6000e0036b2 (commit) via b8dba7a6faac9c44a1eda5a38b6452852e3c79be (commit) via 12e134625286be8d86f824ce2f73d1a96ac0b547 (commit) via 0ff02995f169d460d60a9512d7fa8257c74ed8f4 (commit) via 619bf56e6613333f319fb1add22fa989060e208d (commit) from 128b288ca7f396d3cbb6c9620807075274bdbe8e (commit) - Log ----------------------------------------------------------------- commit f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:54 2007 -0400 Add download size to target list. This displays the download size, taking into account delta files and cached files. This closes FS#4182. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e472e80c084c5e94fdc15d2f6565c50e65854372 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:53 2007 -0400 Download delta files if UseDelta is set. Delta files will be used if the size is smaller than a percent (MAX_DELTA_RATIO) of the package size. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 520db578daf4dfe4863f9c32026460ada9131b78 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:52 2007 -0400 Refactor md5sum checking. This will allow deltas and packages to share the md5sum checking code. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c2cc108d332837de4a33ca9cabe717bd414c407 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:51 2007 -0400 Add pmdelta_t structure and functions to libalpm. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1118e00fe91125e464e8c3487f58f6000e0036b2 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:50 2007 -0400 Add delta information to the repository database. (Dan: cleaned up one if statement) Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8dba7a6faac9c44a1eda5a38b6452852e3c79be Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 18 19:32:30 2007 -0500 Add Hungarian mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12e134625286be8d86f824ce2f73d1a96ac0b547 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Oct 19 01:18:01 2007 +0100 scripts/makepkg.sh.in: Strip bins/libs in all {bin, sbin, lib} directories. In one of the original clean up patches[1] I changed the search path for stripping binaries and libraries. This resulted in only usr/{bin,sbin,lib} being searched. This patch reverts that change. [1] 721ceee1e2c9b18425d84cf39f6541b2f04072b3 Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 0ff02995f169d460d60a9512d7fa8257c74ed8f4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Oct 18 13:26:04 2007 +0200 libalpm/package.c : fix requiredby with multiple providers. The code didn't match the following comment : "A depends on B through n depends <=> A listed in B's requiredby n times" It stopped at n=1 with a break. I was surprised to see this case happens in real, that's how I noticed the bug: wine depends on both freeglut and glut, while freeglut provides glut. So when installing wine, the update_depends function listed wine twice in freeglut's requiredby. But the compute_requiredby function (used when installing freeglut, and used by testdb) listed wine only once in freeglut's requiredby. That made testdb unhappy. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 619bf56e6613333f319fb1add22fa989060e208d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 16 08:41:37 2007 -0500 Remove rounding on package size totals We print the total to two decimal places, so there is no real need for rounding of the values. Remove the rounding and switch all output to two decimal places. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/pacman.conf.5.txt | 4 + etc/pacman.d/mirrorlist.in | 2 + lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 25 ++ lib/libalpm/alpm_list.c | 18 ++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_files.c | 19 ++ lib/libalpm/db.h | 3 +- lib/libalpm/delta.c | 265 ++++++++++++++++++++++ lib/libalpm/{conflict.h => delta.h} | 33 ++-- lib/libalpm/error.c | 5 + lib/libalpm/handle.c | 6 + lib/libalpm/handle.h | 1 + lib/libalpm/package.c | 22 ++- lib/libalpm/package.h | 1 + lib/libalpm/po/POTFILES.in | 1 + lib/libalpm/sync.c | 415 +++++++++++++++++++++++++++++++---- lib/libalpm/util.h | 3 + scripts/makepkg.sh.in | 2 +- scripts/repo-add.sh.in | 56 +++++- src/pacman/callback.c | 23 ++- src/pacman/pacman.c | 3 + src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 28 +-- src/pacman/util.h | 2 +- 26 files changed, 851 insertions(+), 92 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 128b288ca7f396d3cbb6c9620807075274bdbe8e \ f5b77eb9894ea92a08fac586ddf03e9ba70c3de8

1 0

[pacman-dev] fglrx-utils preferred over libgl-dri
by Alexander Baldeck 19 Oct '07

19 Oct '07

Hey all, I was just about to upgrade oxine and it used to only depend on xine-lib. xine-lib pulls a great deal of xorg stuff but then one strange thing happened. pacman felt like fglrx-utils would be the right package to pull to fulfill the requirement of 'libgl' on the system. Now I would like to not have that, what would happen if I were to go and change pkgname of libgl-dri to just libgl since Jan dropped libgl-mesa long ago? Pacman should prefer the real pkgname over provides, right? Cheers, -J

5 12

[pacman-dev] Round 2: Add delta information to libalpm.
by Nathan Jones 19 Oct '07

19 Oct '07

Here are the updated patches for adding delta downloading to libalpm. I had originally thought that if a delta could not be downloaded (due to md5sum or file deleted on the server), the package file should be downloaded instead. I decided not to do this because some users may be annoyed at seeing a 7MB download size but end up downloading 100MB openoffice package. If the md5sum is not correct, the output is mangled a bit. I am not sure what causes this. Proceed with installation? [Y/n] y :: Retrieving packages from test... wbox-3-1_to_4-1-i686... 7.9K 17.1M/s 00:00:00 [#####################] 100% wbox-4-1_to_4-2-i686... 0.4K 1087.1K/s 00:00:00 [#####################] 100% :: File wbox-4-1_to_4-2-i686.delta is corrupted. Do you want to delete it? [Y/n] checking delta integrity... error: failed to commit transaction (corrupted delta) Errors occurred, no packages were upgraded. Also, is it just me, or do 78% of the pactests fail?

3 8