- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-262-g89ed15c
by Dan McGee 02 Jul '07

02 Jul '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 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 (commit) via 7a42e24400499873c3b9e1e2315edc808d753734 (commit) via f55f7f100f650ff040f8721cf761a060af1c05fe (commit) via cd3a63681338b7510846837dcc169d276cf75458 (commit) via 19f66083f0aef92af84761fd62245270e97c6f33 (commit) via d70116bfbc535cac9eb941a570c34479e68a1b8d (commit) from 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 (commit) - Log ----------------------------------------------------------------- commit 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 2 00:57:47 2007 +0200 pacman/packages.c : print an error for files that can't be stated. The -Ql operation is supposed to print all files but directories. stat was used for detecting directories. However, when stat failed, (because the file doesn't exist or is not readable), the files were still displayed just like the others. Now, these files are printed on stderr, with the corresponding error message. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 7a42e24400499873c3b9e1e2315edc808d753734 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jun 30 00:49:17 2007 +0200 libalpm/add.c : fix for FS #7484 Adds the ARCHIVE_EXTRACT_NO_OVERWRITE libarchive flags for extracting files and directories. This will prevent symlinks for being overwritten by directories. All other files that need to be extracted should already have been deleted previously by pacman. This flag is not used for extracting files in backup array to /tmp/alpm_XXXX, because this file is created by mkstemp first, and so needs to be overwritten by the file from the archive. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit f55f7f100f650ff040f8721cf761a060af1c05fe Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 2 02:12:36 2007 +0200 libalpm/add.c,util.c : log ARCHIVE_WARN warning to debug output. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit cd3a63681338b7510846837dcc169d276cf75458 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 20:22:42 2007 -0400 Remove unnecessary and extra includes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19f66083f0aef92af84761fd62245270e97c6f33 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 20:03:15 2007 -0400 Add mode and type checking to pactest for files Add the ability to check the permissions and type of a file within the framework of pactest. Two new rules can be used: self.addrule("FILE_TYPE=bin/foo|file") self.addrule("FILE_MODE=bin/bar|644") TODO: add the ability to add different types of files (eg links) via the test package building framework, and add the ability to change the modes on files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d70116bfbc535cac9eb941a570c34479e68a1b8d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 18:40:43 2007 -0400 Move Doxygen manpage generation to doc/ directory Instead of doing the doxygen work in the libalpm/ dir, do it with the rest of the docs in the doc/ dir. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: {lib/libalpm => doc}/Doxyfile | 25 +++------------------- doc/Makefile.am | 9 +++++++- lib/libalpm/Makefile.am | 10 --------- lib/libalpm/add.c | 22 +++++++++++++++++-- lib/libalpm/db.c | 7 ------ lib/libalpm/remove.c | 7 ------ lib/libalpm/server.c | 1 - lib/libalpm/sync.c | 2 - lib/libalpm/util.c | 17 +++++++++++--- pactest/pmrule.py | 45 ++++++++++++++++++++++++++-------------- pactest/tests/mode001.py | 12 +++++++++++ pactest/tests/type001.py | 13 +++++++++++ src/pacman/package.c | 11 +++++++-- 13 files changed, 106 insertions(+), 75 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 \ 89ed15c9c2dd5449d50e5ec2283a4d6ebac5f328

1 0

[pacman-dev] pacman -Ql
by Xavier 02 Jul '07

02 Jul '07

I found it weird that pacman -Ql listed two directories : pacman -Ql | grep "/$" cups /var/spool/cups/tmp/ ttf-ms-fonts /tmp/ttf-ms-fonts/ I found the explanation here : http://bbs.archlinux.org/viewtopic.php?pid=259654#p259654 I think this code is wrong, but don't know how to fix it.. Why does it have to use stat for dir though ? Can't it just check for the trailing slash ? And then, stat could be used for the feature request of this thread, ie checking that all files from package actually exist on the filesystem. But in this case, root access will be needed here, otherwise it'll get it wrong..

2 3

[pacman-dev] [PATCH] Change the exit code for pacman_deptest() and some clean up.
by Andrew Fyfe 01 Jul '07

01 Jul '07

Changed the exit code for missing deps from 1 to 128 because 1 is used for other errors. makepkg breaks if pacman exits with 1 for any reason other than a missing dep. Changed alpm_splitdeps( deptest ) so it doesn't change the value of deptest. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- lib/libalpm/deps.c | 4 +++- scripts/makepkg.in | 2 +- src/pacman/deptest.c | 16 +++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 524136b..b259c4b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -442,7 +442,9 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) if(depstring == NULL) { return(NULL); } - newstr = strdup(depstring); + + newstr = calloc(strlen(depstring)+1, sizeof(char)); + strncpy(newstr, depstring, strlen(depstring)); depend = malloc(sizeof(pmdepend_t)); if(depend == NULL) { diff --git a/scripts/makepkg.in b/scripts/makepkg.in index 8be44c6..12459f9 100644 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -296,7 +296,7 @@ check_deps() { pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ $ret -eq 1 ]; then #unresolved deps + if [ $ret -eq 128 ]; then #unresolved deps echo "$pmout" elif [ $ret -ne 0 ]; then error "$(gettext "Pacman returned a fatal error (%i): %s")" "$ret" "$pmout" diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 264ba1c..8a731ae 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -27,6 +27,7 @@ #include <alpm.h> #include <alpm_list.h> +#include <deps.h> /* pacman */ #include "pacman.h" @@ -52,20 +53,14 @@ int pacman_deptest(alpm_list_t *targets) alpm_list_t *j, *provides; target = alpm_list_getdata(i); - - /* splitdep modifies the string... we'll compensate for now */ - char *saved_target = NULL; - saved_target = calloc(strlen(target)+1, sizeof(char)); - strncpy(saved_target, target, strlen(target)); - dep = alpm_splitdep(target); - pkg = alpm_db_get_pkg(alpm_option_get_localdb(), target); + pkg = alpm_db_get_pkg(alpm_option_get_localdb(), dep->name); if(pkg && alpm_depcmp(pkg, dep)) { found = 1; } else { /* not found, can we find anything that provides this in the local DB? */ - provides = alpm_db_whatprovides(alpm_option_get_localdb(), target); + provides = alpm_db_whatprovides(alpm_option_get_localdb(), dep->name); for(j = provides; j; j = alpm_list_next(j)) { pmpkg_t *pkg; pkg = alpm_list_getdata(j); @@ -78,10 +73,9 @@ int pacman_deptest(alpm_list_t *targets) } if(!found) { - printf("%s\n", saved_target); - retval = 1; + printf("%s\n", target); + retval = 128; } - free(saved_target); } return(retval); } -- 1.5.2.2

3 12

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-256-g2657a2b
by Chantry Xavier 29 Jun '07

29 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 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 (commit) via 1a3b3bc1300b42dc2f554a6faa09b5ece2d3321c (commit) from 78bac81a58355a6d42760e1974005dbcdd8e8dcf (commit) - Log ----------------------------------------------------------------- commit 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jun 28 19:28:34 2007 +0200 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> commit 1a3b3bc1300b42dc2f554a6faa09b5ece2d3321c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jun 28 16:59:34 2007 +0200 libalpm/util.c : stat returns 0 on success Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Diffstat: lib/libalpm/add.c | 17 +++++++++++------ lib/libalpm/util.c | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 78bac81a58355a6d42760e1974005dbcdd8e8dcf \ 2657a2bfb7847c8ac4dd5875979400d0d3fd89f6

1 0

[pacman-dev] difficult symlink "puzzle"
by Nagy Gabor 29 Jun '07

29 Jun '07

Hi! I ran into a difficult problem: What about symlink directories, if an other package wants to pull some new files to them? Let me explain with an example: See packages git (it contains: /usr/lib/perl5/site_perl/5.8.8/Git.pm). However, /usr/lib/perl5/site_perl/5.8.8/ is a symlink to /usr/lib/perl5/site_perl/current/. What should the package manager do here? The current situation: git package simply overwrites /usr/lib/perl5/site_perl/5.8.8/ symlink with a regular directory, so the dir 5.8.8 contains only git.pm now :-( If we install git first then perl's install script cannot do anything useful with the existing 5.8.8 dir: result is the same :-( The problem main problem, that currently I cannot solve this problem: if pacman treated the 5.8.8 symlink as an existing dir (in the first example), then Git.pm would be copied to current, which easily can run out of pacman's control (if the 5.8.8 symlink will be deleted later with a forced -Rd perl). It's hard to find a good solution imho, pacman should follow dir symlink during package install, and something should be recorded into db (to FILES: 5.8.8/file->current/file), but the precise handling of this would cause big overhead, and is not easy... Bye, ngaba

3 4

[pacman-dev] What I'm working on- feedback welcome
by Dan McGee 29 Jun '07

29 Jun '07

I've got quite a few branches going on my GIT tree at the moment, and I'd appreciate any feedback from some of you on the list. They are all accessible here: http://code.toofishes.net/gitweb.cgi. * alpm.c_cleanup- move all of the alpm_pkg functions to package.c, alpm_db functions to db.c, etc. Basically put things where they logically belong leaving only the library initialization functions in alpm.c. This is ready to merge; I'm waiting because it could potentially break a lot for anyone else that has something that touched this file. * alpm_list_speed- this was just a test branch to see how much we were losing in efficiency by not having O(1) access to both ends of a list. Answer: a lot. pacman -Qo operations are a lot faster on this branch. However, this isn't meant for merge, it was more of a quick hack-job. * db_test- Add a pacman -Qt operation which tests the integrity of your database; ported over from the Frugalware pacman-g2. * frontend_config- move the pacman.conf parsing to the frontend where it belongs. Move a few pacman-only settings out of the library. In general, try to clean up where options and configs are stored. * gettext- gettext the remaining scripts in the scripts/ directory. I've had these patches sitting around for a while but never got them applied. Ready to be merged. * working- remove some hardcoded paths from the pacman binary, making everything configurable at runtime instead of compile time through pacman.conf. This means the only path now hardcoded into the pacman binary is that to pacman.conf, and no paths are compiled into libalpm. As I said, feedback on any of these is welcome and appreciated. -Dan

2 1

[pacman-dev] Pacman depending on package naming scheme
by Dan McGee 29 Jun '07

29 Jun '07

If anyone on the list wants to look this commit/branch of mine over and review it, I'd appreciate it: http://code.toofishes.net/gitweb.cgi?p=pacman.git;a=shortlog;h=pkgname_check I know Andrew just had a commit dealing with a very similar thing in the xdelta creation in makepkg, and he removed the dependency on a package having a certain name. This is the same sort of issue, and I think it would be wise for us to fix it everywhere we can. Not only does this free us up from the CARCH issue, note the amount of code we can remove because of it. (For a side note- I challenge anyone to start submitting patches to the list that result in a net removal rather than addition of code. They are a lot more helpful than you would think.) Does anyone have concerns with this, and does anyone have some great ideas how to (re)implement partial cache cleaning functionality correctly? The old way wasn't phenomenal, and I just got rid of it in this first commit here. There were also many shortcomings in it as you can see in the comments throughout that section. -Dan

2 1

[pacman-dev] My git repo and development snapshots
by Andrew Fyfe 29 Jun '07

29 Jun '07

I've finally got round to getting my self a vps server @ slicehost.com, so I've now got all my git stuff running on the new server. I'll keep my repo at repo.or.cz up to date. Also for those that want to get the latest source without git I've now got git generating snapshots of the master branch. They're automatically updated when new updates are posted.* git: git://neptune-one.homeip.net/pacman gitweb: http://neptune-one.homeip.net/cgi-bin/gitweb.cgi?p=pacman snapshots: http://neptune-one.homeip.net/~andrew/pacman/ Andrew * More specifically when I push updates, there doesn't seem to be a hook for git pull :(

2 1

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-254-g78bac81
by Andrew Fyfe 29 Jun '07

29 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 78bac81a58355a6d42760e1974005dbcdd8e8dcf (commit) from 7daa6708d2afc710bebbb2dc30f4371f9d67120c (commit) - Log ----------------------------------------------------------------- commit 78bac81a58355a6d42760e1974005dbcdd8e8dcf Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu Jun 28 10:48:32 2007 +0100 scripts/makepkg.in: Don't include .PKGINFO etc in .FILELIST And move .PKGINFO and .FILELIST to be the first to files included in the package. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> ----------------------------------------------------------------------- Diffstat: scripts/makepkg.in | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 7daa6708d2afc710bebbb2dc30f4371f9d67120c \ 78bac81a58355a6d42760e1974005dbcdd8e8dcf

3 3

[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