January 2011 - Pacman-dev - lists.archlinux.org

Re: [pacman-dev] some pacman work
by Xavier Chantry 09 Jan '11

09 Jan '11

About my pending work on http://code.toofishes.net/cgit/xavier/pacman.git/ parseargs: sent to the ML and updated according to feedback depwork: forgot if I send this stuff, should I ? pactree: all the work I did with Dave Reisner on pactree C rewrite, all ready and done now. depends on depwork for find_satisfier sodeps: depends on parseargs because it changes one arg, and on depwork (make depcmp private), because it changes many _alpm_depcmp to _alpm_depcmp_tolerant. This was sent to ML. Nagy said it was ok. I find this distinction between depcmp (ignore -Sdd) vs depcmp_tolerant (respect -Sdd) a bit ugly, but I don't see any better way. I am happy with parseargs, depwork, and pactree. One small worry about depwork and its alpm_find_satisfier function : the purpose of this function is kinda duplicated with "alpm/dep: add alpm_find_dbs_satisfier" I made in working. After writing alpm_find_dbs_satisfier, I thought I would kill alpm_find_satisfier, but both have different advantages, and slightly different purpose. alpm_find_satisfier is very simple : it just calls splitdep+_alpm_find_dep_satisfier, which are both very simple. It just answers this question : is there one satisfier for this dep in this package list ? Perfect for deptest / pacman -T, could be useful for other tools. alpm_find_dbs_satisfier: much more complex, but similar purpose. its goal is to answer : which satisfier would pacman choose for this dep in this list of sync dbs ? Less flexible than alpm_find_satisfier (cannot give any list of package, it has to be one or more db), much uglier and complex code. But it exposes exactly what pacman does to find a satisfier : - search literal in a first pass, provider in a second pass only if no literal - for both pass, it scans the list of sync dbs in order, and the first sync db has priority over the next ones - handles ignorepkg with a QUESTION IgnorePkg callback (but this can be disabled simply with no or empty conversation callback) - handle multiple provision with another QUESTION callback, but same as for ignorepkg I needed alpm_find_dbs_satisfier to migrate pacman frontend to the alpm_add_pkg(pmpkg_t *) interface. I decided to keep alpm_find_satisfier anyway for its simplicity. For the stuff on working, I probably need other mails to present it.

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-223-g281a4c0
by dan＠archlinux.org 08 Jan '11

08 Jan '11

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 281a4c0a4f2de217b5d23939fb78b3bbfccc34ca (commit) via 62f5da377920c4e7823c4f8b8fb3673c9c2739e9 (commit) via f966f3a8344cd96bd675c79a5c470c66920b890c (commit) via 4bc6ed56aa48784c8caf56c3a6fb1a3c972d221c (commit) via d288240426551e9d58a708e28fe0217e56d017d6 (commit) from 04dc87e01247ab2ba932af0911e77ca1d711cf0f (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 281a4c0a4f2de217b5d23939fb78b3bbfccc34ca Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 11:47:59 2010 +0200 libalpm/be_package.c: fix small memleak file_pkg_ops can be a static struct like in other backends, we just need to initialize it at some point. Dan: add initialization flag. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62f5da377920c4e7823c4f8b8fb3673c9c2739e9 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 7 21:06:06 2011 -0600 Fix some more simple conversion "errors" None of these warn at the normal "-Wall -Werror" level, but casts do occur that we are fine with. Make them explicit to silence some warnings when using "-Wconversion". Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f966f3a8344cd96bd675c79a5c470c66920b890c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 15:13:36 2010 +1000 Use size_t for alpm_list sizes There is a lot of swtiching between size_t and int for alpm_list sizes in the codebase. Start converting these to all be size_t by adjusting the return type of alpm_list_count and fixing all additional warnings given by -Wconversion that are generated by this change. Dan: a few more small changes to ensure things compile, adjusting some printf format string characters to accommodate the larger size on x86_64. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4bc6ed56aa48784c8caf56c3a6fb1a3c972d221c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 7 20:35:43 2011 -0600 Refactor old date parsing into single method We've managed to duplicate this four times at this point, so make it a method in util.c instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d288240426551e9d58a708e28fe0217e56d017d6 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 6 14:45:15 2011 +1000 Update copyright years for 2011 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 +- lib/libalpm/add.c | 6 +++--- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 4 ++-- lib/libalpm/alpm_list.c | 10 +++++----- lib/libalpm/alpm_list.h | 8 ++++---- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 29 ++++------------------------- lib/libalpm/be_package.c | 38 ++++++++++++-------------------------- lib/libalpm/be_sync.c | 17 +++-------------- lib/libalpm/conflict.c | 10 +++++----- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 7 ++++--- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 24 ++++++++++++------------ lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 4 ++-- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 12 ++++++------ lib/libalpm/remove.h | 2 +- lib/libalpm/sync.c | 4 ++-- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 24 +++++++++++++++++++----- lib/libalpm/util.h | 3 ++- lib/libalpm/version.c | 2 +- scripts/makepkg.sh.in | 4 ++-- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- src/pacman/callback.c | 13 +++++++------ src/pacman/callback.h | 4 ++-- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 4 ++-- src/pacman/package.h | 2 +- src/pacman/pacman.c | 10 +++++----- src/pacman/pacman.h | 2 +- src/pacman/query.c | 10 +++++----- src/pacman/remove.c | 2 +- src/pacman/sync.c | 4 ++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 17 ++++++++--------- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 4 ++-- src/util/vercmp.c | 2 +- 65 files changed, 164 insertions(+), 194 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Refactor old date parsing into single method
by Dan McGee 08 Jan '11

08 Jan '11

We've managed to duplicate this four times at this point, so make it a method in util.c instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 24 ++---------------------- lib/libalpm/be_package.c | 11 +---------- lib/libalpm/be_sync.c | 12 +----------- lib/libalpm/util.c | 14 ++++++++++++++ lib/libalpm/util.h | 1 + 5 files changed, 19 insertions(+), 43 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 4c8e0e9..70675e4 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -570,33 +570,13 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } _alpm_strtrim(line); - - char first = tolower((unsigned char)line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } + info->builddate = _alpm_parsedate(line); } else if(strcmp(line, "%INSTALLDATE%") == 0) { if(fgets(line, sizeof(line), fp) == NULL) { goto error; } _alpm_strtrim(line); - - char first = tolower((unsigned char)line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } + info->installdate = _alpm_parsedate(line); } else if(strcmp(line, "%PACKAGER%") == 0) { if(fgets(line, sizeof(line), fp) == NULL) { goto error; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index ae9b953..5d31eaf 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -203,16 +203,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } else if(strcmp(key, "license") == 0) { newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr)); } else if(strcmp(key, "builddate") == 0) { - char first = tolower((unsigned char)ptr[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; /* initialize to null in case of failure */ - setlocale(LC_TIME, "C"); - strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm); - newpkg->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - newpkg->builddate = atol(ptr); - } + newpkg->builddate = _alpm_parsedate(ptr); } else if(strcmp(key, "packager") == 0) { STRDUP(newpkg->packager, ptr, RET_ERR(PM_ERR_MEMORY, -1)); } else if(strcmp(key, "arch") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index c7d8e04..568130f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -313,17 +313,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr READ_AND_STORE(pkg->arch); } else if(strcmp(line, "%BUILDDATE%") == 0) { READ_NEXT(line); - char first = tolower((unsigned char)line[0]); - if(first > 'a' && first < 'z') { - /* initialize to null in case of failure */ - struct tm tmp_tm = {0}; - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - pkg->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - pkg->builddate = atol(line); - } + pkg->builddate = _alpm_parsedate(line); } else if(strcmp(line, "%PACKAGER%") == 0) { READ_AND_STORE(pkg->packager); } else if(strcmp(line, "%CSIZE%") == 0) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 1824564..1ce2214 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -923,4 +923,18 @@ unsigned long _alpm_hash_sdbm(const char *str) return(hash); } +long _alpm_parsedate(const char *line) +{ + char first = (char)tolower((unsigned char)line[0]); + if(first > 'a' && first < 'z') { + /* initialize to null in case of failure */ + struct tm tmp_tm = { 0 }; + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + setlocale(LC_TIME, ""); + return(mktime(&tmp_tm)); + } + return(atol(line)); +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 10f367f..be5c1d9 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -95,6 +95,7 @@ int _alpm_test_md5sum(const char *filepath, const char *md5sum); int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b); int _alpm_splitname(const char *target, pmpkg_t *pkg); unsigned long _alpm_hash_sdbm(const char *str); +long _alpm_parsedate(const char *line); #ifndef HAVE_STRSEP char *strsep(char **, const char *); -- 1.7.3.5

1 0

[pacman-dev] [PATCH] Update copyright years for 2011
by Allan McRae 06 Jan '11

06 Jan '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/index.txt | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/makepkg.sh.in | 4 ++-- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-optimize.sh.in | 4 ++-- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 ++-- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/vercmp.c | 2 +- 65 files changed, 69 insertions(+), 69 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index d336e77..ef32841 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -193,7 +193,7 @@ Pacman/libalpm frontends: Copyright --------- -pacman is Copyright (C) 2006-2010 Pacman Development Team +pacman is Copyright (C) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> and Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org> and is licensed through the GNU General Public License, version 2 or later. diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index fb88ae7..2f341eb 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -1,7 +1,7 @@ /* * add.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index eb37dc7..afc7be2 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -1,7 +1,7 @@ /* * add.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 3f9cfff..2a9f460 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -1,7 +1,7 @@ /* * alpm.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b9d7be1..32a2856 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1,7 +1,7 @@ /* * alpm.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 185295c..3f9525e 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -1,7 +1,7 @@ /* * alpm_list.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 19fe548..ee85a5d 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -1,7 +1,7 @@ /* * alpm_list.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 2ef65a2..ca955ca 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -1,7 +1,7 @@ /* * backup.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2005 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 25469b9..9475aa2 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -1,7 +1,7 @@ /* * backup.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index cc416ff..583b979 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1,7 +1,7 @@ /* * be_local.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 90fd412..ae9b953 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -1,7 +1,7 @@ /* * be_package.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index fd55fdb..699d058 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -1,7 +1,7 @@ /* * be_sync.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e64a00b..0e4d6df 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -1,7 +1,7 @@ /* * conflict.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index e60e5b3..09b4f99 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -1,7 +1,7 @@ /* * conflict.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 137f8d0..c1be7ec 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -1,7 +1,7 @@ /* * db.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 10aa164..b7fa7ca 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -1,7 +1,7 @@ /* * db.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 7283500..10c982f 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -1,7 +1,7 @@ /* * delta.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 7d8d5b0..d7a81c4 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -1,7 +1,7 @@ /* * delta.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2007-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2ed9d30..1bf2e87 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -1,7 +1,7 @@ /* * deps.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 34e09f6..bd5e9a4 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -1,7 +1,7 @@ /* * deps.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 880df62..5c9f74e 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(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 diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index e73497e..25b9cfb 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -1,7 +1,7 @@ /* * diskspace.h * - * Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(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 diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 09f716f..e4b946d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -1,7 +1,7 @@ /* * download.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index e60174e..6326649 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -1,7 +1,7 @@ /* * dload.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 3d05626..4dab9fa 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -1,7 +1,7 @@ /* * error.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index c82e681..69f6500 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -1,7 +1,7 @@ /* * graph.h - helpful graph structure and setup/teardown methods * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 061bb0e..398c258 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -1,7 +1,7 @@ /* * group.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index 5d8cf77..c92684e 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -1,7 +1,7 @@ /* * group.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index ffa5dd6..8872ed0 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -1,7 +1,7 @@ /* * handle.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index b471ea6..fa29d11 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -1,7 +1,7 @@ /* * handle.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 86bb825..dc4f938 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -1,7 +1,7 @@ /* * log.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index d358733..5ce08e4 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -1,7 +1,7 @@ /* * log.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 332a082..241c41c 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 7740d79..52582d9 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 09381b8..b83c78f 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index 5585890..a67e37a 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -1,7 +1,7 @@ /* * remove.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6c003fd..dce1daf 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index 000a09c..90a2d40 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -1,7 +1,7 @@ /* * sync.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5c13211..804ab7a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -1,7 +1,7 @@ /* * trans.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 5113642..ce2dc52 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -1,7 +1,7 @@ /* * trans.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e526079..1824564 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 543643b..10f367f 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index fb327df..85cc2f5 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(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 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 73e5b90..6ebfac0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3,7 +3,7 @@ # makepkg - make packages compatible for use with pacman # @configure_input@ # -# Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> # Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> @@ -1582,7 +1582,7 @@ usage() { version() { printf "makepkg (pacman) %s\n" "$myver" printf "$(gettext "\ -Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 4e6194f..0813acc 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -3,7 +3,7 @@ # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ # -# Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(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 @@ -45,7 +45,7 @@ usage() { version() { printf "pacman-db-upgrade (pacman) %s\n" "$myver" printf "$(gettext "\ -Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 2404291..4e2a328 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -3,7 +3,7 @@ # pacman-optimize # @configure_input@ # -# Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # # This program is free software; you can redistribute it and/or modify @@ -57,7 +57,7 @@ does not have to move around the disk as much.\n")" version() { printf "pacman-optimize (pacman) %s\n" "$myver" printf "$(gettext "\ -Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ +Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ec4a683..89736bf 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -1,7 +1,7 @@ /* * callback.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 09fe8bd..f5bf1c1 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -1,7 +1,7 @@ /* * callback.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 71e8dd8..e2a168e 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -1,7 +1,7 @@ /* * conf.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 8b1bc2e..ff7a9c7 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -1,7 +1,7 @@ /* * conf.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/database.c b/src/pacman/database.c index 9e335fe..5fd33ea 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -1,7 +1,7 @@ /* * database.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 82c0cd6..8895b48 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -1,7 +1,7 @@ /* * deptest.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/package.c b/src/pacman/package.c index ac84a0c..19c2daf 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -1,7 +1,7 @@ /* * package.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/package.h b/src/pacman/package.h index 006ea1c..26333c5 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -1,7 +1,7 @@ /* * package.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 20f44b7..12b3810 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1,7 +1,7 @@ /* * pacman.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify @@ -220,7 +220,7 @@ static void version(void) { printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); - printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2010 Pacman Development Team\n"); + printf("/ _.-' .-. .-. .-. Copyright (C) 2006-2011 Pacman Development Team\n"); printf("\\ '-. '-' '-' '-' Copyright (C) 2002-2006 Judd Vinet\n"); printf(" '--'\n"); printf(_(" This program may be freely redistributed under\n" diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index f8443cf..f5b972b 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -1,7 +1,7 @@ /* * pacman.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/query.c b/src/pacman/query.c index 5538e81..04ef5e3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -1,7 +1,7 @@ /* * query.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 1e2cada..52f92ec 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -1,7 +1,7 @@ /* * remove.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6961f3c..3b94437 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -1,7 +1,7 @@ /* * sync.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index c9c8301..92a477e 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -1,7 +1,7 @@ /* * upgrade.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.c b/src/pacman/util.c index 31966ca..4b53e93 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1,7 +1,7 @@ /* * util.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/pacman/util.h b/src/pacman/util.h index 0308f6b..a5c382d 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -1,7 +1,7 @@ /* * util.h * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index a2d1541..4403e9f 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -1,7 +1,7 @@ /* * cleanupdelta.c : return list of unused delta in a given sync database * - * Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2011 Pacman Development Team <pacman-dev(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 diff --git a/src/util/pactree.c b/src/util/pactree.c index 967f5c8..3267e3d 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -1,7 +1,7 @@ /* * pactree.c - a simple dependency tree viewer * - * Copyright (c) 2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(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 diff --git a/src/util/vercmp.c b/src/util/vercmp.c index ea6722f..a1da23c 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -1,7 +1,7 @@ /* * vercmp.c * - * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2005 by Judd Vinet <jvinet(a)zeroflux.org> * * This program is free software; you can redistribute it and/or modify -- 1.7.3.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-218-g04dc87e
by dan＠archlinux.org 06 Jan '11

06 Jan '11

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 04dc87e01247ab2ba932af0911e77ca1d711cf0f (commit) via 26652768d62e9acb63e600ed07e9841ec553a3d7 (commit) via 46eda12c1bdc13453446c49c021cbd7ee1e869d8 (commit) via e57c3efeaa1713448846604c25d74fe04639cf1a (commit) via c41edf49bead531b334d8a68ab692fa6f3295f63 (commit) from 08d885fda5c9ccb3ac68faccc7c75e440ac71113 (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 04dc87e01247ab2ba932af0911e77ca1d711cf0f Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 5 21:17:30 2011 -0600 vercmp: always return 0 if we perform a compare And change the wording slightly to indicate we *print* a value, not *return* it. You can't return negative values (they get coerced to 255), so it isn't worth it to try and cram the result into the return code. Acked-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 26652768d62e9acb63e600ed07e9841ec553a3d7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:31:37 2011 -0600 Remove FORCE reading from local DB We never wrote it here, so no need to read it in either. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 46eda12c1bdc13453446c49c021cbd7ee1e869d8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:30:53 2011 -0600 pactest: Use booleans where it makes sense No need to use 0/1 when we can use False/True for the force option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e57c3efeaa1713448846604c25d74fe04639cf1a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 3 18:28:31 2011 -0600 pactest: remove dead function Stopped being used after commit fa933df65b9. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c41edf49bead531b334d8a68ab692fa6f3295f63 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 2 12:25:33 2011 -0600 Fix function indentation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 6 ----- lib/libalpm/util.c | 44 ++++++++++++++++++------------------ src/util/vercmp.c | 5 ++- test/pacman/pmdb.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/tests/sync136.py | 2 +- test/pacman/tests/sync137.py | 2 +- test/pacman/tests/sync142.py | 2 +- test/pacman/tests/sync143.py | 2 +- test/pacman/util.py | 50 ------------------------------------------ 10 files changed, 31 insertions(+), 86 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [RFC] curl-based internal downloader
by Dave Reisner 03 Jan '11

03 Jan '11

Greetings, I've been working on and off on a curl-based internal downloader to replace the libfetch based implementation. Why? - libcurl is more widely used in the arch repos. fetch is used for one and only package: pacman. - support for compression over http connections. I see proposals for adding this to fetch, but never any acceptance. Please correct me if I'm mistaken. - personal bias. not really a reason, but I think the implementation is cleaner and more readable than the fetch equivalent. - dan wanted me to. (the devil made me do it?) In it's current form, I'd say this patch set is 90% complete. I've been using it on top of pacman-git for about a week now and haven't come across any functional issues. I've done a fair bit of testing with ftp, http, and file based sync'ing. So what's remaining? - setting pm_errno: libfetch provides a global variable fetchLastErrString, whereas curl returns error codes (CURLcode) from operations and you feed them to curl_easy_strerror() to get a char* back. I'm not sure what the best way is to get back an error string from curl when (what will be) PM_ERR_LIBCURL is set. could the global handle be used to store the CURLcode (it's just a typedef'd long). - the progress bar does _not_ play well with curl. The bar itself is fine, but the time remaining jumps around a fair bit. You'll see a fair bit of hackery in curl_progress() (lib/libalpm/dload.c) where I'm fighting with the progress bar. Perhaps this belongs in the progress bar voodoo itself? - my autoconf-fu sucks. Big time. I'm not sure what I've done is best practice, but after applying patch 3/4, compiling without extra flags links in curl and leaves out fetch. There is, however, no checking for both --with-curl and --with-fetch being given, which will break the build. Dan (and anyone else), I look forward to your tower of constructive criticism. dave configure.ac | 33 ++++--- lib/libalpm/alpm.c | 13 +-- lib/libalpm/dload.c | 263 ++++++++++++++++++++++++++++++--------------------- 3 files changed, 176 insertions(+), 133 deletions(-)

3 9

[pacman-dev] [PATCH] Perform a fetch-ectomy, removing libfetch entirely
by Dave Reisner 03 Jan '11

03 Jan '11

Signed-off-by: Dave Reisner <d(a)falconindy.com> --- configure.ac | 24 ----- lib/libalpm/alpm.c | 12 --- lib/libalpm/dload.c | 264 +-------------------------------------------------- 3 files changed, 3 insertions(+), 297 deletions(-) Resend, because I'm sloppy. diff --git a/configure.ac b/configure.ac index 3d536cd..d702522 100644 --- a/configure.ac +++ b/configure.ac @@ -93,11 +93,6 @@ AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations instead of internal routines]), [], [with_openssl=check]) -# Help line for libfetch -AC_ARG_WITH(fetch, - AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]), - [], [with_fetch=no]) - # Help line for libcurl AC_ARG_WITH(curl, AS_HELP_STRING([--with-curl], [use libcurl as an internal downloader]), @@ -169,25 +164,6 @@ AS_IF([test "x$with_curl" != "xno"], AC_MSG_RESULT(no)) AM_CONDITIONAL([HAVE_LIBCURL], [test "x$ac_cv_lib_curl_curl_easy_perform" = "xyes"]) -# Enable or disable usage of libfetch -AC_MSG_CHECKING(whether to link with libfetch) -AS_IF([test "x$with_fetch" != "xno"], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB([fetch], [fetchParseURL], , - [if test "x$with_fetch" != "xcheck"; then - AC_MSG_FAILURE([--with-fetch was given, but -lfetch was not found]) - fi], - [-lcrypto -ldl]) - # Check if libfetch supports connnection caching which we use - AS_IF([test "x$ac_cv_lib_fetch_fetchParseURL" = "xyes"], - [AC_CHECK_DECL(fetchConnectionCacheInit, , - AC_MSG_ERROR([libfetch must be version 2.28 or greater]), - [#include <fetch.h>]) - ]) - ], - AC_MSG_RESULT(no)) -AM_CONDITIONAL([HAVE_LIBFETCH], [test "x$ac_cv_lib_fetch_fetchParseURL" = "xyes"]) - # Checks for header files. AC_CHECK_HEADERS([fcntl.h glob.h libintl.h locale.h mntent.h string.h \ sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 44c513e..4d66ca1 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -23,10 +23,6 @@ #include "config.h" -/* connection caching setup */ -#ifdef HAVE_LIBFETCH -#include <fetch.h> -#endif #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif @@ -62,10 +58,6 @@ int SYMEXPORT alpm_initialize(void) bindtextdomain("libalpm", LOCALEDIR); #endif -#ifdef HAVE_LIBFETCH - fetchConnectionCacheInit(5, 1); -#endif - #ifdef HAVE_LIBCURL curl_global_init(CURL_GLOBAL_NOTHING); #endif @@ -89,10 +81,6 @@ int SYMEXPORT alpm_release(void) _alpm_handle_free(handle); handle = NULL; -#ifdef HAVE_LIBFETCH - fetchConnectionCacheClose(); -#endif - #ifdef HAVE_LIBCURL curl_global_cleanup(); #endif diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9154d33..aad4673 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,15 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -/* the following two are needed for FreeBSD's libfetch */ -#include <limits.h> /* PATH_MAX */ -#if defined(HAVE_SYS_PARAM_H) -#include <sys/param.h> /* MAXHOSTNAMELEN */ -#endif - -#ifdef HAVE_LIBFETCH -#include <fetch.h> -#endif +#include <limits.h> #ifdef HAVE_LIBCURL #include <curl/curl.h> @@ -59,6 +51,7 @@ static char *get_filename(const char *url) { return(filename); } +#ifdef HAVE_LIBCURL static char *get_destfile(const char *path, const char *filename) { char *destfile; /* len = localpath len + filename len + null */ @@ -88,7 +81,6 @@ static void inthandler(int signum) dload_interrupted = 1; } -#ifdef HAVE_LIBCURL static int gethost(const char *url, char *buffer) { char *start, *end; @@ -102,257 +94,7 @@ static int gethost(const char *url, char *buffer) return(ret); } -#endif - -#ifdef HAVE_LIBFETCH -static const char *gethost(struct url *fileurl) -{ - const char *host = _("disk"); - if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) { - host = fileurl->host; - } - return(host); -} - -static int download_internal(const char *url, const char *localpath, - int force) { - FILE *localf = NULL; - struct stat st; - int ret = 0; - off_t dl_thisfile = 0; - ssize_t nread = 0; - char *tempfile, *destfile, *filename; - struct sigaction sig_pipe[2], sig_int[2]; - - off_t local_size = 0; - time_t local_time = 0; - - struct url *fileurl; - struct url_stat ust; - fetchIO *dlf = NULL; - - char buffer[PM_DLBUF_LEN]; - - filename = get_filename(url); - if(!filename) { - _alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url); - RET_ERR(PM_ERR_SERVER_BAD_URL, -1); - } - - fileurl = fetchParseURL(url); - if(!fileurl) { - _alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url); - RET_ERR(PM_ERR_LIBFETCH, -1); - } - destfile = get_destfile(localpath, filename); - tempfile = get_tempfile(localpath, filename); - - if(stat(tempfile, &st) == 0 && st.st_size > 0) { - _alpm_log(PM_LOG_DEBUG, "tempfile found, attempting continuation\n"); - local_time = fileurl->last_modified = st.st_mtime; - local_size = fileurl->offset = (off_t)st.st_size; - dl_thisfile = st.st_size; - localf = fopen(tempfile, "ab"); - } else if(!force && stat(destfile, &st) == 0 && st.st_size > 0) { - _alpm_log(PM_LOG_DEBUG, "destfile found, using mtime only\n"); - local_time = fileurl->last_modified = st.st_mtime; - local_size = /* no fu->off here */ (off_t)st.st_size; - } else { - _alpm_log(PM_LOG_DEBUG, "no file found matching criteria, starting from scratch\n"); - } - - /* pass the raw filename for passing to the callback function */ - _alpm_log(PM_LOG_DEBUG, "using '%s' for download progress\n", filename); - - /* print proxy info for debug purposes */ - _alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY")); - _alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy")); - _alpm_log(PM_LOG_DEBUG, "FTP_PROXY: %s\n", getenv("FTP_PROXY")); - _alpm_log(PM_LOG_DEBUG, "ftp_proxy: %s\n", getenv("ftp_proxy")); - - /* 10s timeout */ - fetchTimeout = 10; - - /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or - * something along those lines. Store the old signal handler first. */ - sig_pipe[NEW].sa_handler = SIG_IGN; - sigemptyset(&sig_pipe[NEW].sa_mask); - sig_pipe[NEW].sa_flags = 0; - sigaction(SIGPIPE, NULL, &sig_pipe[OLD]); - sigaction(SIGPIPE, &sig_pipe[NEW], NULL); - - dload_interrupted = 0; - sig_int[NEW].sa_handler = &inthandler; - sigemptyset(&sig_int[NEW].sa_mask); - sig_int[NEW].sa_flags = 0; - sigaction(SIGINT, NULL, &sig_int[OLD]); - sigaction(SIGINT, &sig_int[NEW], NULL); - - /* NOTE: libfetch does not reset the error code, be sure to do it before - * calls into the library */ - - /* find out the remote size *and* mtime in one go. there is a lot of - * trouble in trying to do both size and "if-modified-since" logic in a - * non-stat request, so avoid it. */ - fetchLastErrCode = 0; - if(fetchStat(fileurl, &ust, "") == -1) { - pm_errno = PM_ERR_LIBFETCH; - _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), - filename, gethost(url), fetchLastErrString); - ret = -1; - goto cleanup; - } - check_stop(); - - _alpm_log(PM_LOG_DEBUG, "ust.mtime: %ld local_time: %ld compare: %ld\n", - ust.mtime, local_time, local_time - ust.mtime); - _alpm_log(PM_LOG_DEBUG, "ust.size: %jd local_size: %jd compare: %jd\n", - (intmax_t)ust.size, (intmax_t)local_size, (intmax_t)(local_size - ust.size)); - if(!force && ust.mtime && ust.mtime == local_time - && ust.size && ust.size == local_size) { - /* the remote time and size values agreed with what we have, so move on - * because there is nothing more to do. */ - _alpm_log(PM_LOG_DEBUG, "files are identical, skipping %s\n", filename); - ret = 1; - goto cleanup; - } - if(!ust.mtime || ust.mtime != local_time) { - _alpm_log(PM_LOG_DEBUG, "mtimes were different or unavailable, downloading %s from beginning\n", filename); - fileurl->offset = 0; - } - - fetchLastErrCode = 0; - dlf = fetchGet(fileurl, ""); - check_stop(); - - if(fetchLastErrCode != 0 || dlf == NULL) { - pm_errno = PM_ERR_LIBFETCH; - _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), - filename, gethost(fileurl), fetchLastErrString); - ret = -1; - goto cleanup; - } else { - _alpm_log(PM_LOG_DEBUG, "connected to %s successfully\n", fileurl->host); - } - - if(localf && fileurl->offset == 0) { - _alpm_log(PM_LOG_WARNING, _("resuming download of %s not possible; starting over\n"), filename); - fclose(localf); - localf = NULL; - } else if(fileurl->offset) { - _alpm_log(PM_LOG_DEBUG, "resuming download at position %jd\n", (intmax_t)fileurl->offset); - } - - - if(localf == NULL) { - _alpm_rmrf(tempfile); - fileurl->offset = (off_t)0; - dl_thisfile = 0; - localf = fopen(tempfile, "wb"); - if(localf == NULL) { /* still null? */ - pm_errno = PM_ERR_RETRIEVE; - _alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"), - tempfile, strerror(errno)); - ret = -1; - goto cleanup; - } - } - - /* Progress 0 - initialize */ - if(handle->dlcb) { - handle->dlcb(filename, 0, ust.size); - } - - while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) { - check_stop(); - size_t nwritten = 0; - nwritten = fwrite(buffer, 1, nread, localf); - if((nwritten != (size_t)nread) || ferror(localf)) { - pm_errno = PM_ERR_RETRIEVE; - _alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"), - tempfile, strerror(errno)); - ret = -1; - goto cleanup; - } - dl_thisfile += nread; - - if(handle->dlcb) { - handle->dlcb(filename, dl_thisfile, ust.size); - } - } - - /* did the transfer complete normally? */ - if (nread == -1) { - /* not PM_ERR_LIBFETCH here because libfetch error string might be empty */ - pm_errno = PM_ERR_RETRIEVE; - _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s\n"), - filename, gethost(fileurl)); - ret = -1; - goto cleanup; - } - - if (ust.size != -1 && dl_thisfile < ust.size) { - pm_errno = PM_ERR_RETRIEVE; - _alpm_log(PM_LOG_ERROR, _("%s appears to be truncated: %jd/%jd bytes\n"), - filename, (intmax_t)dl_thisfile, (intmax_t)ust.size); - ret = -1; - goto cleanup; - } - - /* probably safer to close the file descriptors now before renaming the file, - * for example to make sure the buffers are flushed. - */ - fclose(localf); - localf = NULL; - fetchIO_close(dlf); - dlf = NULL; - - /* set the times on the file to the same as that of the remote file */ - if(ust.mtime) { - struct timeval tv[2]; - memset(&tv, 0, sizeof(tv)); - tv[0].tv_sec = ust.atime; - tv[1].tv_sec = ust.mtime; - utimes(tempfile, tv); - } - rename(tempfile, destfile); - ret = 0; - -cleanup: - FREE(tempfile); - FREE(destfile); - if(localf != NULL) { - /* if we still had a local file open, we got interrupted. set the mtimes on - * the file accordingly. */ - fflush(localf); - if(ust.mtime) { - struct timeval tv[2]; - memset(&tv, 0, sizeof(tv)); - tv[0].tv_sec = ust.atime; - tv[1].tv_sec = ust.mtime; - futimes(fileno(localf), tv); - } - fclose(localf); - } - if(dlf != NULL) { - fetchIO_close(dlf); - } - fetchFreeURL(fileurl); - - /* restore the old signal handlers */ - sigaction(SIGINT, &sig_int[OLD], NULL); - sigaction(SIGPIPE, &sig_pipe[OLD], NULL); - /* if we were interrupted, trip the old handler */ - if(dload_interrupted) { - raise(SIGINT); - } - - return(ret); -} -#endif - -#ifdef HAVE_LIBCURL int curl_progress(void *filename, double dltotal, double dlnow, double ultotal, double ulnow) { @@ -636,7 +378,7 @@ cleanup: static int download(const char *url, const char *localpath, int force) { if(handle->fetchcb == NULL) { -#if defined(HAVE_LIBFETCH) || defined(HAVE_LIBCURL) +#ifdef HAVE_LIBCURL return(download_internal(url, localpath, force)); #else RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1); -- 1.7.3.4

1 0

[pacman-dev] parallel compression in makepkg
by Andreas Radke 02 Jan '11

02 Jan '11

ArchLinux prefers xz compression now. It has a very good compression ratio but poor speed due not being threaded for smp usage. It seems the upstream xz developer lost the intention to implement it after the final xz 5.0 release: http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4015685 I've made some local quick tests for compressing large binary packages like LibreOffice on my Intel Quad core Q6600+ system using /tmp (tmpfs): time tar -xvf ~/arch64/packages/libreoffice-3.3.0.2-2-x86_64.pkg.tar.xz real 0m11.679s - that's well acceptable user 0m10.686s sys 0m1.117s [andyrtr@workstation64 libo]$ du -sch 298M . We currently use this in makepkg: time bsdtar -cf - * | xz -zf > LibO.tar.xz real 3m53.461s - very poor! user 3m52.382s sys 0m1.287s [andyrtr@workstation64 libo]$ ls -lha LibO.tar.xz -rw-r--r-- 1 andyrtr users 80M 31. Dez 13:14 LibO.tar.xz 1st alternative: PXZ http://jnovy.fedorapeople.org/pxz/ Using http://aur.archlinux.org/packages.php?ID=36362 I get this: [andyrtr@workstation64 libo]$ time bsdtar -cf - * | pxz -zf > LibO.tar.xz real 1m9.924s - not bad :) user 3m41.709s sys 0m1.530s [andyrtr@workstation64 libo]$ ls -lha LibO.tar.xz -rw-r--r-- 1 andyrtr users 81M 31. Dez 13:16 LibO.tar.xz but I'm a bit afraid of the comments in AUR saying decompressing fails sometimes. I couldn't find something helpful in google for broken decompression. 2nd alternative: from the forum xz thread let's try parallel 7zip [andyrtr@workstation64 libo]$ time bsdtar -cf - * | 7z a -txz -si LibO.tar.xz 7-Zip [64] 9.13 beta Copyright (c) 1999-2010 Igor Pavlov 2010-04-15 p7zip Version 9.13 (locale=de_DE.UTF-8,Utf16=on,HugeFiles=on,4 CPUs) Creating archive LibO.tar.xz Compressing [Content] Everything is Ok real 1m12.984s - also nice :) user 3m19.284s sys 0m1.667s [andyrtr@workstation64 libo]$ ls -lha LibO.tar.xz -rw-r--r-- 1 andyrtr users 79M 31. Dez 13:40 LibO.tar.xz 3rd alternative: lxz from the forum thread I couldn't find so far and should get further testing before hitting production state in a distribution. What's your opinion? Is using p7zip a solution we can add to makepkg for now? -Andy

3 3