- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] parallel compression in makepkg
by Alf Gaida 31 Dec '10

31 Dec '10

Imho this could (should) be an experimental feature, turned on/off in makepkg.conf. I have modified my packagers and now using pigz instead of gzip and pxz instead of xz for a year without glitches and errors. I think, both ways are simple and reliable, i prefer to change the tools and leave pacman and makepkg untouched. And it speeds up compressing and decompressing a lot on my AMD 965 ;)

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.4.2, created. v3.4.2
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 annotated tag, v3.4.2 has been created at 9987d90efdea0861c3315bec2ea269dda5eb2bc9 (tag) tagging ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) replaces v3.4.1 tagged by Dan McGee on Wed Dec 29 18:53:09 2010 -0600 - Log ----------------------------------------------------------------- 3.4.2 maint release Allan McRae (2): bacman: unify package creation with makepkg Check for python-2.7 Baurzhan Muftakhidinov (1): Update Kazakh translation Dan McGee (8): Retroactive additions to 3.4.1 changes Minor translation file updates after `make distcheck` Read 'force' entry from packages Add initial 3.4.2 NEWS draft Fix possible null pointer deref in check_arch Update news and bump versions Fix manpage wrap not at 80 characters doc/PKGBUILD: document that functions run in -e mode Gaspar Santos (1): Update Portuguese translation Lukas Fleischer (1): PKGBUILD-example.txt: Remove superfluous "|| return 1". Ricardo Pérez (1): Small updates to Spanish translation Rémy Oudompheng (1): Make testsuite python-2.7 compatible Sergey Tereschenko (1): Small update to Russian translation Tobias Eriksson (1): Update Swedish translation Xavier Chantry (4): libalpm/remove: fix funny progress bar problem with empty packages alpm/sync: very small memleak fix PKGBUILD.vim: add special licenses BSD MIT ZLIB Python be_files: write EPOCH instead of FORCE ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

4 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-213-g08d885f
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 08d885fda5c9ccb3ac68faccc7c75e440ac71113 (commit) via 351250adb49bea470b88fca54dcfba789b58545c (commit) via 6ddc115c7f52d6d172ca3879f96cc782bb526313 (commit) via df360b791da6d4ce8bc5813d9031ce44e32fcc55 (commit) via 58ee249c86d0f4ac1dfef9ca242d44d89044cb88 (commit) via cb7ba4e4e5c1b46b726cb6c9f10395784511bb2a (commit) via e0d327462c460329b8d0f65f1324551accff939c (commit) from 619c165d36c2d89732c2658abaa61bf50ec1ac8e (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 08d885fda5c9ccb3ac68faccc7c75e440ac71113 Merge: 351250a 6ddc115 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 30 09:41:46 2010 -0600 Merge branch 'maint' Conflicts: lib/libalpm/sync.c test/pacman/tests/ignore007.py commit 351250adb49bea470b88fca54dcfba789b58545c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 19 00:15:05 2010 +1000 Declare all local functions static All functions that are limited to the local translation unit are declared static. This exposed that the _pkg_get_deltas declaration in be_local.c was being satified by the function in packages.c which when declared static caused linker failures. Fixes all warnings with -Wmissing-{declarations,prototypes}. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb7ba4e4e5c1b46b726cb6c9f10395784511bb2a Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 2 20:32:03 2010 +0200 Add const to some ALPM function signatures char * -> const char *. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 8 ++-- lib/libalpm/be_local.c | 62 +++++++++++++++++++++------------------ lib/libalpm/be_package.c | 8 ++-- lib/libalpm/package.c | 52 ++++++++++++++++---------------- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 54 ++++++++++++++++++++++++----------- src/pacman/pacman.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- test/pacman/tests/ignore007.py | 2 - 13 files changed, 111 insertions(+), 89 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-5-g6ddc115
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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, maint has been updated via 6ddc115c7f52d6d172ca3879f96cc782bb526313 (commit) via df360b791da6d4ce8bc5813d9031ce44e32fcc55 (commit) via 58ee249c86d0f4ac1dfef9ca242d44d89044cb88 (commit) via e0d327462c460329b8d0f65f1324551accff939c (commit) from c002567d965bea56f740c46b35467446c276cd42 (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 6ddc115c7f52d6d172ca3879f96cc782bb526313 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 2 20:51:37 2010 +0200 Respect Ignore{Pkg,Group} for group members Fixes FS#19854. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df360b791da6d4ce8bc5813d9031ce44e32fcc55 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 2 20:41:13 2010 +0200 Move group code to separate function This makes the following commits more readable. No logic was changed in this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 58ee249c86d0f4ac1dfef9ca242d44d89044cb88 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:22:35 2010 +0200 Tests: Sync group which includes ignored pkgs * FS#19854 (--ignore is ignored with groups) * http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html (operation aborts when a package from a group is ignored/and user chooses not to install it) If a group member is ignored, we expect a) a question whether to install b) after saying 'no' to a), the ignored member not to be installed c) all other group members to be installed d) pacman to execute successfully Signed-off-by: Dan McGee <dan(a)archlinux.org> (cherry picked from commit 9d0b33fd3327ae6d2b15f50870c0885a2068d492) commit e0d327462c460329b8d0f65f1324551accff939c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 20:06:40 2010 -0600 doc: add website zip to clean files Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 2 +- lib/libalpm/sync.c | 50 ++++++++++++++++++++++++++++------------ test/pacman/tests/ignore007.py | 21 ++++++++++++++++ 3 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 test/pacman/tests/ignore007.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-206-g619c165
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 619c165d36c2d89732c2658abaa61bf50ec1ac8e (commit) via 2052f29cdb2248ffbdc2d10b815ac50ad7494e01 (commit) via 0c29eb431a26467fc5ec14742cfcdc7ce3558334 (commit) via d22777146446ecaf8b4b9c0afd593d23c5c9766e (commit) via 81dd9d3ebc3eca04fade4df4689c53d1d11c5f19 (commit) via fcc09bd7e35766a5f025282491501824ee11cf27 (commit) via c002567d965bea56f740c46b35467446c276cd42 (commit) from bd98b93a6e161c436c22f6c39d2d6293f420cbcc (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 619c165d36c2d89732c2658abaa61bf50ec1ac8e Merge: 2052f29 c002567 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 19:28:46 2010 -0600 Merge branch 'maint' commit 2052f29cdb2248ffbdc2d10b815ac50ad7494e01 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 25 15:43:06 2010 +1000 makepkg: add option to clear buildflags Add the "buildflags" option, which is useful in its negative form for disabling CFLAGS, CXXFLAGS and LDFLAGS when building a package. This is useful when determining of one of these flags is causing an issue with a package. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c29eb431a26467fc5ec14742cfcdc7ce3558334 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 16 00:06:43 2010 +1000 makepkg: Add check() function for running test suites A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf. This setting can be controlled on an individual package basis using makepkg's --check and --nocheck flags. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d22777146446ecaf8b4b9c0afd593d23c5c9766e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 05:11:29 2010 +1000 Use limits.h for PATH_MAX We use PATH_MAX everywhere by including limits.h so there is no point in doing a check for it in a different header when dealing with FreeBSD's libfetch. Also, remove autoconf check for strings.h header as it is not used anywhere. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 81dd9d3ebc3eca04fade4df4689c53d1d11c5f19 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 04:48:09 2010 +1000 Detect undefined PATH_MAX POSIX does not require PATH_MAX be defined when there is not actual limit to its value. This affects HURD based systems. Work around this by defining PATH_MAX to 4096 (as on Linux) when this is not defined. Also, clean up inclusions of limits.h and remove autoconf check for this header as we do not use macro shields for its inclusion anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fcc09bd7e35766a5f025282491501824ee11cf27 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 30 11:11:54 2010 +1000 Correct type for hash value storage Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- acinclude.m4 | 16 ++++++++++++++++ configure.ac | 5 +++-- contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 22 +++++++++++++++++++++- doc/index.txt | 31 +++++++++++++++++-------------- doc/makepkg.8.txt | 7 +++++++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- lib/libalpm/be_sync.c | 1 + lib/libalpm/db.h | 1 - lib/libalpm/deps.h | 2 +- lib/libalpm/dload.c | 7 ++----- lib/libalpm/error.c | 7 ++----- lib/libalpm/package.c | 1 - lib/libalpm/sync.c | 1 + lib/libalpm/trans.c | 1 + scripts/makepkg.sh.in | 40 ++++++++++++++++++++++++++++++++++++---- src/util/cleanupdelta.c | 2 ++ src/util/testdb.c | 2 ++ 22 files changed, 135 insertions(+), 39 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.2-1-gc002567
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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, maint has been updated via c002567d965bea56f740c46b35467446c276cd42 (commit) from ba45cb459084a0746e0005345b8c5483834d1ba2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 2 ++ doc/index.txt | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Correct type for hash value storage
by Allan McRae 30 Dec '10

30 Dec '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index b720b36..34e09f6 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -31,7 +31,7 @@ struct __pmdepend_t { char *name; char *version; - long name_hash; + unsigned long name_hash; pmdepmod_t mod; }; -- 1.7.3.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-220-gbd98b93
by dan＠archlinux.org 30 Dec '10

30 Dec '10

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 bd98b93a6e161c436c22f6c39d2d6293f420cbcc (commit) via eb93955477c411eaf914c2f1650ce37d02d8b56e (commit) via a7972625e3ef98348b8a0957217aa2991501a07b (commit) via a58083459b096e935693d94b9cb51a447b3a1abd (commit) via 735a197fc29b6b85a64cae5a6fa95e1209552c3b (commit) via 34a78d935ac44fc73becc8bba213cdf0268bb5e0 (commit) via e3c19569cfe7cd77674490b30624e71512417e0b (commit) via fbcc42775492e5ba3df1b3235a23f23ad7faa241 (commit) via f2dff0860053f45c91e4ee301fda091a6b3d7361 (commit) via 126f50ab0b5ee3ed46c5a6ecae241e8af49b0fe2 (commit) from c78a808c49f1df12254ff9ae5ce32bd450e14df8 (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 bd98b93a6e161c436c22f6c39d2d6293f420cbcc Author: Dave Reisner <d(a)falconindy.com> Date: Sun Dec 26 19:12:55 2010 -0500 makepkg: escape closing bash array paren for awk The closing parenthesis of bash arrays needs to be escaped in the ending address of awk expressions in order to play nicely with implementations of awk other than gawk. This change provides compatibility with gawk, nawk and mawk. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eb93955477c411eaf914c2f1650ce37d02d8b56e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 25 13:14:55 2010 +1000 makepkg: allow pkgname usage in split package functions Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7972625e3ef98348b8a0957217aa2991501a07b Merge: a580834 735a197 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 18:43:47 2010 -0600 Merge branch 'depcmp-perf' commit a58083459b096e935693d94b9cb51a447b3a1abd Merge: 126f50a e3c1956 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 29 18:43:44 2010 -0600 Merge branch 'fgets-perf' commit 735a197fc29b6b85a64cae5a6fa95e1209552c3b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 15:40:04 2010 -0600 Use name hashes in depends to avoid strcmp calls Just like we did for package name comparsions, if we add a depend name_hash field on depend struct initialization, we can use it instead of doing a string name comparison, saving us a lot of checks in the depcmp code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 34a78d935ac44fc73becc8bba213cdf0268bb5e0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 20 19:58:15 2010 -0600 Remove need for memory allocation in _alpm_depcmp Noticed when tweaking testdb, when we run _alpm_depcmp in loops and call it seven million times, the strdup()/free() combo can add up. Remove the need for any string duplication by some pointer manipulation and use of strncmp instead of strcmp. Also kill the function logger and add an escape so we don't needlessly retrieve the list of provides. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3c19569cfe7cd77674490b30624e71512417e0b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 12:20:09 2010 -0600 Add pactest to test long archive reads This creates two packages with extremely long description lines (500KB and 600 KB), causing our archive read code to perform reallocation to store the whole contents. One of the packages will successfully read while the other will fail for the time being. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fbcc42775492e5ba3df1b3235a23f23ad7faa241 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 21 12:19:26 2010 -0600 pactest: allow testing of package description And modify the code to not print the full rule string if it is more than 40 characters long; truncate it instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f2dff0860053f45c91e4ee301fda091a6b3d7361 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 22:26:23 2010 -0600 Overhaul archive fgets function The old function was written in a time before we relied on it for nearly every operation. Since then, we have switched to the archive backend and now fast parsing is a big deal. The former function made a per-character call to the libarchive archive_read_data() function, which resulted in some 21 million calls in a typical "load all sync dbs" operation. If we instead do some buffering of our own and read the blocks directly, and then find our newlines from there, we can cut out the multiple layers of overhead and go from archive to parsed data much quicker. Both users of the former function are switched over to the new signature, made easier by the macros now in place in the sync backend parsing code. Performance: for a `pacman -Su` (no upgrades available), _alpm_archive_fgets() goes from being 29% of the total time to 12% The time spent on the libarchive function being called dropped from 24% to 6%. This pushes _alpm_pkg_find back to the title of slowest low-level function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 126f50ab0b5ee3ed46c5a6ecae241e8af49b0fe2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 20 19:54:33 2010 -0600 testdb: update for new database format Sync DB's no longer have an extracted directory, so remove the files check for those. Local databases no longer have a 'depends' file, so kill that check as well. Finally, do a little other cleanup and remove the need for PATH_MAX. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 13 ++++-- lib/libalpm/be_sync.c | 15 ++++-- lib/libalpm/deps.c | 41 +++++++++++------ lib/libalpm/deps.h | 3 +- lib/libalpm/util.c | 100 ++++++++++++++++++++++++++++++++--------- lib/libalpm/util.h | 18 +++++++- scripts/makepkg.sh.in | 18 ++++--- src/util/testdb.c | 54 +++++++++------------- test/pacman/pmrule.py | 10 +++-- test/pacman/pmtest.py | 7 +--- test/pacman/tests/smoke002.py | 19 ++++++++ 11 files changed, 200 insertions(+), 98 deletions(-) create mode 100644 test/pacman/tests/smoke002.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: escape closing bash array paren for awk
by Dave Reisner 27 Dec '10

27 Dec '10

The closing parenthesis of bash arrays needs to be escaped in the ending address of awk expressions in order to play nicely with implementations of awk other than gawk. This change provides compatibility with gawk, nawk and mawk. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1996dd4..d9d8aa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1223,7 +1223,7 @@ check_sanity() { fi local provides_list - eval $(awk '/^[[:space:]]*provides=/,/)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") + eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" @@ -1232,7 +1232,7 @@ check_sanity() { done local backup_list - eval $(awk '/^[[:space:]]*backup=/,/)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") + eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" @@ -1241,7 +1241,7 @@ check_sanity() { done local optdepends_list - eval $(awk '/^[[:space:]]*optdepends=/,/)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then @@ -1264,7 +1264,7 @@ check_sanity() { local valid_options=1 local known kopt options_list - eval $(awk '/^[[:space:]]*options=/,/)/' "$BUILDFILE" | sed "s/options=/options_list+=/") + eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | sed "s/options=/options_list+=/") for i in ${options_list[@]}; do known=0 # check if option matches a known option or its inverse -- 1.7.3.4

1 0

[pacman-dev] makepkg and (n)awk
by Nezmer 26 Dec '10

26 Dec '10

Hi, In commit ef977865, awk was added as an external tool needed by makepkg. As you know, there is different awk implementations out there. nawk is the implementation shipped by default in non-GNU systems As far as I know. Unfortunately, awk usage in makepkg is not nawk-compatible. Command: %gawk '/^[[:space:]]*provides=/,/)/' B | sed "s/provides=/provides_list+=/" Output: provides_list+=('p1' 'p2' '3') # comment Command: % awk '/^[[:space:]]*provides=/,/)/' B | sed "s/provides=/provides_list+=/" Output: awk: illegal primary in regular expression ) at source line number 1 context is >>> /^[[:space:]]*provides=/,/)/ <<< ====================== Anyway, what is awk doing here? Is it the same as: egrep '^\s*provides=$.*$'

3 3

[pacman-dev] [PATCH] makepkg: add option to clear buildflags
by Allan McRae 25 Dec '10

25 Dec '10

Add the "buildflags" option, which is useful in its negative form for disabling CFLAGS, CXXFLAGS and LDFLAGS when building a package. This is useful when determining of one of these flags is causing an issue with a package. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I doubt this option would ever be used in a "final" PKGBUILD, but it is very useful when trying to figure out build issues. contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 6 ++++++ scripts/makepkg.sh.in | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index a50ca12..f627a5e 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -172,7 +172,7 @@ hi def link pbValidSha1sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags$/ contained +syn match pbOptions /$no$\?$strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|buildflags$/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2ccf0b2..e6c4a1f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -233,6 +233,12 @@ name. The syntax is: `source=('filename::url')`. form `!distcc` with select packages that have problems building with distcc. + *buildflags*;; + Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS) + during build as specified in linkman:makepkg.conf[5]. More useful in + its negative form `!buildflags` with select packages that have problems + building with custom buildflags. + *makeflags*;; Allow the use of user-specific makeflags during build as specified in linkman:makepkg.conf[5]. More useful in its negative form diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c8f128c..4e60b62 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -45,7 +45,7 @@ srcdir="$startdir/src" pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') -other_options=('ccache' 'distcc' 'makeflags') +other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') @@ -739,6 +739,13 @@ run_function() { fi local pkgfunc="$1" + # clear user-specified buildflags if requested + if [[ $(check_option buildflags) = "n" ]]; then + CFLAGS="" + CXXFLAGS="" + LDFLAGS="" + fi + # clear user-specified makeflags if requested if [[ $(check_option makeflags) = "n" ]]; then MAKEFLAGS="" -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: Add check() function for running test suites
by Allan McRae 25 Dec '10

25 Dec '10

A PKGBUILD can have an option check() function for running test suites between the build() and package() stages. This function is run by default but can be disabled globally in with "!check" in BUILDENV in makepkg.conf. This setting can be controlled on an individual package basis using makepkg's --check and --nocheck flags. Addition dependencies needed for running the test suite can be specified in the checkdepends array and are only checked when running the check() function. Original-work-by: Jeff C <jeff(a)kcaccess.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This adds the --check option to force the running of the check() function when using !check in makepkg.conf. PKGBUILD-split.proto | 6 ++++++ PKGBUILD.proto | 8 ++++++-- doc/PKGBUILD.5.txt | 16 +++++++++++++++- doc/makepkg.8.txt | 7 +++++++ doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 31 ++++++++++++++++++++++++++++--- 7 files changed, 70 insertions(+), 8 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index f5114ab..52aacc5 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -16,6 +16,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() provides=() conflicts=() replaces=() @@ -33,6 +34,11 @@ build() { make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package_pkg1() { # options and directives that can be overridden pkgver= diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 71dbc14..98172d8 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -15,6 +15,7 @@ license=('GPL') groups=() depends=() makedepends=() +checkdepends=() optdepends=() provides=() conflicts=() @@ -29,14 +30,17 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr make } -package() { +check() { cd "$srcdir/$pkgname-$pkgver" + make -k check +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 3d3909a..2ccf0b2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -156,6 +156,12 @@ name. The syntax is: `source=('filename::url')`. needed at runtime. Packages in this list follow the same format as depends. +*checkdepends (array)*:: + An array of packages that this package depends on to run its test suite, + but are not needed at runtime. Packages in this list follow the same + format as depends. These dependencies are only considered when the + check() function is present and is to be run by makepkg. + *optdepends (array)*:: An array of packages (and accompanying reasons) that are not essential for base functionality, but may be necessary to make full use of the contents @@ -263,10 +269,18 @@ If you create any variables of your own in the build function, it is recommended to use the bash `local` keyword to scope the variable to inside the build function. +check() Function +---------------- +An optional check() function can be specified in which a packages test-suite +may be run. This function is run between the build() and package() functions. +The function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. Be sure any exotic commands +used are covered by `checkdepends`. + package() Function ------------------ An optional package() function can be specified in addition to the build() -function. This function is run immediately after the build() function. The +function. This function is run after the build() and check() functions. The function is run in `bash -e` mode, meaning any command that exits with a non-zero status will cause the function to exit. When specified in combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ff0f2b6..3b83015 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -153,6 +153,13 @@ Options Only build listed packages from a split package. The use of quotes is necessary when specifying multiple packages. e.g. `--pkg "pkg1 pkg3"` +*\--check*:: + Run the check() function in the PKGBUILD, overriding the setting in + linkman:makepkg.conf[5]. + +*\--nocheck*:: + Do not run the check() function in the PKGBUILD or handle the checkdepends. + *\--noconfirm*:: (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 86ea6a3..020804c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -93,6 +93,11 @@ Options be disabled for individual packages by placing `!ccache` in the PKGBUILD options array. + *check*;; + Run the check() function if present in the PKGBUILD. This can be + enabled or disabled for individual packages through the use of + makepkg's `--check` and `--nocheck` options respectively. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index c795432..81a11b1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -39,15 +39,16 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 79b307a..c8f128c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -71,6 +71,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 BUILDFUNC=0 +CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST=() @@ -145,6 +146,9 @@ clean_up() { if (( BUILDFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* fi + if (( CHECKFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-check.log"* + fi if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif (( SPLITPKG )); then @@ -805,6 +809,10 @@ run_build() { run_function "build" } +run_check() { + run_function "check" +} + run_package() { local pkgfunc if [[ -z $1 ]]; then @@ -1547,8 +1555,10 @@ usage() { echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" + printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf "$(gettext " --holdver Prevent automatic version bumping for development %ss")\n" "$BUILDSCRIPT" + printf "$(gettext " --nocheck Do not run the check() function in the %s")\n" "$BUILDSCRIPT" echo "$(gettext " --pkg <list> Only build listed packages from a split package")" echo "$(gettext " --skipinteg Do not fail when integrity checks are missing")" echo "$(gettext " --source Generate a source-only tarball without downloaded sources")" @@ -1584,10 +1594,10 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" -OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps" +OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG+=",install,log,nocolor,nobuild,pkg:,rmdeps,repackage,skipinteg" -OPT_LONG+=",source,syncdeps,version,config:" +OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1610,6 +1620,7 @@ while true; do -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; -C|--cleancache) CLEANCACHE=1 ;; + --check) RUN_CHECK='y' ;; --config) shift; MAKEPKG_CONF=$1 ;; -d|--nodeps) NODEPS=1 ;; -e|--noextract) NOEXTRACT=1 ;; @@ -1622,6 +1633,7 @@ while true; do -i|--install) INSTALL=1 ;; -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; PKGLIST=($1) ;; @@ -1837,6 +1849,12 @@ fi if declare -f build >/dev/null; then BUILDFUNC=1 fi +if declare -f check >/dev/null; then + # "Hide" check() function if not going to be run + if [[ $RUN_CHECK = 'y' || (! $(check_buildenv check) = "n" && ! $RUN_CHECK = "n") ]]; then + CHECKFUNC=1 + fi +fi if declare -f package >/dev/null; then PKGFUNC=1 elif [[ $SPLITPKG -eq 0 ]] && declare -f package_${pkgname} >/dev/null; then @@ -1900,6 +1918,7 @@ if (( INFAKEROOT )); then if (( ! REPKG )); then if (( BUILDFUNC )); then run_build + (( CHECKFUNC )) && run_check tidy_install fi else @@ -1950,6 +1969,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then msg "$(gettext "Checking buildtime dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + if (( CHECKFUNC )); then + resolve_deps ${checkdepends[@]} || deperr=1 + fi + if (( RMDEPS )); then current_pkglist=($(run_pacman -Qq)) # required by remove_deps fi @@ -2015,6 +2038,7 @@ else if (( ! REPKG )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check fi if (( ! SPLITPKG )); then if (( PKGFUNC )); then @@ -2036,6 +2060,7 @@ else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update (( BUILDFUNC )) && run_build + (( CHECKFUNC )) && run_check cd "$startdir" fi -- 1.7.3.4

1 0

[pacman-dev] [PATCH] makepkg: allow pkgname usage in split package functions
by Allan McRae 25 Dec '10

25 Dec '10

Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7042e76..5ac71ed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1414,17 +1414,19 @@ restore_package_variables() { } run_split_packaging() { - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" + local pkgname_backup=${pkgname[@]} + for pkgname in ${pkgname_backup[@]}; do + pkgdir="$pkgdir/$pkgname" mkdir -p "$pkgdir" chmod a-s "$pkgdir" backup_package_variables - run_package $pkg + run_package $pkgname tidy_install - create_package $pkg + create_package $pkgname restore_package_variables pkgdir="${pkgdir%/*}" done + pkgname=${pkgname_backup[@]} } # Canonicalize a directory path if it exists -- 1.7.3.4

1 0

[pacman-dev] [PATCH 1/2] Use macros in sync DB parsing
by Dan McGee 24 Dec '10

24 Dec '10

This simplifies a lot of the repetative code and makes it obvious where the tricky or different ones are (e.g. depends, dates). It also makes it significantly easier to change the way this code works in the future. There should be no functional change with this patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is really just setup for the following patch, or that one would be much more of a mess and you wouldn't be able to seperate the actual functional changes from the necessary ones. This does reduce the possibility for making errors in this copy-paste code though. -Dan lib/libalpm/be_sync.c | 151 +++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 99 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 72caa50..137fc1b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -218,6 +218,24 @@ static int sync_db_populate(pmdb_t *db) return(count); } +#define READ_NEXT(s) do { \ + if(_alpm_archive_fgets(s, sizeof(s), archive) == NULL) goto error; \ + _alpm_strtrim(s); \ +} while(0) + +#define READ_AND_STORE(f) do { \ + READ_NEXT(line); \ + STRDUP(f, line, goto error); \ +} while(0) + +#define READ_AND_STORE_ALL(f) do { \ + char *linedup; \ + READ_NEXT(line); \ + if(strlen(line) == 0) break; \ + STRDUP(linedup, line, goto error); \ + f = alpm_list_add(f, linedup); \ +} while(1) /* note the while(1) and not (0) */ + static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry) { char line[1024]; @@ -264,63 +282,35 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), pkg->name) != 0) { + READ_NEXT(line); + if(strcmp(line, pkg->name) != 0) { _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - if(strcmp(_alpm_strtrim(line), pkg->version) != 0) { + READ_NEXT(line); + if(strcmp(line, pkg->version) != 0) { _alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->filename, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->filename); } else if(strcmp(line, "%DESC%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->desc, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->desc); } else if(strcmp(line, "%GROUPS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->groups = alpm_list_add(pkg->groups, linedup); - } + READ_AND_STORE_ALL(pkg->groups); } else if(strcmp(line, "%URL%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->url, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->url); } else if(strcmp(line, "%LICENSE%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->licenses = alpm_list_add(pkg->licenses, linedup); - } + READ_AND_STORE_ALL(pkg->licenses); } else if(strcmp(line, "%ARCH%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->arch, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->arch); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - _alpm_strtrim(line); - + READ_NEXT(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 */ + /* 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); @@ -329,46 +319,28 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr pkg->builddate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->packager, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->packager); } else if(strcmp(line, "%CSIZE%") == 0) { - /* NOTE: the CSIZE and SIZE fields both share the "size" field - * in the pkginfo_t struct. This can be done b/c CSIZE - * is currently only used in sync databases, and SIZE is - * only used in local databases. + /* Note: the CSIZE and SIZE fields both share the "size" field in the + * pkginfo_t struct. This can be done b/c CSIZE is currently only used + * in sync databases, and SIZE is only used in local databases. */ - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->size = atol(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->size = atol(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->isize = atol(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->isize = atol(line); } else if(strcmp(line, "%MD5SUM%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - STRDUP(pkg->md5sum, _alpm_strtrim(line), goto error); + READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%REPLACES%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->replaces = alpm_list_add(pkg->replaces, linedup); - } + READ_AND_STORE_ALL(pkg->replaces); } else if(strcmp(line, "%EPOCH%") == 0) { - if(_alpm_archive_fgets(line, sizeof(line), archive) == NULL) { - goto error; - } - pkg->epoch = atoi(_alpm_strtrim(line)); + READ_NEXT(line); + pkg->epoch = atoi(line); } else if(strcmp(line, "%FORCE%") == 0) { /* For backward compatibility, treat force as a non-zero epoch * but only if we didn't already have a known epoch value. */ @@ -376,39 +348,20 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr pkg->epoch = 1; } } else if(strcmp(line, "%DEPENDS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - pkg->depends = alpm_list_add(pkg->depends, dep); + /* Different than the rest because of the _alpm_splitdep call. */ + while(1) { + READ_NEXT(line); + if(strlen(line) == 0) break; + pkg->depends = alpm_list_add(pkg->depends, _alpm_splitdep(line)); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->optdepends = alpm_list_add(pkg->optdepends, linedup); - } + READ_AND_STORE_ALL(pkg->optdepends); } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->conflicts = alpm_list_add(pkg->conflicts, linedup); - } + READ_AND_STORE_ALL(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && - strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - pkg->provides = alpm_list_add(pkg->provides, linedup); - } + READ_AND_STORE_ALL(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { - while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) { - pmdelta_t *delta = _alpm_delta_parse(line); - if(delta) { - pkg->deltas = alpm_list_add(pkg->deltas, delta); - } - } + READ_AND_STORE_ALL(pkg->deltas); } } } else { -- 1.7.3.3

4 7

[pacman-dev] Warning to pacman-git users - database format change
by Allan McRae 21 Dec '10

21 Dec '10

Pacman's local database format changes with this commit being pushed to master: commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db If you want to run pacman-git you will need to upgrade your pacman database format using the conviently named "pacman-db-upgrade" script in the scripts/ directory. This is not a particularly reversible operation, so if you run this you are stuck with pacman-git until the 3.5 release. Note that various scripts rely on the old database format. That includes namcap (which Dan is already fixing!). Allan

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-210-gc78a808
by dan＠archlinux.org 21 Dec '10

21 Dec '10

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 c78a808c49f1df12254ff9ae5ce32bd450e14df8 (commit) via a611879318a4c39488f977308af8ee90f428995b (commit) via 5776090055642bc7651a07cd9d31cf056d0531dc (commit) via 8ac7f7e6e557fe32dc36fce173db000b83611559 (commit) from 45146dccbb94f14fb56df2999131851ff15e46b9 (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 c78a808c49f1df12254ff9ae5ce32bd450e14df8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:47:16 2010 +1000 Only check diskspace availability if needs more than zero The amount of diskspace needed for a transaction can be less than zero. Only test this against the available disk space if it is positive, which avoids a comparison being made between signed and unsigned types (-Wsign-compare). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a611879318a4c39488f977308af8ee90f428995b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 18 22:26:04 2010 +1000 Always specify arguement type in function delcarations Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5776090055642bc7651a07cd9d31cf056d0531dc Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 16 00:42:23 2010 +1000 makepkg: remove last inappropriate PKGBUILD usage We should always use $BUILDSCRIPT instead of PKGBUILD. The only remaining uses of PKGBUILD in makekg are in comments. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8ac7f7e6e557fe32dc36fce173db000b83611559 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 22:09:43 2010 -0600 Use macros in sync DB parsing This simplifies a lot of the repetative code and makes it obvious where the tricky or different ones are (e.g. depends, dates). It also makes it significantly easier to change the way this code works in the future. There should be no functional change with this patch. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 44 +++++++------- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 151 ++++++++++++++++------------------------------ lib/libalpm/diskspace.c | 3 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 +- scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 9 files changed, 83 insertions(+), 129 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Always specify arguement type in function delcarations
by Allan McRae 19 Dec '10

19 Dec '10

Always declare a function with (void) rather than () when we expect no arguements. Fixes all warnings with -Wstrict-prototypes. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 44 ++++++++++++++++++++++---------------------- lib/libalpm/be_package.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/util.h | 4 ++-- src/pacman/sync.c | 2 +- src/util/pactree.c | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 86212a4..e17300f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -97,69 +97,69 @@ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, * Options */ -alpm_cb_log alpm_option_get_logcb(); +alpm_cb_log alpm_option_get_logcb(void); void alpm_option_set_logcb(alpm_cb_log cb); -alpm_cb_download alpm_option_get_dlcb(); +alpm_cb_download alpm_option_get_dlcb(void); void alpm_option_set_dlcb(alpm_cb_download cb); -alpm_cb_fetch alpm_option_get_fetchcb(); +alpm_cb_fetch alpm_option_get_fetchcb(void); void alpm_option_set_fetchcb(alpm_cb_fetch cb); -alpm_cb_totaldl alpm_option_get_totaldlcb(); +alpm_cb_totaldl alpm_option_get_totaldlcb(void); void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); -const char *alpm_option_get_root(); +const char *alpm_option_get_root(void); int alpm_option_set_root(const char *root); -const char *alpm_option_get_dbpath(); +const char *alpm_option_get_dbpath(void); int alpm_option_set_dbpath(const char *dbpath); -alpm_list_t *alpm_option_get_cachedirs(); +alpm_list_t *alpm_option_get_cachedirs(void); int alpm_option_add_cachedir(const char *cachedir); void alpm_option_set_cachedirs(alpm_list_t *cachedirs); int alpm_option_remove_cachedir(const char *cachedir); -const char *alpm_option_get_logfile(); +const char *alpm_option_get_logfile(void); int alpm_option_set_logfile(const char *logfile); -const char *alpm_option_get_lockfile(); +const char *alpm_option_get_lockfile(void); /* no set_lockfile, path is determined from dbpath */ -int alpm_option_get_usesyslog(); +int alpm_option_get_usesyslog(void); void alpm_option_set_usesyslog(int usesyslog); -alpm_list_t *alpm_option_get_noupgrades(); +alpm_list_t *alpm_option_get_noupgrades(void); void alpm_option_add_noupgrade(const char *pkg); void alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); -alpm_list_t *alpm_option_get_noextracts(); +alpm_list_t *alpm_option_get_noextracts(void); void alpm_option_add_noextract(const char *pkg); void alpm_option_set_noextracts(alpm_list_t *noextract); int alpm_option_remove_noextract(const char *pkg); -alpm_list_t *alpm_option_get_ignorepkgs(); +alpm_list_t *alpm_option_get_ignorepkgs(void); void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_ignoregrps(); +alpm_list_t *alpm_option_get_ignoregrps(void); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); -const char *alpm_option_get_arch(); +const char *alpm_option_get_arch(void); void alpm_option_set_arch(const char *arch); -int alpm_option_get_usedelta(); +int alpm_option_get_usedelta(void); void alpm_option_set_usedelta(int usedelta); -int alpm_option_get_checkspace(); +int alpm_option_get_checkspace(void); void alpm_option_set_checkspace(int checkspace); -pmdb_t *alpm_option_get_localdb(); -alpm_list_t *alpm_option_get_syncdbs(); +pmdb_t *alpm_option_get_localdb(void); +alpm_list_t *alpm_option_get_syncdbs(void); /* * Install reasons -- ie, why the package was installed @@ -407,9 +407,9 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, /* Transaction Progress callback */ typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); -int alpm_trans_get_flags(); -alpm_list_t * alpm_trans_get_add(); -alpm_list_t * alpm_trans_get_remove(); +int alpm_trans_get_flags(void); +alpm_list_t * alpm_trans_get_add(void); +alpm_list_t * alpm_trans_get_remove(void); int alpm_trans_init(pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2416dc8..6426fe9 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -131,7 +131,7 @@ int _package_changelog_close(const pmpkg_t *pkg, void *fp) * lets us only initialize an operations struct once which can always be * accessed by this method. */ -static struct pkg_operations *get_file_pkg_ops() +static struct pkg_operations *get_file_pkg_ops(void) { static struct pkg_operations *file_pkg_ops = NULL; /* determine whether our static file_pkg_ops struct has been initialized */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 46414b9..b471ea6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -66,7 +66,7 @@ typedef struct _pmhandle_t { /* global handle variable */ extern pmhandle_t *handle; -pmhandle_t *_alpm_handle_new(); +pmhandle_t *_alpm_handle_new(void); void _alpm_handle_free(pmhandle_t *handle); #endif /* _ALPM_HANDLE_H */ diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index dfdc6a7..543643b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -79,8 +79,8 @@ int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); int _alpm_copyfile(const char *src, const char *dest); char *_alpm_strtrim(char *str); -int _alpm_lckmk(); -int _alpm_lckrm(); +int _alpm_lckmk(void); +int _alpm_lckrm(void); int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); int _alpm_rmrf(const char *path); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index f9d12e4..6961f3c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -571,7 +571,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return(0); } -static alpm_list_t *syncfirst() { +static alpm_list_t *syncfirst(void) { alpm_list_t *i, *res = NULL; for(i = config->syncfirst; i; i = alpm_list_next(i)) { diff --git a/src/util/pactree.c b/src/util/pactree.c index 5e86967..967f5c8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -54,7 +54,7 @@ int reverse = 0; int unique = 0; char *dbpath = NULL; -static int alpm_local_init() +static int alpm_local_init(void) { int ret; -- 1.7.3.3

3 8

[pacman-dev] [PATCH] Use limits.h for PATH_MAX
by Allan McRae 19 Dec '10

19 Dec '10

We use PATH_MAX everywhere by including limits.h so there is no point in doing a check for it in a different header when dealing with FreeBSD's libfetch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 4 ++-- lib/libalpm/dload.c | 6 ++---- lib/libalpm/error.c | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 18e8996..e03a937 100644 --- a/configure.ac +++ b/configure.ac @@ -172,8 +172,8 @@ AS_IF([test "x$with_fetch" != "xno"], 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 limits.h locale.h mntent.h string.h strings.h \ - sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h sys/syslimits.h \ +AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h mntent.h string.h \ + strings.h sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ sys/time.h sys/types.h sys/ucred.h syslog.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ea7f557..09f716f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -29,10 +29,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <signal.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* 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 diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index d4c296f..3d05626 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -22,10 +22,8 @@ /* TODO: needed for the libfetch stuff, unfortunately- we should kill it */ #include <stdio.h> -/* the following two are needed on BSD for libfetch */ -#if defined(HAVE_SYS_SYSLIMITS_H) -#include <sys/syslimits.h> /* PATH_MAX */ -#endif +/* 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 -- 1.7.3.3

2 2