- Pacman-dev - lists.archlinux.org

[pacman-dev] libarchive warning output
by Xavier 28 Jun '07

28 Jun '07

There is one more change with libarchive 2.2.3 vs 1.3.1 When installing a package as user, archive_read_extract now returns ARCHIVE_WARN instead of ARCHIVE_OK , because it cant set uid to 0, and also, it can't set suid for the files that have it. Currently, pacman considers it as errors, instead of warnings. I don't think it should, but I'm not sure how to handle the warning output either. Also, strerror(errno) displayed either "File exists" or "No such file or directory", I've no idea why... And archive_error_string(archive) still displays that part, but also adds more helpful message like : "Can't set UID=0: File exists" "Can't set UID=0: No such file or directoryCan't make file SUID" Since with old libarchive, these warnings weren't returned, and so not displayed, I adpated pacman to keep the same behavior for now. But if these warnings are useful, they can easily be displayed. >From 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 Mon Sep 17 00:00:00 2001 From: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu, 28 Jun 2007 19:28:34 +0200 Subject: [PATCH] libalpm/add.c : ignore libarchive warning. With libarchive 2.2.3 (previously 1.3.1), archive_read_extract now returns ARCHIVE_WARN when a package is extracted as user, because for example, UID=0 or SUID bit can't be set. This patch makes pacman not treating these warnings as errors anymore, but simply ignoring them. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b6a54b7..1ebf455 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -544,11 +544,12 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) archive_entry_set_pathname(entry, tempfile); - if(archive_read_extract(archive, entry, archive_flags) != ARCHIVE_OK) { + int ret = archive_read_extract(archive, entry, archive_flags); + if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), - entryname, strerror(errno)); + entryname, archive_error_string(archive)); alpm_logaction(_("could not extract %s (%s)"), - entryname, strerror(errno)); + entryname, archive_error_string(archive)); errors++; unlink(tempfile); FREE(hash_orig); @@ -699,10 +700,14 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) archive_entry_set_pathname(entry, filename); - if(archive_read_extract(archive, entry, archive_flags) != ARCHIVE_OK) { - _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); - alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); + int ret = archive_read_extract(archive, entry, archive_flags); + if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { + _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), + entryname, archive_error_string(archive)); + alpm_logaction(_("could not extract %s (%s)"), + entryname, archive_error_string(archive)); errors++; + continue; } /* calculate an hash if this is in newpkg's backup */ -- 1.5.2.2

1 0

[pacman-dev] Pulled changes and other things
by Dan McGee 28 Jun '07

28 Jun '07

I pulled in Andrew's bsdtar branch today, and Xavier's ready_to_pull branch, so those changes have all been pushed to the al.org tree. Thanks guys! Other things: 1. For you guys that I am pulling GIT repos from, can you do me a favor? I added some more descriptive tags to the GIT repo (v3.0.0) instead of the older uglier CVS tags (R_3_0_0). If you wouldn't mind deleting those old tags in your pushed repo, I would appreciate it so I don't keep pulling them in. By default GIT does not push tags, but it does pull them. I got rid of them on my public repo and the al.org tree; if you do the same that would be awesome. 2. What is on people's minds for a 3.1 release? I don't think its too early to start at least getting some thoughts on paper, and see what kind of timeframe we can make for ourselves. I know at least the following things are true- I've made a lot of changes recently and they need some refinement, to say the least. In addition, we seem to have a lot of outstanding libarchive issues that we should take a look at and ensure are fixed. If we need to extend the pactest framework to be able to test this better, then we should do that. Thanks to everyone that has been contributing to pacman, we definitely appreciate it, and you can see the wide variety of authors that are now in the GIT history. Hopefully some of you will venture into the big bad libalpm after dipping your toes in makepkg changes. It is what I did. :) -Dan

3 2

[pacman-dev] Color patch again
by Vojtěch Gondžala 28 Jun '07

28 Jun '07

Hi all, I rewrite the color patch from 3.0.x version. Colors are reconfigurable in pacman.conf in section [colors], if isn't anything explicity named then is using default color. Option --nocolor disable colorized output. yours opinion? :) --vogo

3 3

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-253-g7daa670
by Dan McGee 28 Jun '07

28 Jun '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 7daa6708d2afc710bebbb2dc30f4371f9d67120c (commit) via 7bdb904af5b664c1d6e47977f21f0e6bc3f8e3b0 (commit) via ad691001e20272b794d2ed574b556f520e3555c0 (commit) from 1e56e41d638fcdddc291d9a8ea183b40f4802aae (commit) - Log ----------------------------------------------------------------- commit 7daa6708d2afc710bebbb2dc30f4371f9d67120c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 23:25:04 2007 -0400 Remove lockfile configuration from frontend, make it job of libalpm I previously introduced some patches to make just about every path in pacman/libalpm configurable; doing this with the lockfile seemed a bit too far and we really should just place the lockfile where it belongs- with the DB that needs locking. More details in this thread: http://archlinux.org/pipermail/pacman-dev/2007-June/008499.html Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7bdb904af5b664c1d6e47977f21f0e6bc3f8e3b0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 22:58:21 2007 -0400 pacman.c: make parseconfig a bit more robust Don't let parseconfig overwrite settings that parseargs already made. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad691001e20272b794d2ed574b556f520e3555c0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 22:12:59 2007 -0400 Remove scriptlet START and DONE commands that we don't use The scriptlet calling had some unneeded complexity for the time being which we aren't using here. Let's get rid of it until we find a good way to implement it correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 1 - etc/pacman.conf.in | 1 - lib/libalpm/Makefile.am | 5 ----- lib/libalpm/alpm.h | 5 +---- lib/libalpm/handle.c | 17 +++++++---------- lib/libalpm/trans.c | 33 +-------------------------------- lib/libalpm/util.c | 9 +++------ lib/libalpm/util.h | 4 ---- pactest/pmtest.py | 5 ++--- pactest/util.py | 2 +- scripts/pacman-optimize.in | 2 +- src/pacman/Makefile.am | 1 - src/pacman/callback.c | 14 -------------- src/pacman/pacman.c | 35 +++++++++++++++++------------------ 14 files changed, 33 insertions(+), 101 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 1e56e41d638fcdddc291d9a8ea183b40f4802aae \ 7daa6708d2afc710bebbb2dc30f4371f9d67120c

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-250-g1e56e41
by Dan McGee 28 Jun '07

28 Jun '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 1e56e41d638fcdddc291d9a8ea183b40f4802aae (commit) via 269022ccae921ae7f7caa1aca4a7d40cb0773985 (commit) via 24c41f5190974e68444466d0d8563dbe9ab06768 (commit) via 5a3b59583740c033a5e27b61c3c38bebfd580acc (commit) via 77bbe581973d41d57edb96488fa2cf73fddc1641 (commit) via 3a27fbaae40869d513cf117609d3a56c07863cae (commit) from d821d75e255207bf84f58532e2ff65a8a2a79d42 (commit) - Log ----------------------------------------------------------------- commit 1e56e41d638fcdddc291d9a8ea183b40f4802aae Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Wed Jun 27 12:04:33 2007 +0100 scripts/makepkg.in: Use bsdtar to find packages for xdelta. When looking for old packages to create a delta from used bsdtar to read the packages .PKGINFO to check it's name and arch instead of depending on the filename of th package. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 269022ccae921ae7f7caa1aca4a7d40cb0773985 Author: Chantry Xavier <chantry.xavier(a)gmail.com> Date: Fri Jun 22 22:09:55 2007 +0100 scripts/makepkg.in: Fix creation of .FILELIST Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 24c41f5190974e68444466d0d8563dbe9ab06768 Author: Baptiste Daroussin <baptiste.daroussin(a)gmail.com> Date: Fri Jun 22 19:23:28 2007 +0100 FS7485: Replace tar/cpio/unzip with bsdtar for extracting/creating packages. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 5a3b59583740c033a5e27b61c3c38bebfd580acc Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 19:27:26 2007 -0400 Fix wrong permissions on pacnew extraction First reported here: http://bbs.archlinux.org/viewtopic.php?pid=261861 Newly created files were done with the standard umask, so those that are extracted seperately and copied to a .pacnew extension will have the wrong permissions. This should hopefully fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77bbe581973d41d57edb96488fa2cf73fddc1641 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 16:33:27 2007 -0400 Remove TODO items that have been taken care of. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a27fbaae40869d513cf117609d3a56c07863cae Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jun 28 01:20:30 2007 +0200 libalpm/remove.c : file variable used before being initialized. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Diffstat: TODO.aaron | 16 ---------------- TODO.dan | 17 ----------------- lib/libalpm/remove.c | 3 ++- lib/libalpm/util.c | 15 +++++++++++++++ scripts/makepkg.in | 44 +++++++++++++++++--------------------------- 5 files changed, 34 insertions(+), 61 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ d821d75e255207bf84f58532e2ff65a8a2a79d42 \ 1e56e41d638fcdddc291d9a8ea183b40f4802aae

1 0

[pacman-dev] makepkg creates bad .FILELIST
by Andrew Fyfe 27 Jun '07

27 Jun '07

This patch[1] breaks the creation of .FILELIST, directories don't end with / so pacman treats them as files and does conflict checks and bails out because /usr (or any other dir) has already been installed by another package. Posted a patch[2] to my ready_to_pull branch. [1] http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=430a19c604e474e9… [2] http://repo.or.cz/w/pacman.git?a=shortlog;h=ready_to_pull Andrew

4 11

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-244-gd821d75
by Dan McGee 27 Jun '07

27 Jun '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 d821d75e255207bf84f58532e2ff65a8a2a79d42 (commit) via 31cbbbf95365e5b821e3f93301e808a973035b2d (commit) from 0e4c1e86ed16c4793b9521e8152b30cc166aae68 (commit) - Log ----------------------------------------------------------------- commit d821d75e255207bf84f58532e2ff65a8a2a79d42 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 27 09:55:20 2007 -0400 Add archlinux.de mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31cbbbf95365e5b821e3f93301e808a973035b2d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Jun 26 15:27:56 2007 -0400 Add pactest to help debug FS #7415 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 1 + pactest/tests/sync022.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 0e4c1e86ed16c4793b9521e8152b30cc166aae68 \ d821d75e255207bf84f58532e2ff65a8a2a79d42

1 0

[pacman-dev] libarchive issue
by Xavier 27 Jun '07

27 Jun '07

Upgrading to the last libarchive fixed some problems, but also caused a new one : http://bugs.archlinux.org/task/7484 I tried to look at it, since Dan was away, but miserably failed. I'm afraid this one is way too hard for me, I found all libarchive related stuff very confusing, and couldn't make any sense of it. All that is left is even more questions. Sorry about that :( Maybe I'll keep trying, if we can take the time to fix this, and if no one else can figure it out. The main questions I've (already in the bug comments) are : 1) why pacman got permission of /tmp wrong with old libarchive, while old bsdtar gets them right? 2) is the ARCHIVE_EXTRACT_NO_OVERWRITE option the only way in libarchive to avoid losing symlinks ? And does this option do what we want? I'm afraid both questions require some investigations for being answered.

2 4

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm.c)
by Dan McGee 26 Jun '07

26 Jun '07

Date: Tuesday, June 26, 2007 @ 15:35:00 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.128 -> 1.129) Add fix for config parsing issue in case of another pacman 3.0.X release --------+ alpm.c | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.128 pacman-lib/lib/libalpm/alpm.c:1.129 --- pacman-lib/lib/libalpm/alpm.c:1.128 Tue Apr 3 23:59:36 2007 +++ pacman-lib/lib/libalpm/alpm.c Tue Jun 26 15:35:00 2007 @@ -940,6 +940,7 @@ } _alpm_strtrim(key); strncpy(origkey, key, min(255, strlen(key))); + origkey[min(255, strlen(key))] = '\0'; key = _alpm_strtoupper(key); if(!strlen(section) && strcmp(key, "INCLUDE")) { RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1);

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-242-g0e4c1e8
by Dan McGee 26 Jun '07

26 Jun '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 0e4c1e86ed16c4793b9521e8152b30cc166aae68 (commit) via 7653bb93997f52848b54ab80868cd6da52808a75 (commit) from da66bedf4f98897dfc350195314089028050fa7d (commit) - Log ----------------------------------------------------------------- commit 0e4c1e86ed16c4793b9521e8152b30cc166aae68 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Jun 26 12:00:22 2007 -0400 Add sync301 pactest- pacman gains new deps and should be pulled in Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7653bb93997f52848b54ab80868cd6da52808a75 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Mon Jun 18 10:32:38 2007 -0400 Make alpm_splitdep immutable The alpm_splitdep function formerly overwrote the input string, causing a few issues. Fix this. Signed-off-by: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: lib/libalpm/deps.c | 14 +++++++++----- pactest/tests/sync301.py | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ da66bedf4f98897dfc350195314089028050fa7d \ 0e4c1e86ed16c4793b9521e8152b30cc166aae68

1 0