- Pacman-dev - lists.archlinux.org

[pacman-dev] pacman tag support
by Xavier 21 Aug '08

21 Aug '08

In answer to http://www.archlinux.org/pipermail/arch-dev-public/2008-August/007644.html To Ronald : It is nice you worked on this, especially considering it was a feature request posted by Aaron himself : http://bugs.archlinux.org/task/7132 However, I warmly recommend you to have a look at this : http://wiki.archlinux.org/index.php/Pacman_Development Especially the submitting patches page. And all the git guides. 1) you should really use git for doing pacman development 2) it it is a good idea to split patches, especially huge ones like this 3) all pacman development happens on pacman-dev, not arch-dev-public 4) all big patches go through the ML for review and discussion. Even Dan sometimes sends his own patches (the less trivial ones) there To everyone : About the feature itself, here is the last thread where it was discussed : http://archlinux.org/pipermail/pacman-dev/2007-June/008555.html I was always divided about it. I understand the point of view "groups are installable, categories are not" However, after having a look at this patch, it seems like it justifies Nagy's opinion even more : http://archlinux.org/pipermail/pacman-dev/2007-June/008565.html This category implementation basically looks like a duplication of the whole group implementation.

5 6

[pacman-dev] 3.2.1 release
by Xavier 20 Aug '08

20 Aug '08

While there is nothing critical, all bugfixes already fixed in git are nice to have, but there are especially two that keep getting reported : makepkg: fix download functions with weird urls http://projects.archlinux.org/?p=pacman.git;a=commit;h=9bc799ec7b1718e6d90c… Fix creation of source package with local source files http://projects.archlinux.org/?p=pacman.git;a=commit;h=57bd8974c73571d82761… So the sooner, the better :) The only pending patches are the following ones : pacman/callback.c : fix detection of totaldownload http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commit;h=4f56… Fix error when sourcing profile script http://dev.archlinux.org/~allan/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff… And eventually this one : Allow sync200 pactest to pass without libdownload. http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff;h=… This last one also shows how to use curl as XferCommand in pacman.conf, which is nice because it handles file:// protocol.

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk()
by Nagy Gabor 17 Aug '08

17 Aug '08

From 7e7e2b74ff03dc0656879ed9ae6f171a82194ea4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 21:26:49 +0200 Subject: [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/util.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2847db7..b26c970 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,7 +241,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) /* Create a lock file */ int _alpm_lckmk() { - int fd, count = 0; + int fd; char *dir, *ptr; const char *file = alpm_option_get_lockfile(); @@ -252,17 +252,9 @@ int _alpm_lckmk() *ptr = '\0'; } _alpm_makepath(dir); - - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { - if(++count < 1) { - sleep(1); - } else { - return(-1); - } - } - FREE(dir); + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); return(fd > 0 ? fd : -1); } -- 1.5.6.5

1 0

[pacman-dev] [PATCH] Move -Sp implementation to the front-end
by Nagy Gabor 17 Aug '08

17 Aug '08

From b6518fd82b2d3fb9dd0dc2541eb5010f2ac80870 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:42:35 +0200 Subject: [PATCH] Move -Sp implementation to the front-end This patch kills one of our hackish pseudo transactions: PRINTURIS. (The other one is -Sw) From now on, front-end must not call trans_commit in case of -Sp, it should print the uris of target packages "by hand" instead. PRINTURIS flag was removed, NOCONFLICT flag can be passed to skip conflict checks. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 8 ++------ lib/libalpm/sync.c | 46 +++++++++++++++++++--------------------------- src/pacman/callback.c | 3 --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 41 +++++++++++++++++++++++++---------------- 6 files changed, 49 insertions(+), 53 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4ea03a9..71c08e4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -282,7 +282,7 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000, + /* 0x1000 flag can go here */ PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, @@ -364,14 +364,10 @@ typedef enum _pmtransevt_t { * A line of text is passed to the callback. */ PM_TRANS_EVT_SCRIPTLET_INFO, - /** Print URI. - * The database's URI and the package's filename are passed to the callback. - */ - PM_TRANS_EVT_PRINTURI, /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ - PM_TRANS_EVT_RETRIEVE_START, + PM_TRANS_EVT_RETRIEVE_START } pmtransevt_t; /*@}*/ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7a577a1..d85c2dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -486,7 +486,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } /* We don't care about conflicts if we're just printing uris */ - if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) { + if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); @@ -826,32 +826,27 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fname = alpm_pkg_get_filename(spkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1)); - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - EVENT(trans, PM_TRANS_EVT_PRINTURI, (char *)alpm_db_get_url(current), - (char *)fname); - } else { - if(spkg->download_size != 0) { - alpm_list_t *delta_path = spkg->delta_path; - if(delta_path) { - alpm_list_t *dlts = NULL; - - for(dlts = delta_path; dlts; dlts = dlts->next) { - pmdelta_t *d = dlts->data; - - if(d->download_size != 0) { - /* add the delta filename to the download list if - * it's not in the cache */ - files = alpm_list_add(files, strdup(d->delta)); - } - - /* keep a list of the delta files for md5sums */ - deltas = alpm_list_add(deltas, d); + if(spkg->download_size != 0) { + alpm_list_t *delta_path = spkg->delta_path; + if(delta_path) { + alpm_list_t *dlts = NULL; + + for(dlts = delta_path; dlts; dlts = dlts->next) { + pmdelta_t *d = dlts->data; + + if(d->download_size != 0) { + /* add the delta filename to the download list if + * it's not in the cache */ + files = alpm_list_add(files, strdup(d->delta)); } - } else { - /* not using deltas, so add the file to the download list */ - files = alpm_list_add(files, strdup(fname)); + /* keep a list of the delta files for md5sums */ + deltas = alpm_list_add(deltas, d); } + + } else { + /* not using deltas, so add the file to the download list */ + files = alpm_list_add(files, strdup(fname)); } } } @@ -868,9 +863,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) FREELIST(files); } } - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - return(0); - } /* clear out value to let callback know we are done */ if(handle->totaldlcb) { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 30e34a9..9f4b52b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,9 +226,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_SCRIPTLET_INFO: printf("%s", (char*)data1); break; - case PM_TRANS_EVT_PRINTURI: - printf("%s/%s\n", (char*)data1, (char*)data2); - break; case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 9d2318d..8ea6662 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,6 +57,7 @@ typedef struct __config_t { unsigned short op_s_sync; unsigned short op_s_search; unsigned short op_s_upgrade; + unsigned short op_s_printuris; unsigned short group; pmtransflag_t flags; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 8b8698b..b828cfb 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -461,7 +461,8 @@ static int parseargs(int argc, char *argv[]) case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; - config->flags |= PM_TRANS_FLAG_PRINTURIS; + config->op_s_printuris = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'q': config->quiet = 1; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ae3f523..7bb9ada 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -666,23 +666,32 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } - if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { - int confirm; + /* Step 3: actually perform the operation */ + if(config->op_s_printuris) { + /* print uris */ + alpm_list_t *i; + for(i = packages; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_sync_get_pkg((pmsyncpkg_t *)alpm_list_getdata(i)); + pmdb_t *db = alpm_pkg_get_db(pkg); + printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg)); + } + /* we are done */ + goto cleanup; + } - display_synctargets(packages); - printf("\n"); + display_synctargets(packages); + printf("\n"); - if(config->op_s_downloadonly) { - confirm = yesno(1, _("Proceed with download?")); - } else { - confirm = yesno(1, _("Proceed with installation?")); - } - if(!confirm) { - goto cleanup; - } - }/* else 'print uris' requested. We're done at this point */ + int confirm; + if(config->op_s_downloadonly) { + confirm = yesno(1, _("Proceed with download?")); + } else { + confirm = yesno(1, _("Proceed with installation?")); + } + if(!confirm) { + goto cleanup; + } - /* Step 3: actually perform the installation */ if(alpm_trans_commit(&data) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); @@ -739,7 +748,7 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *sync_dbs = NULL; /* Display only errors with -Sp and -Sw operations */ - if(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS)) { + if((config->flags & PM_TRANS_FLAG_DOWNLOADONLY) || config->op_s_printuris) { config->logmask &= ~PM_LOG_WARNING; } @@ -811,7 +820,7 @@ int pacman_sync(alpm_list_t *targets) } alpm_list_t *targs = alpm_list_strdup(targets); - if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY) && !config->op_s_printuris) { /* check for newer versions of packages to be upgraded first */ alpm_list_t *packages = syncfirst(); if(packages) { -- 1.5.6.5

2 2

[pacman-dev] [PATCH] New public alpm_pkg_get_db function
by Nagy Gabor 17 Aug '08

17 Aug '08

From 88ca14b8e7d4c53d886bc7397adbbf6c8a338c5d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:32:39 +0200 Subject: [PATCH] New public alpm_pkg_get_db function This function returns with the origin database of a package. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fbef057..4ea03a9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -218,6 +218,7 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); +pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg); void *alpm_pkg_changelog_open(pmpkg_t *pkg); size_t alpm_pkg_changelog_read(void *ptr, size_t size, const pmpkg_t *pkg, const void *fp); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 49238ea..4ed908f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -409,6 +409,15 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg) return pkg->backup; } +pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg) +{ + /* Sanity checks */ + ASSERT(pkg != NULL, return(NULL)); + ASSERT(pkg->origin == PKG_FROM_CACHE, return(NULL)); + + return(pkg->origin_data.db); +} + /** * Open a package changelog for reading. Similar to fopen in functionality, * except that the returned 'file stream' could really be from an archive -- 1.5.6.5

1 0

[pacman-dev] alpm_option_set_logcb(), an example of usage
by Imanol Celaya 15 Aug '08

15 Aug '08

Hi, I'm developing pyalpm at the moment(new codebase, not related to 2005 pyalpm) and I don't really see any example of usage of alpm_option_set_logcb() on pacman.c file there is alpm_option_set_logcb(cb_log); but I can't find where is cb_log declared, so I have no clue about what does that function do(as I haven't neither found where is the actual code of that function, only that is declared on alpm.h)

4 6

Re: [pacman-dev] Splitting packages with makepkg
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 15 Aug '08

15 Aug '08

Hello, Am Freitag, den 15.08.2008, 12:57 +1000 schrieb Allan McRae: > Henning Garus wrote: > > Now my (maybe) more useful comments: > > > > This looks very much like the PKGBUILD I already had in my head after > > reading the other threads and thinking about splitting packages. While > > thinking I became unsure about two things: > > > > 1) Is one build function enough? In an older thread someone (Aaron I > > think) talked about building packages with different configurations > > from one packagebuild. I am not sure you can do this with one build > > function. What you could do, is using the package functions to do this, > > this would go against the "minimal fakeroot usage" thing, but is > > probably sufficent for something rather uncommon. An alternative would > > be, checking for build_pkgname functions and calling them if they are > > defined. > > > > > Two build functions sounds like it would require two install functions > (as each package would probably have to add a conflict to the other) > which is really two PKGBUILDs. I am not against adding this at the same > time but I would need to be convinced with a (useful) real world example > here. How about this: A "build_${pkgname}" function should be executed for every (including the first) package (if exists for the first of course) after executing the "build" function (if it exists) before the execution of any other "build_${pkgname}" function without executing the packaging of contents "build" may have written to ${startdir}/pkg: (0. -> build) if exist 1. -> build_pkg1 2. -> pack ${startdir}/pkg_pkg1 3. -> build_pkg2 4. -> pack ${startdir}/pkg_pkg2 If there is no build_pkg1 function: 1. -> build 2. -> pack ${startdir}/pkg 3. -> build_pkg2 4. -> pack ${startdir}/pkg_pkg2 That way it is up to the packager if a main build function should be used to build everything and install things in separate functions to override eg. depends or just use separated build functions for every split-package. A real world example would be php5 which could be build for cli, cgi and mod_php usage for apache2. Also many modules for php5 could be packed up separately to minimize the depends for the main packages down to the ones really needed for basic operation. I'll try to adapt my php PKGBUILD to the proposed format over the weekend. > > 2) This is a bit implementation specific, but I think it is important. > > Is there any way, except parsing the PKGBUILD file, to get the contents > > of all depends arrays, to check the depends before building the package? > > If not, overriding depends could be problematic. > > > > As Xavier pointed out, I think that there would a big use of makedepends > and overriding of depends in the individual package functions. In fact, > I am not sure what the depends array at the top of the PKGBUILD actually > means with split packages... I would expect that the global array should represent all needed dependencies to build every spilt-package (it would be the easiest way to get a working "makepkg -s"). OT: I found out that export have to be used to override vars inside of functions that are already defined outside. It could be a bash configuration problem here on my box but i hope someone can verify this behavior. Marc

1 0

[pacman-dev] Splitting packages with makepkg
by Allan McRae 15 Aug '08

15 Aug '08

Hi all, Now that pacman 3.2 is out the door and the initial bug fixes appear done, I am going to work on adding the package splitting feature to makepkg. So the time has come for some input on the prototype PKGBUILD for splitting packages again. We discussed this a couple of months ago on this list (http://archlinux.org/pipermail/pacman-dev/2008-June/012123.html) From that discussion I have come up with a PKGBUILD prototype which I like (prototype 1 at http://dev.archlinux.org/~allan/splitpkg.html) which is inspired by the KDEMod method but has a few significant differences. This is a call for comments or other prototypes to implement this function. Some "rules" to help us all with this: 1) If submitting a new idea, attach a complete prototype (based on the one distributed with pacman) so we can see all details of how the packaging is done. Add notes if necessary. Point out the advantages of your method. 2) Note that the ability to separate the building and packaging stages of a PKGBUILD is going to be added to makepkg so that fakeroot is used for the smallest amount of time. Any new prototype should account for this. 3) No comments about how splitting packages is bad and this will be the ruin of Arch. Arch does not favor package splitting in its main repos and this will not change that fact. Allan

3 5

[pacman-dev] [PATCH] Add autotools magic for pactests
by Henning Garus 14 Aug '08

14 Aug '08

Added a Makefile.am for the pactest/tests dir. This is a blatant ripoff of scripts/Makefile.am, which replaces predefined expressions in NAME.py.in pactests with configure variables. This can be used to write pactests which consider compile time options. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- Makefile.am | 2 +- configure.ac | 1 + pactest/tests/Makefile.am | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) create mode 100644 pactest/tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index ea3b0e0..4f2ea83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib +SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest pactest/tests contrib if WANT_DOC SUBDIRS += doc endif diff --git a/configure.ac b/configure.ac index 9f4209b..5c09e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,7 @@ doc/Makefile etc/Makefile po/Makefile.in pactest/Makefile +pactest/tests/Makefile contrib/Makefile Makefile ]) diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am new file mode 100644 index 0000000..4590e3c --- /dev/null +++ b/pactest/tests/Makefile.am @@ -0,0 +1,19 @@ +CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in)) + +noinst_SCRIPTS = $(CONFTESTS) + +CLEANFILES = $(CONFTESTS) + +edit = sed \ + -e 's|@LIBS[@]|$(LIBS)|g' \ + -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + + +$(CONFTESTS): Makefile + rm -f $@ $@.tmp + test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + test -f $@.tmp || false + chmod a-w $@.tmp + mv $@.tmp $@ + +# vim:set ts=2 sw=2 noet: -- 1.5.6.5

1 0

[pacman-dev] minor issue in pacman.conf
by Xavier 13 Aug '08

13 Aug '08

Patch attached.

2 2

[pacman-dev] [PATCH] Treat info pages like man pages
by Allan McRae 12 Aug '08

12 Aug '08

As far a package building is concerned, info pages need to be treated in the same fashion as man pages in that they both can be compressed. This separates them from other forms of documentation and so it makes sense to make that distinction within makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- doc/makepkg.conf.5.txt | 6 +++--- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 0b1ce64..cf6eb23 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -181,8 +181,8 @@ similar to `$_basekernver`. disable this option. *docs*;; - Save doc and info directories. If you wish to delete doc and - info directories, specify `!docs` in the array. + Save doc directories. If you wish to delete doc directories, + specify `!docs` in the array. *libtool*;; Leave libtool (.la) files in packages. Specify `!libtool` to @@ -192,7 +192,7 @@ similar to `$_basekernver`. Leave empty directories in packages. *zipman*;; - Compress man pages with gzip. + Compress man and info pages with gzip. *ccache*;; Allow the use of ccache during build. More useful in its negative diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 8b39c46..57b229f 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -110,8 +110,8 @@ Options option. *docs*;; - Save doc and info directories. If you wish to delete doc and info - directories, specify `!docs' in the array. + Save doc directories. If you wish to delete doc directories, specify + `!docs' in the array. *libtool*;; Leave libtool (.la) files in packages. Specify `!libtool' to remove @@ -121,7 +121,7 @@ Options Leave empty directories in packages. *zipman*;; - Compress man pages with gzip. + Compress man and info pages with gzip. **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 0241a8e..057f563 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -72,7 +72,7 @@ OPTIONS=(strip docs libtool emptydirs zipman) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Info and doc directories to remove (if option set correctly above) -DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc}) +DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if option set correctly above) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c5dbed9..a665ba7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -679,16 +679,16 @@ tidy_install() { msg "$(gettext "Tidying install...")" if [ "$(check_option docs)" = "n" ]; then - msg2 "$(gettext "Removing info/doc files...")" + msg2 "$(gettext "Removing doc files...")" #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi if [ "$(check_option zipman)" = "y" ]; then - msg2 "$(gettext "Compressing man pages...")" + msg2 "$(gettext "Compressing man and info pages...")" local manpage mandirs ext file link hardlinks hl - mandirs="usr/man usr/share/man usr/local/man usr/local/share/man opt/*/man" - find ${mandirs} -type f 2>/dev/null | + mandirs=({usr{,/local}{,/share},opt/*}/{man,info}) + find ${mandirs[@]} -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) if [ -f ${manpage} ]; then @@ -696,7 +696,7 @@ tidy_install() { file="${manpage##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage - find ${mandirs} -lname "$file" 2>/dev/null | + find ${mandirs[@]} -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" ln -sf "${file}.gz" "${link}.gz" @@ -704,7 +704,7 @@ tidy_install() { # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist - hardlinks="$(find ${mandirs} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true + hardlinks="$(find ${mandirs[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true for hl in ${hardlinks}; do rm -f "${hl}"; done -- 1.5.6.5

1 0

[pacman-dev] sourcing /etc/profile and set -e bug in makepkg
by Allan McRae 11 Aug '08

11 Aug '08

So, despite me assuring Dan that nothing could possibly go wrong, the commit to source /etc/profile rather than individual files in /etc/profile.d (http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=0e0a8461) has caused a problem. See FS#11179 (http://bugs.archlinux.org/task/11179) for more details. Xavier and I are stuck as to what is actually causing this problem. The guilty script being sourced is /etc/bash_completion.d/modules and specifically the "type modules" statement at the top. What we don't understand is that this file is being sourced under both methods and why it is causing problems only with one. Even more confusing, the way it gets sourced in /etc/profile is essentially the way makepkg used to do it (loop over /etc/profile.d/* files). A work-around is to add "set +e" and "set -e" on either side of the "source /etc/profile" call. That is probably a good idea anyway as that sourcing should probably not inherit the "-e" property. But can anyone explain why we now need this? Very confused, Allan

2 3

[pacman-dev] Pacman only tries to resolve with the primary nameserver
by Teran McKinney 10 Aug '08

10 Aug '08

Hey, While revamping eleutherNet's ( http://eleuther.net ) DNS setup and giving it external IPv6 connectability, I found Pacman's sync server resolving method to be problematic during testing. Pacman 3.2.0 seems to only try the primary nameserver when resolving a server to sync to. The common (though not completely ideal) practice for using internal domains in VPNs is making the internal DNS server your primary and keeping your normal nameserver as secondary for resolving "real" domains after the VPN's DNS server fails to resolve the domain. Almost all applications will try to resolve through the whole nameserver list if there are no matches initially, but Pacman does not seem to.do this. Pacman is an awesome package manager, but having either optional or standard functionality for this would be nice. Thanks, Teran (sega01)

2 1

[pacman-dev] [PATCH] Fix segfault on x86_64 when using UseSyslog
by Dan McGee 10 Aug '08

10 Aug '08

Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c38dfb5..2847db7 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -25,6 +25,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include <fcntl.h> #include <unistd.h> @@ -401,12 +402,18 @@ int _alpm_rmrf(const char *path) return(0); } -int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list args) +int _alpm_logaction(unsigned short usesyslog, FILE *f, + const char *fmt, va_list args) { int ret = 0; if(usesyslog) { - vsyslog(LOG_WARNING, fmt, args); + /* we can't use a va_list more than once, so we need to copy it + * so we can use the original when calling vfprintf below. */ + va_list args_syslog; + va_copy(args_syslog, args); + vsyslog(LOG_WARNING, fmt, args_syslog); + va_end(args_syslog); } if(f) { -- 1.5.6.5

4 4

Re: [pacman-dev] [arch-dev-public] [signoff] pacman 3.2.0
by Dan McGee 10 Aug '08

10 Aug '08

On Thu, Jul 31, 2008 at 2:01 AM, Eric Belanger <belanger(a)astro.umontreal.ca> wrote: > On Wed, 30 Jul 2008, Dan McGee wrote: > >> Pacman 3.2.0 is in testing for i686. Please signoff. Changes outlined >> here: http://projects.archlinux.org/?p=pacman.git;a=blob;f=NEWS >> > > When building mythbrowser, I noticed that makepkg now fails when there is an > '?' in the sources, e.g. > source=("http://www.mythtv.org/modules.php?name=Downloads&d_op=getit&lid=136&foo=/my…") > > Removing the double quotes and escaping the characters doesn't work. > > The error message: > > ==> ERROR: There is no agent set up to handle URLs. Check > /etc/makepkg.conf. > Aborting... > > Not a showstopper as the source can be downloaded maunally in the build dir. > I'll try to look into it further tomorrow. We have a regression here, and it is actually bigger than it looks at first sight. Can you file a bug report for this? Tracing the code shows that %o and %u are never even used right now, as they don't make it all the way through to the download stage. -Dan

9 20

Re: [pacman-dev] Bugs in pacman and yaourt bash completion
by Dan McGee 09 Aug '08

09 Aug '08

On Sat, Aug 9, 2008 at 4:38 PM, Jim Pryor <jim(a)jimpryor.net> wrote: > Hi, I've found a bug in the /etc/bash_completion.d/{pacman,yaourt} > files. > > The bug is in the function _available_groups, which is included in both > files. The second-to-last line of the function (line 70 in pacman, line > 71 in yaourt) looks like this: > > available_groups=$(...do sed '/%GROUPS%/...) > > That sed should have a '-n' flag. CCing to pacman-dev. Can you open a bug for this instead of a private email, or at least email the mailing list next time? Thanks.

1 0

Re: [pacman-dev] [arch-dev-public] info pages
by Allan McRae 09 Aug '08

09 Aug '08

Eric Belanger wrote: > On Wed, 6 Aug 2008, Allan McRae wrote: > >> Allan McRae wrote: >>> Hi all, >>> >>> Just a heads up with something I have remembered while packaging >>> with the new pacman release. Including docs is the default in >>> makepkg.conf now so if there is a large amount of documentation you >>> will want to add a !docs to the PKGBUILD options. Also, every >>> package that needs the --mandir configure flag will probably need >>> and --infodir one too. An annoying number of packages with info >>> pages install a /usr/share/info/dir file so that will need removed >>> at the end of the PKGBUILD. >>> >> >> I have discovered that at least one package has to have a >> /usr/share/info/dir file or the info command complains that it is >> missing. It seems that ideally all packages with info directories >> should add/remove entries in this file when installing/removing the >> package, although calling "info <something not in dir file>" seems to >> work, but I might be missing something.... The point is that adding >> info files properly involves an install file with "install-info" >> commands for each info page in the package. Isn't including docs fun! >> >> Allan >> > > The emacs package already does this. The emacs.install file could be > used as a template for this info stuff. > A template based in that is making its way into the prototypes found in the ABS packages which I am going to make a release of soon. CC: pacman-dev - We should also automatically compress the info files like we do the man pages. Allan

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-8-g57bd897
by dan＠archlinux.org 09 Aug '08

09 Aug '08

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 57bd8974c73571d827617f4df0a6917f13696493 (commit) via d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 (commit) via 57393eb730641ca912a421b70897fcd289c44b21 (commit) via f201f107dbee25294aa7c7f1139bf521e6afa267 (commit) from 72c5a298a3ee0f18019010ef2eb43da654ec25f8 (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 57bd8974c73571d827617f4df0a6917f13696493 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 9 15:54:29 2008 +1000 Fix creation of source package with local source files Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 22:18:00 2008 -0500 Fix segfault on x86_64 when using UseSyslog Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 57393eb730641ca912a421b70897fcd289c44b21 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 13:45:46 2008 -0500 Fix variable naming issues in _alpm_db_cmp When this function got a rewrite in commit f43805d875, argument and variable names got a bit mixed up when separating the casts from the strcmp operation. Fix the mixup which also fixes a possible segfault when this function is called. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f201f107dbee25294aa7c7f1139bf521e6afa267 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 7 13:11:20 2008 -0500 doc: allow asciidoc to format the note By doing the bolding manually, it doesn't look as cool in the HTML generated manpages. Let asciidoc do the work. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 5 +++-- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 2 +- lib/libalpm/util.c | 11 +++++++++-- scripts/makepkg.sh.in | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-8-g57bd897
by dan＠archlinux.org 09 Aug '08

09 Aug '08

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 57bd8974c73571d827617f4df0a6917f13696493 (commit) via d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 (commit) via 57393eb730641ca912a421b70897fcd289c44b21 (commit) via f201f107dbee25294aa7c7f1139bf521e6afa267 (commit) from 72c5a298a3ee0f18019010ef2eb43da654ec25f8 (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 57bd8974c73571d827617f4df0a6917f13696493 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 9 15:54:29 2008 +1000 Fix creation of source package with local source files Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8f8a126658a25fdad5e9fb00b1b0838a7e93c68 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 22:18:00 2008 -0500 Fix segfault on x86_64 when using UseSyslog Due to differences in handling va_list between i686 and x86_64, this bug can only be seen on x86_64. va_list usage is not allowed but we had been getting away with it. See http://lists.opensuse.org/opensuse-programming/2008-02/msg00005.html for details and explanation. This fixes FS#11096. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 57393eb730641ca912a421b70897fcd289c44b21 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 8 13:45:46 2008 -0500 Fix variable naming issues in _alpm_db_cmp When this function got a rewrite in commit f43805d875, argument and variable names got a bit mixed up when separating the casts from the strcmp operation. Fix the mixup which also fixes a possible segfault when this function is called. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f201f107dbee25294aa7c7f1139bf521e6afa267 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 7 13:11:20 2008 -0500 doc: allow asciidoc to format the note By doing the bolding manually, it doesn't look as cool in the HTML generated manpages. Let asciidoc do the work. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.txt | 5 +++-- lib/libalpm/db.c | 4 ++-- lib/libalpm/db.h | 2 +- lib/libalpm/util.c | 11 +++++++++-- scripts/makepkg.sh.in | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix creation of source package with local source files
by Allan McRae 09 Aug '08

09 Aug '08

Fixes FS#11149. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3604d10..c5dbed9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -957,7 +957,7 @@ create_srcpackage() { local file=$(strip_url "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s $netfile "${srclinks}/${pkgname}" + ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" -- 1.5.6.5

1 0

[pacman-dev] [BUG] alpm_list_remove need an initalized pointer for void **data
by solsTiCe d'Hiver 08 Aug '08

08 Aug '08

hi. i am playing with alpm and db4 to make a little program for me. just for fun. and in this new release of libalpm (along pacman 3.2.0) i have found that alpm_list_remove behave differently than before. so the last parameter (void **data) need to be initialized to avoid a seg fault. it happens in alpm_db_unregister if you unregister a sync db if you run this, you will see it happen #include <stdio.h> #include <stdlib.h> #include <alpm.h> int main(void) { pmdb_t *db; pmpkg_t *pkg; const char *s; alpm_initialize(); alpm_option_set_root("/"); alpm_option_set_dbpath("/var/lib/pacman"); alpm_option_add_cachedir("/var/cache/pacman/pkg"); alpm_option_set_logfile("/dev/stdout"); db = alpm_db_register_sync("extra"); puts("alpm_db_unregister(db)"); alpm_db_unregister(db); puts("alpm_release()"); alpm_release(); exit(EXIT_SUCCESS); } i wonder how it has not generated more bug in libalpm. so i check all uninitalised pointer in libalpm before alpm_list_remove and i found 3 occurences see the patch diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 032cc97..b7681db 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -135,7 +135,7 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg) { - void *vdata; + void *vdata=NULL; pmpkg_t *data; ALPM_LOG_FUNC; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index d9a3931..c0d322c 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -145,7 +145,7 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db) * databases by walking through the list returned by * alpm_option_get_syncdbs, because the db is removed from that list here. */ - void *data; + void *data=NULL; handle->dbs_sync = alpm_list_remove(handle->dbs_sync, db, _alpm_db_cmp, &data); if(data) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 864fafa..6ea16c0 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -118,7 +118,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, alpm_list_t *i; for(i = lp; i; i = i->next) { pmdepmissing_t *miss = (pmdepmissing_t *)i->data; - void *vpkg; + void *vpkg=NULL; pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg); if(pkg == NULL) { continue;

3 13

Re: [pacman-dev] [arch-general] rotate pacman log?
by Aaron Griffin 08 Aug '08

08 Aug '08

On Thu, Aug 7, 2008 at 4:05 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Thu, Aug 7, 2008 at 3:49 PM, Dale Blount <dale(a)archlinux.org> wrote: >> On Thu, 2008-08-07 at 15:42 -0500, Aaron Griffin wrote: >>> On Thu, Aug 7, 2008 at 3:38 PM, David Rosenstrauch <darose(a)darose.net> wrote: >>> > I noticed that the pacman log doesn't get rotated. Seems like it should, as >>> > it could get rather big over time. Any particular reason why the package >>> > doesn't provide a /etc/logrotate.d/ script by default? >>> >>> I don't see a problem with that. Probably a good idea too. If you want >>> to provide a file for pacman, I'm sure Dan would be happy to include >>> it in the arch package. >> >> My only request here is that it saves at least a years worth of updates >> by default. If something breaks on my system and I don't notice it for >> a few months, I can't tell if an update broke it or not. >> >> I have a 828Kb pacman.log from a 5 year old install. Granted I don't >> -Syu as often as I should, but it still seems manageable at many times >> that on modern hardware. > > I'm actually with Dale here. I find it nice to go all the way back to > the "beginning of time" with my install so I can see exactly what may > have pulled in a now unneeded dep, etc. I just used this on my Eee > yesterday to remove unnecessary packages originally pulled in by > OpenOffice (hsqldb). I would rather old logs never get deleted; but > even more I would rather the file never get touched. > > There is a separate concern I have wanted to address for a while, and > that is the mixing of what was previously a pristine pacman.log with > the scriptlet messages. It is a great idea, but in practice, it makes > this file not near as concise as it once was. In an ideal world: > 1) pacman.log would return to only being upgrade/install/remove messages. > 2) another log file would be added that contained the verbose stuff. > pacman_messages.log or something. > 3) pacman.log never rotates/deletes. > 4) pacman_messages.log rotates/deletes. > > What do people think of this? While we're proposing ideas.... what about this: * new scriptlet function "message()", that just outputs text. * add a -Q operation to call the message() function. Then there's really no need for scriptlet logging at all.

4 4

[pacman-dev] -h/ --help option
by Matthias Gorissen 07 Aug '08

07 Aug '08

A user in the .de-forum pointed out that -h/ --help have the same output, even though the second version should display more info. Any thoughts on that?

5 5