- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-215-g1d19f08
by dan＠archlinux.org 23 Jul '09

23 Jul '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 1d19f0896ccc1560a7e2f5b93cfe095b4aefe84a (commit) via ca6ef852f9944ad31e8a136f7faf71da2c5fb57f (commit) via 4b21504ffc947d39a0c69a774fe14a37262942a8 (commit) from cf669eda9c6b8e0b1d38bcf32fa08c0637a9e030 (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 1d19f0896ccc1560a7e2f5b93cfe095b4aefe84a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu May 14 18:25:16 2009 +0200 Introduce -Suu If the user switches from unstable repo to a stable one, it is quite hard to sync its system with the new repo (the user will see many "Local is newer than stable" messages, nothing more). That's why I introduced -Suu, which treats a sync package like an upgrade, iff the package version doesn't match with the local one's. I added a new pactest (sync104.py) to test this, and I updated the documentation of -Su. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Dan: slight doc reword] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ca6ef852f9944ad31e8a136f7faf71da2c5fb57f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 30 18:48:15 2009 +0200 New feature: files verification This implements FS#13877. Add a new option "-Qk" which checks if all of the files for a given package (or packages) are really on the system (i.e. not accidentally deleted). This can be combined with filters and other display options. It also respects both the --quiet and --verbose flags to give varying levels of output. Based on the original patch by Charly Coste <changaco(a)laposte.net>, thanks for your work! Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4b21504ffc947d39a0c69a774fe14a37262942a8 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 22 12:33:09 2009 +1000 makepkg: add pkgbase to .PKGINFO and database for split packages With split packages, the pkgbase variable provides a useful way to find out which packages were build from the same PKGBUILD. Add it to the packages .PKGINFO file and the repo database only when package splitting is used. Original-patch-by: Pierre Schmitz <pierre(a)archlinux.de> [Allan: restrict to including only with spilt packages and include after pkgname] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 2 + contrib/zsh_completion | 1 + doc/pacman.8.txt | 13 ++++++- lib/libalpm/alpm.h | 2 +- lib/libalpm/sync.c | 18 ++++++++-- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 4 +- pactest/tests/sync104.py | 12 ++++++ scripts/makepkg.sh.in | 1 + scripts/repo-add.sh.in | 1 + src/pacman/conf.h | 1 + src/pacman/pacman.c | 11 ++++-- src/pacman/query.c | 85 ++++++++++++++++++++++++++++++++++++++++------ src/pacman/sync.c | 2 +- 14 files changed, 131 insertions(+), 24 deletions(-) create mode 100644 pactest/tests/sync104.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman 3.3 API changes
by Xavier 22 Jul '09

22 Jul '09

we had a section in the README about API CHANGES BETWEEN 3.1 AND 3.2 do we need the same for 3.2 -> 3.3? As you can see in the attached diff, there were quite a few changes as well :P

3 7

[pacman-dev] [PATCH 2/2] New feature: files verification
by Xavier Chantry 22 Jul '09

22 Jul '09

From: Charly COSTE <changaco(a)laposte.net> A new option "-Qk" which checks if all packages files are really on the system (i.e. not accidentally deleted). This implements FS#13877 Signed-off-by: Charly COSTE <changaco(a)laposte.net> [Xav : don't ignore tmp, don't repeat package names in quiet output, add errno message in verbose output] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.8.txt | 4 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 7 +++- src/pacman/query.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 118 insertions(+), 8 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index af85a15..ccff167 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -196,6 +196,10 @@ Query Options[[QO]] '\--info' or '-i' flags will also display the list of backup files and their modification states. +*-k \--check*:: + Check that all files owned by the given package(s) are present on the + system. If packages are not specified, check all installed packages. + *-l, \--list*:: List all files owned by a given package. Multiple packages can be specified on the command line. diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 39802ca..6523d49 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -51,6 +51,7 @@ typedef struct __config_t { unsigned short op_q_search; unsigned short op_q_changelog; unsigned short op_q_upgrade; + unsigned short op_q_check; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7f86489..48d45ad 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -108,6 +108,7 @@ static void usage(int op, const char * const myname) printf(_(" -e, --explicit list packages explicitly installed [filter]\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information (-ii for backup files)\n")); + printf(_(" -k, --check check that the files owned by the package(s) are present\n")); printf(_(" -l, --list list the contents of the queried package\n")); printf(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); @@ -345,6 +346,7 @@ static int parseargs(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"info", no_argument, 0, 'i'}, {"dbonly", no_argument, 0, 'k'}, + {"check", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, {"foreign", no_argument, 0, 'm'}, {"nosave", no_argument, 0, 'n'}, @@ -473,7 +475,10 @@ static int parseargs(int argc, char *argv[]) case 'g': (config->group)++; break; case 'h': config->help = 1; break; case 'i': (config->op_q_info)++; (config->op_s_info)++; break; - case 'k': config->flags |= PM_TRANS_FLAG_DBONLY; break; + case 'k': + config->flags |= PM_TRANS_FLAG_DBONLY; + config->op_q_check = 1; + break; case 'l': config->op_q_list = 1; break; case 'm': config->op_q_foreign = 1; break; case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break; diff --git a/src/pacman/query.c b/src/pacman/query.c index 4997202..62eca53 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -334,10 +334,94 @@ static void display(pmpkg_t *pkg) } } +static void check_display_progress(int j, int pkgs_n, const char *pkgname) +{ + char message[getcols()]; + int len = snprintf(message, getcols(), "(%i/%i) %s %s ...", (int)j, (int)pkgs_n, _("checking"), pkgname); + fprintf(stderr, "\r%s %*s", message, getcols()-len-1, " "); + fflush(stderr); +} + +/* Loop through the packages. For each package, + * loop through files to check if they exist. */ +static void check(alpm_list_t *pkgs) +{ + alpm_list_t *i, *files, *file, *damaged = NULL; + pmpkg_t *pkg; + const char *root; + int pkgs_n, j = 0, allfiles = 0; + size_t rootlen; + char f[PATH_MAX]; + + pkgs_n = alpm_list_count(pkgs); + root = alpm_option_get_root(); + rootlen = strlen(root); + if(rootlen + 1 > PATH_MAX) { + /* we are in trouble here */ + pm_printf(PM_LOG_ERROR, _("root path too long\n")); + return; + } + strcpy(f, root); + + for(i = pkgs; i; i = alpm_list_next(i)) { + j++; + pkg = alpm_list_getdata(i); + const char *pkgname = alpm_pkg_get_name(pkg); + files = alpm_pkg_get_files(pkg); + if(!config->quiet) { + check_display_progress(j, pkgs_n, pkgname); + } + for(file = files; file; file = alpm_list_next(file)){ + struct stat st; + char *x = alpm_list_getdata(file); + if(rootlen + 1 + strlen(x) > PATH_MAX) { + pm_printf(PM_LOG_WARNING, _("file path too long\n")); + continue; + } + strcpy(f + rootlen, x); + allfiles++; + /* use lstat to prevent errors from symlinks */ + if(lstat(f,&st) != 0) { + if(config->quiet) { + fprintf(stderr, "%s %s\n", pkgname, f); + fflush(stderr); + } else { + fprintf(stderr, "\r%s: %s (%s)\n", pkgname, f, strerror(errno)); + check_display_progress(j, pkgs_n, pkgname); + fflush(stderr); + } + if(alpm_list_find_ptr(damaged, pkgname) == NULL) { + damaged = alpm_list_add(damaged, (char*)pkgname); + } + } + } + } + if(!config->quiet) { + char message[getcols()]; + int len = snprintf(message, getcols(), "%s: %i %s (%i %s)", + _("Check complete"), allfiles, _("files"), pkgs_n, _("packages")); + fprintf(stderr, "\r%s %*s\n", message, getcols()-len-1, " "); + fflush(stderr); + + if(alpm_list_count(damaged) > 0) { + fprintf(stderr, "\r%s ", _("Damaged packages:")); + fflush(stderr); + for(i = damaged; i; i = alpm_list_next(i)) { + fprintf(stdout, "%s ", (char*)alpm_list_getdata(i)); + } + fprintf(stdout, "\n"); + fflush(stdout); + } + } + + alpm_list_free(damaged); +} + int pacman_query(alpm_list_t *targets) { int ret = 0; - alpm_list_t *i; + alpm_list_t *i, *pkgs = NULL; + pmpkg_t *pkg = NULL; /* First: operations that do not require targets */ @@ -363,7 +447,7 @@ int pacman_query(alpm_list_t *targets) } /* operations on all packages in the local DB - * valid: no-op (plain -Q), list, info + * valid: no-op (plain -Q), list, info, check * invalid: isfile, owns */ if(targets == NULL) { if(config->op_q_isfile || config->op_q_owns) { @@ -372,11 +456,19 @@ int pacman_query(alpm_list_t *targets) } for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); + pkg = alpm_list_getdata(i); if(filter(pkg)) { - display(pkg); + if(config->op_q_check) { + pkgs = alpm_list_add(pkgs, pkg); + } else { + display(pkg); + } } } + if(config->op_q_check){ + check(pkgs); + alpm_list_free(pkgs); + } return(0); } @@ -389,10 +481,9 @@ int pacman_query(alpm_list_t *targets) } /* operations on named packages in the local DB - * valid: no-op (plain -Q), list, info */ + * valid: no-op (plain -Q), list, info, check */ for(i = targets; i; i = alpm_list_next(i)) { char *strname = alpm_list_getdata(i); - pmpkg_t *pkg = NULL; if(config->op_q_isfile) { alpm_pkg_load(strname, 1, &pkg); @@ -406,8 +497,13 @@ int pacman_query(alpm_list_t *targets) continue; } + if(filter(pkg)) { - display(pkg); + if(config->op_q_check) { + pkgs = alpm_list_add(pkgs, pkg); + } else { + display(pkg); + } } if(config->op_q_isfile) { @@ -415,6 +511,10 @@ int pacman_query(alpm_list_t *targets) pkg = NULL; } } + if(config->op_q_check){ + check(pkgs); + alpm_list_free(pkgs); + } return(ret); } -- 1.6.3.3

7 12

[pacman-dev] [PATCH] makepkg: add pkgbase to .PKGINFO and database for split packages
by Allan McRae 22 Jul '09

22 Jul '09

With split packages, the pkgbase variable provides a useful way to find out which packages were build from the same PKGBUILD. Add it to the packages .PKGINFO file and the repo database only when package splitting is used. Original-patch-by: Pierre Schmitz <pierre(a)archlinux.de> [Allan: restrict to including only with spilt packages and include after pkgname] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- @Pierre: Was the a reason to put pkgbase above pkgname in the .PKGINFO and repo db files? It is secondary information so I have moved it to be included after. scripts/makepkg.sh.in | 1 + scripts/repo-add.sh.in | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 50cf54d..7e492f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -890,6 +890,7 @@ write_pkginfo() { fi echo "# $(LC_ALL=C date -u)" >>.PKGINFO echo "pkgname = $1" >>.PKGINFO + [ "$SPLITPKG" -eq 1 ] && echo "pkgbase = $pkgbase" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "url = $url" >>.PKGINFO diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5454fb0..d3566f5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -242,6 +242,7 @@ db_write_entry() msg2 "$(gettext "Creating 'desc' db entry...")" echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc + [ -n "$pkgbase" ] && echo -e "%BASE%\n$pkgbase\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc write_list_entry "GROUPS" "$_groups" "desc" -- 1.6.3.3

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-212-gcf669ed
by dan＠archlinux.org 22 Jul '09

22 Jul '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 cf669eda9c6b8e0b1d38bcf32fa08c0637a9e030 (commit) via 1c4596b4be196e35c9982c53645d8ab1ada03988 (commit) from 344ced22c347b347b55818bb93579ffa2eb9c70b (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 cf669eda9c6b8e0b1d38bcf32fa08c0637a9e030 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 21 15:50:08 2009 +0200 Fix a minor memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1c4596b4be196e35c9982c53645d8ab1ada03988 Author: Giovanni Scafora <giovanni(a)archlinux.org> Date: Tue Jul 21 20:24:06 2009 -0500 Update Italian Translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/it.po | 144 ++++++++++------------ lib/libalpm/remove.c | 1 + po/it.po | 337 ++++++++++++++++++++++++++++---------------------- 3 files changed, 257 insertions(+), 225 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [Translations] Update Italian translation
by Giovanni Scafora 22 Jul '09

22 Jul '09

Hi guys, here's an update Italian translation for pacman and libalpm. Thanks. -- Arch Linux Developer http://www.archlinux.org http://www.archlinux.it

2 2

[pacman-dev] need root
by Xavier 21 Jul '09

21 Jul '09

does this look ok?

1 2

[pacman-dev] [PATCH] Fix a minor memleak
by Nagy Gabor 21 Jul '09

21 Jul '09

>From 5979ea01d2f4217c1b199c675a7a3d4c728da9fa Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 21 Jul 2009 15:50:08 +0200 Subject: [PATCH] Fix a minor memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/remove.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index e370909..aa6a5cc 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -277,6 +277,7 @@ static void unlink_file(pmpkg_t *info, char *filename, pmtrans_t *trans) if(pkghash) { if(trans->flags & PM_TRANS_FLAG_NOSAVE) { _alpm_log(PM_LOG_DEBUG, "transaction is set to NOSAVE, not backing up '%s'\n", file); + FREE(pkghash); } else { char *filehash = alpm_compute_md5sum(file); int cmp = strcmp(filehash,pkghash); -- 1.6.0.3

1 0

Re: [pacman-dev] architecture warn/check
by Dan McGee 21 Jul '09

21 Jul '09

On Mon, Jul 20, 2009 at 3:38 PM, Steven Blatchford<sblatchford(a)gmail.com> wrote: > Hi Dan, > > I'm sure this has been brought up in the pacman ML but I couldn't find > it quickly. Do you think it would be useful to check the architecture > of the machine (eg the output of 'uname -m') against the binary pacman > is downloading? Twice I've sync'd the file /etc/pacman.d/mirrorlist via > unison to my slicehost server from my i686 network. The latest bash4.0 > upgrade hurt... like there were tears... and henceforth it's now known > in my house as "Grumpy Sunday". > > I have no trouble creating a wrapper script, I just thought I'd toss it > out there. > > Lastly, if you suggest I go the wrapper script method, besides trying to > parse the mirrorlist file, is there a nice way to get the architecture > of a file from pacman before it downloads it? /installs it? Would you mind sending this to the pacman-dev ML or filing a bug report instead next time? Unfortunately it will just get buried in my personal email inbox. I'm copying the list on this response. With that said, I think we could perhaps take some precautions for such things, such as adding a pacman.conf option to verify the architecture. Something such as: RootDir = / DBPath = /var/lib/pacman Architecture = x86_64 Where the accepted options would be something like: Architecture = { i686, x86_64, ppc, etc... } or "auto", which would make a uname system call, check the machine[] field, and use that instead of a value being hardcoded? What does the rest of the list think? This wouldn't be too hard, and of course a package coded with architecture "any" would get a free pass. -Dan

4 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-210-g344ced2
by dan＠archlinux.org 20 Jul '09

20 Jul '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 344ced22c347b347b55818bb93579ffa2eb9c70b (commit) via 60b6cde637338657e72312aef1ff1d04314df745 (commit) via 5d15bb68f7b6b3e25be286ddf7a615553a173b8f (commit) via 45f90de0eb9c33eee0deb63bae9aabe5988b8733 (commit) via bfd6817112b34b552e9139bdc582d048bcba38b9 (commit) via a3ecbec6b584b3595c041850e4c8bf242f7ce74a (commit) from 8ebc07744ac58ed1e42af3a52d998587fca85f8b (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 344ced22c347b347b55818bb93579ffa2eb9c70b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jul 20 17:23:19 2009 +0200 Fix one bug with .paccheck leftover file This happens for example if you install a new package, and one of its backup config file is already on the file system. If the local file was different, it was saved to .pacorig which is fine. However if the local file and pkg file were the same, the pkg file (temporarily extracted as .paccheck) was left on the system. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 60b6cde637338657e72312aef1ff1d04314df745 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jul 20 14:52:16 2009 +0200 Fix 2 minor memleaks Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5d15bb68f7b6b3e25be286ddf7a615553a173b8f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jul 19 19:49:59 2009 +0200 Do not create .pacsave with -R, if the file is unchanged This fixes FS#15546 Also fix the interface of unlink_file which was really stupid.. (alpm_list_t used with only one element) Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 45f90de0eb9c33eee0deb63bae9aabe5988b8733 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jul 19 16:54:12 2009 +0200 Fix klibc conflict case. A package can now replace symdir->dir by dir without fileconflicts. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bfd6817112b34b552e9139bdc582d048bcba38b9 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Jul 17 15:48:57 2009 +0200 Fix fileconflict004 When one package wants to replace a directory by a file, we check that all files in that directory were owned by that package. Additionally pacman can be more verbose when the extraction of the symlink (or file) fails. The patch to add.c looks more complex than it is, I just moved and reindented code to handle cases 10 and 11 together. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3ecbec6b584b3595c041850e4c8bf242f7ce74a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Jul 17 19:33:13 2009 +0200 pactest : safety check with MODE check that the file exists first, otherwise pactest just breaks. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 55 ++++++++-------- lib/libalpm/conflict.c | 70 ++++++++++++++++++++ lib/libalpm/handle.c | 1 + lib/libalpm/remove.c | 47 +++++++------ lib/libalpm/sync.c | 1 + pactest/pmrule.py | 7 ++- pactest/tests/fileconflict004.py | 2 - pactest/tests/fileconflict005.py | 1 - .../{fileconflict005.py => fileconflict006.py} | 7 +- pactest/tests/fileconflict007.py | 17 +++++ pactest/tests/remove010.py | 4 +- 11 files changed, 152 insertions(+), 60 deletions(-) copy pactest/tests/{fileconflict005.py => fileconflict006.py} (81%) create mode 100644 pactest/tests/fileconflict007.py hooks/post-receive -- The official pacman repository

1 0