- Pacman-dev - lists.archlinux.org

[pacman-dev] Pacman 3.2.2 string freeze
by Dan McGee 03 Jan '09

03 Jan '09

String freeze for the pacman 3.2.2 release is now in effect. Our pacman translation policy is outlined here. The important sections for translators are the introduction and up to (and including) pre-release updates. http://www.archlinux.org/pacman/translation-help.html As stated in the above document, PO files have been made available to translate: http://code.toofishes.net/pacman/po_files/ I'm shooting for a release approximately 5 days from now, but that could change depending on how quick we get translations back and sneak some last-minute fixes in. Languages we currently have: cs:Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> de: Matthias Gorissen <matthias(a)archlinux.de> en_GB: Jeff Bailes <thepizzaking(a)gmail.com> (Already complete) es: Juan Pablo Gonzalez <jotapesan(a)gmail.com> fr: Xavier Chantry <shiningxc(a)gmail.com> hu: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> it: Giovanni Scafora <linuxmania(a)gmail.com> pl: Mateusz Herych <heniekk(a)gmail.com> pt_BR: Hugo Doria <hugo(a)archlinux.org> ru: Sergey Tereschenko <serg.partizan(a)gmail.com> tr: Samed Beyribey <beyribey(a)gmail.com> zh_CN: 甘露(Lu.Gan) <rhythm.gan(a)gmail.com> If you wish to help translate, but your language is already listed as handled by someone, please contact them at the above addresses. If the language is listed as "no current translator", then please reply to ALL on this message stating you are doing the translation so we do not have duplicated effort (although you are more than welcome to work in teams). Once you have updated or completed a translation, simply tar and gzip the files up and send them back to pacman-dev(a)archlinux.org with a [translation] prefix in the message. For those that are used to the old method of updating translations (GIT patches), those are still acceptable as well. Please prefix the patch with "translation:" so it can be picked out easily. Any questions should be answered if you reply to this email on the list. -Dan

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-37-g792ee97
by dan＠archlinux.org 03 Jan '09

03 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 792ee976455d4c33c802f58d28d56550a61c3c65 (commit) from a73ad4f0e3981acab7234e4b17a08a52bd273ab9 (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 792ee976455d4c33c802f58d28d56550a61c3c65 Author: Juan Pablo González Tognarelli <lord_jotape(a)yahoo.com.ar> Date: Sat Jan 3 00:30:09 2009 -0600 Update Spanish translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/es.po | 16 +++--- po/es.po | 147 ++++++++++++++++++++++++++------------------------ 2 files changed, 84 insertions(+), 79 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] spanish translation for pacman 3.2.2
by Juan Pablo González T. 03 Jan '09

03 Jan '09

HI! Like the speed of light i updated the translation. The po files are attached.. Greetings! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Juan Pablo González Tognarelli | http://lacasadeljota.blogspot.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ¡Felices Fiestas! Enviale una tarjeta electronica gratis a tu familia y amigos y deseales felices fiestas. http://yahoomorado.com/tarjetas/

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-36-ga73ad4f
by dan＠archlinux.org 03 Jan '09

03 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via a73ad4f0e3981acab7234e4b17a08a52bd273ab9 (commit) via b3169a5687bfc02fd512f1a1b5f83dfe00bbce7c (commit) from c31fcfd833fc527a3774c7b1bc29686194d23942 (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: lib/libalpm/add.c | 10 ++++++++++ lib/libalpm/be_files.c | 24 +++++++++++++++++++++--- lib/libalpm/db.h | 1 + lib/libalpm/remove.c | 1 + 4 files changed, 33 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-80-ga30bf86
by dan＠archlinux.org 03 Jan '09

03 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a30bf868ca4cce5464f7e4aa55cd7e7d4eade9a2 (commit) via 1cc8ad6112ed07a71f356a6bb0f06f117b36b3b2 (commit) via 8f26bb9052fe1bb131d2062da4fcd917fc9ad4da (commit) via 9a7f68317aa652cbc89e7fa69381d6239a63a6e7 (commit) via 774c252753c3c1717684bea234a497941aa864d7 (commit) via 1b7ff7a636b6ca6bbcb3953c681bd22166f4a6ca (commit) via bb9b19a6c45e39bd617faa5eb47c074f9c12f94e (commit) via b55f478042053dfb749da7ce0a48fc0e49112093 (commit) via a73ad4f0e3981acab7234e4b17a08a52bd273ab9 (commit) via b3169a5687bfc02fd512f1a1b5f83dfe00bbce7c (commit) from e49adbea4c67b2fd49910697229682e0a85fe9b2 (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 a30bf868ca4cce5464f7e4aa55cd7e7d4eade9a2 Merge: 1cc8ad6112ed07a71f356a6bb0f06f117b36b3b2 a73ad4f0e3981acab7234e4b17a08a52bd273ab9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 3 00:18:22 2009 -0600 Merge branch 'maint' commit 1cc8ad6112ed07a71f356a6bb0f06f117b36b3b2 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 2 03:32:05 2009 +1000 makepkg: Add support for specifying LDFLAGS Provide support for specifying LDFLAGS within makepkg.conf but leaves this undefined by default. Fixes FS#12542. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f26bb9052fe1bb131d2062da4fcd917fc9ad4da Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 27 16:35:06 2008 +1000 makepkg: move BUILDSCRIPT from makepkg.conf Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing of options, breaking the -p option and --help output. The solution is to move BUILDSCRIPT out of makepkg.conf. This patch moves the definition BUILDSCRIPT back to makepkg itself and adds configure option to allow easy changing of this value during build time. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a7f68317aa652cbc89e7fa69381d6239a63a6e7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 7 21:14:32 2008 +1000 makepkg: Introduce purge option The purge option, combined with the PURGE_TARGETS variable, allows makepkg to automatically remove commonly confliting or removed files (e.g. /usr/share/info/dir, *.pod). Original work: Tim Yang Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 774c252753c3c1717684bea234a497941aa864d7 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 27 14:47:29 2008 +1000 makepkg: Add used options to PKGINFO file Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b7ff7a636b6ca6bbcb3953c681bd22166f4a6ca Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 5 14:13:15 2008 +1000 makepkg: add fallback for when MAN_DIRS is unset This prevents makepkg compressing every file when MAN_DIRS is not supplied in makepkg.conf Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bb9b19a6c45e39bd617faa5eb47c074f9c12f94e Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 23 21:17:15 2008 +1000 makepkg: provide MAN_DIRS configuration variable Provides a MAN_DIRS variable in makepkg.conf which can be used to specify folders to look for manual (man and info) pages to be compressed. Useful for packages that install to /opt. Also clarifies that "zipman" means "zip manuals" and covers both man and info pages. Original work by: Tiago Pierezan Camargo <tcamargo at gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b55f478042053dfb749da7ce0a48fc0e49112093 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 2 13:47:04 2008 +1000 libalpm: add PID to db.lck This is the first step in being able to automatically remove phantom lock files. Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: fix compilation warnings] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 +++++++++ doc/makepkg.conf.5.txt | 23 ++++++++++++++++++++++- etc/makepkg.conf.in | 15 ++++++++++----- lib/libalpm/add.c | 10 ++++++++++ lib/libalpm/be_files.c | 24 +++++++++++++++++++++--- lib/libalpm/db.h | 1 + lib/libalpm/remove.c | 1 + lib/libalpm/util.c | 15 +++++++++++++-- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 46 ++++++++++++++++++++++++++++++++++++---------- 10 files changed, 124 insertions(+), 21 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-34-gc31fcfd
by dan＠archlinux.org 03 Jan '09

03 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via c31fcfd833fc527a3774c7b1bc29686194d23942 (commit) via cb03817ee85905db8a06278f1f7efaa3e9174bf9 (commit) via bd2de5cdf6e1773e0d661683eed315a3e5261f77 (commit) via 2f59996c54da473294de4adf44d521299a045a84 (commit) via f4651c49af94164f2c129ea6eb3d78b86be4d5bc (commit) via 751d37e749fcb0a06bb21dee4b5b6d0b062ed284 (commit) via 08980fb4bcf4078b4b22b2c1f6f36cbbdee89ec4 (commit) via cc7f3b705e1c3a1fdc356942134456559ce69230 (commit) via 89b0a76b3cd6840731f856b358e33d5771e9e1c5 (commit) from 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (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: doc/Makefile.am | 1 + doc/PKGBUILD.5.txt | 11 ++-- doc/makepkg.8.txt | 2 +- lib/libalpm/dload.c | 6 ++ po/cs.po | 66 ++++++++++++++++++-------- po/de.po | 72 +++++++++++++++++++---------- po/en_GB.po | 66 ++++++++++++++++++-------- po/es.po | 74 +++++++++++++++++++---------- po/fr.po | 71 +++++++++++++++++++--------- po/hu.po | 61 ++++++++++++++++-------- po/it.po | 72 +++++++++++++++++++---------- po/pacman.pot | 48 ++++++++++++-------- po/pl.po | 68 ++++++++++++++++++--------- po/pt_BR.po | 70 +++++++++++++++++++--------- po/ru.po | 74 +++++++++++++++++++---------- po/tr.po | 70 +++++++++++++++++++--------- po/uk.po | 69 +++++++++++++++++++--------- po/zh_CN.po | 44 ++++++++++++++---- scripts/Makefile.am | 3 +- scripts/makepkg.sh.in | 123 +++++++++++++++++++++++++++++++++++++++++++------ 20 files changed, 748 insertions(+), 323 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-70-ge49adbe
by dan＠archlinux.org 03 Jan '09

03 Jan '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e49adbea4c67b2fd49910697229682e0a85fe9b2 (commit) via f8b689d48eb34cf81c22c854cd83595338d49d44 (commit) via c31fcfd833fc527a3774c7b1bc29686194d23942 (commit) via cb03817ee85905db8a06278f1f7efaa3e9174bf9 (commit) via bd2de5cdf6e1773e0d661683eed315a3e5261f77 (commit) via 2f59996c54da473294de4adf44d521299a045a84 (commit) via f4651c49af94164f2c129ea6eb3d78b86be4d5bc (commit) via 751d37e749fcb0a06bb21dee4b5b6d0b062ed284 (commit) via 08980fb4bcf4078b4b22b2c1f6f36cbbdee89ec4 (commit) via cc7f3b705e1c3a1fdc356942134456559ce69230 (commit) via 89b0a76b3cd6840731f856b358e33d5771e9e1c5 (commit) from bd628274cc8db81704860e69894fcd217c2068d0 (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 e49adbea4c67b2fd49910697229682e0a85fe9b2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 2 22:49:51 2009 -0600 Add a .gitattributes file This will make python diffs prettier. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f8b689d48eb34cf81c22c854cd83595338d49d44 Merge: bd628274cc8db81704860e69894fcd217c2068d0 c31fcfd833fc527a3774c7b1bc29686194d23942 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 2 22:48:52 2009 -0600 Merge branch 'maint' Conflicts: lib/libalpm/dload.c po/it.po scripts/makepkg.sh.in ----------------------------------------------------------------------- Summary of changes: .gitattributes | 1 + doc/Makefile.am | 1 + doc/PKGBUILD.5.txt | 11 ++-- doc/makepkg.8.txt | 2 +- lib/libalpm/dload.c | 6 ++ po/cs.po | 66 ++++++++++++++++++-------- po/de.po | 72 +++++++++++++++++++---------- po/en_GB.po | 66 ++++++++++++++++++-------- po/es.po | 74 +++++++++++++++++++---------- po/fr.po | 71 +++++++++++++++++++--------- po/hu.po | 61 ++++++++++++++++-------- po/pacman.pot | 48 ++++++++++++-------- po/pl.po | 68 ++++++++++++++++++--------- po/pt_BR.po | 70 +++++++++++++++++++--------- po/ru.po | 74 +++++++++++++++++++---------- po/tr.po | 70 +++++++++++++++++++--------- po/uk.po | 69 +++++++++++++++++++--------- po/zh_CN.po | 44 ++++++++++++++---- scripts/Makefile.am | 3 +- scripts/makepkg.sh.in | 123 +++++++++++++++++++++++++++++++++++++++++++------ 20 files changed, 701 insertions(+), 299 deletions(-) create mode 100644 .gitattributes hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Separate local db dircetory creation and db write
by Allan McRae 03 Jan '09

03 Jan '09

Changelogs and install files were getting extracted into the local db folder before it was manually created. This created issues for uses with 0077 umasks and was highlighted with the new sudo handling of umasks (FS#12263). This moves the local db creation to its own function which is called before the start of package archive extraction. Also, added a check that the folder is actually created. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 10 ++++++++++ lib/libalpm/be_files.c | 24 +++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index eef7aab..c200c3c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -696,6 +696,16 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } } + /* prepare directory for database entries so permission are correct after + changelog/install script installation (FS#12263) */ + if(_alpm_db_mkdir(db, newpkg)) { + alpm_logaction("error: could not create database directory %s-%s\n", + alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); + pm_errno = PM_ERR_DB_WRITE; + ret = -1; + goto cleanup; + } + if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { struct archive *archive; struct archive_entry *entry; diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index b9ff646..7d04ade 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -652,6 +652,26 @@ error: return(-1); } +int _alpm_db_mkdir(pmdb_t *db, pmpkg_t *info) +{ + mode_t oldmask; + int retval = 0; + char *pkgpath = NULL; + + oldmask = umask(0000); + + pkgpath = get_pkgpath(db, info); + + if((retval = mkdir(pkgpath, 0755)) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not create directory %s: %s\n"), pkgpath, strerror(errno)); + } + + free(pkgpath); + umask(oldmask); + + return(retval); +} + int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; @@ -670,10 +690,8 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) pkgpath = get_pkgpath(db, info); - oldmask = umask(0000); - mkdir(pkgpath, 0755); /* make sure we have a sane umask */ - umask(0022); + oldmask = umask(0022); if(strcmp(db->treename, "local") == 0) { local = 1; -- 1.6.1

2 2

[pacman-dev] [PATCH] Fix for trans001.py (FS#9088)
by Nagy Gabor 02 Jan '09

02 Jan '09

From 01ba4fce1e7bf2c6058074c583e5db5147d31f02 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 2 Jan 2009 17:43:05 +0100 Subject: [PATCH] Fix for trans001.py (FS#9088) From now on _alpm_db_find_fileconflicts() works with upgrade and remove target lists (like checkdeps), which makes it transaction independent (we still need a trans param because of the progressbar). This is a small step towards the universal transaction. So we call this function directly from sync.c before commiting the remove transaction. This is much safer, but we can get false fileconflict error alarms in some tricky cases ("symlinks puzzle" etc). The patch on find_fileconflict looks complex, but it is mainly an "indent-patch", the new code-part can be found after the /* check remove list ... */ comment, and I modified something around the "file has changed hand" case (see comment modifications in the code). Unfortunately sync.c became more ugly, because we have to create 2 parallel internal transactions: to avoid duplicated work, upgrade transaction is used to load package data (filelists). This problem will disappear, when we finally get rid of internal transactions. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 2 +- lib/libalpm/conflict.c | 90 ++++++++++++++++++------------------ lib/libalpm/conflict.h | 3 +- lib/libalpm/sync.c | 111 ++++++++++++++++++++++++++------------------- pactest/tests/trans001.py | 2 - 5 files changed, 112 insertions(+), 96 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5098bfe..8b82ce7 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -166,7 +166,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n"); - lp = _alpm_db_find_fileconflicts(db, trans, handle->root); + lp = _alpm_db_find_fileconflicts(db, trans, trans->packages, NULL); if(lp != NULL) { if(data) { *data = lp; diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 499e55a..139176a 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -350,16 +350,16 @@ void _alpm_fileconflict_free(pmfileconflict_t *conflict) /* Find file conflicts that may occur during the transaction with two checks: * 1: check every target against every target * 2: check every target against the filesystem */ -alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root) +alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, + alpm_list_t *upgrade, alpm_list_t *remove) { - alpm_list_t *i, *conflicts = NULL; - alpm_list_t *targets = trans->packages; - int numtargs = alpm_list_count(targets); + alpm_list_t *i, *j, *conflicts = NULL; + int numtargs = alpm_list_count(upgrade); int current; ALPM_LOG_FUNC; - if(db == NULL || targets == NULL || root == NULL) { + if(db == NULL || upgrade == NULL) { return(NULL); } @@ -367,8 +367,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo * be possible with real transactions. Right now we only do half as much * here as we do when we actually extract files in add.c with our 12 * different cases. */ - for(current = 1, i = targets; i; i = i->next, current++) { - alpm_list_t *j, *k, *tmpfiles = NULL; + for(current = 1, i = upgrade; i; i = i->next, current++) { + alpm_list_t *k, *tmpfiles = NULL; pmpkg_t *p1, *p2, *dbpkg; char path[PATH_MAX+1]; @@ -392,7 +392,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo if(tmpfiles) { for(k = tmpfiles; k; k = k->next) { - snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data); + snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_TARGET, path, alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); } @@ -408,7 +408,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo _alpm_log(PM_LOG_DEBUG, "searching for filesystem conflicts: %s\n", p1->name); dbpkg = _alpm_db_get_pkgfromcache(db, p1->name); - /* Do two different checks here. f the package is currently installed, + /* Do two different checks here. If the package is currently installed, * then only check files that are new in the new package. If the package * is not currently installed, then simply stat the whole filelist */ if(dbpkg) { @@ -420,12 +420,10 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1)); } - /* loop over each file to be installed */ for(j = tmpfiles; j; j = j->next) { - int skip_conflict = 0; filestr = j->data; - snprintf(path, PATH_MAX, "%s%s", root, filestr); + snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); /* stat the file - if it exists, do some checks */ if(_alpm_lstat(path, &lsbuf) != 0) { @@ -436,48 +434,50 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo if(path[strlen(path)-1] == '/') { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path); - skip_conflict = 1; + continue; } else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "%s is a symlink to a dir, hopefully not a conflict\n", path); - skip_conflict = 1; + continue; } } - if(!skip_conflict) { - _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path); - - /* Look at all the targets to see if file has changed hands */ - int resolved_conflict = 0; /* have we acted on this conflict? */ - for(k = targets; k; k = k->next) { - p2 = k->data; - if(!p2 || strcmp(p1->name, p2->name) == 0) { - continue; - } + _alpm_log(PM_LOG_DEBUG, "checking possible conflict: %s\n", path); - pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name); - - /* Check if it used to exist in a package, but doesn't anymore */ - alpm_list_t *pkgfiles, *localfiles; /* added for readability */ - pkgfiles = alpm_pkg_get_files(p2); - localfiles = alpm_pkg_get_files(localp2); - - if(localp2 && !alpm_list_find_str(pkgfiles, filestr) - && alpm_list_find_str(localfiles, filestr)) { - /* skip removal of file, but not add. this will prevent a second - * package from removing the file when it was already installed - * by its new owner (whether the file is in backup array or not */ - trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); - _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); - resolved_conflict = 1; - break; - } + int resolved_conflict = 0; /* have we acted on this conflict? */ + + /* Check remove list (will we remove the conflicting local file?) */ + for(k = remove; k && !resolved_conflict; k = k->next) { + pmpkg_t *rempkg = k->data; + if(rempkg && alpm_list_find_str(alpm_pkg_get_files(rempkg), filestr)) { + _alpm_log(PM_LOG_DEBUG, "local file will be removed, not a conflict: %s\n", filestr); + resolved_conflict = 1; } - if(!resolved_conflict) { - _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); - conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, - path, p1->name, NULL); + } + + /* Look at all the targets to see if file has changed hands */ + for(k = upgrade; k && !resolved_conflict; k = k->next) { + p2 = k->data; + if(!p2 || strcmp(p1->name, p2->name) == 0) { + continue; + } + pmpkg_t *localp2 = _alpm_db_get_pkgfromcache(db, p2->name); + + /* localp2->files will be removed (target conflicts are handled by CHECK 1) */ + if(localp2 && alpm_list_find_str(alpm_pkg_get_files(localp2), filestr)) { + /* skip removal of file, but not add. this will prevent a second + * package from removing the file when it was already installed + * by its new owner (whether the file is in backup array or not */ + trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(path)); + _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); + resolved_conflict = 1; } } + + if(!resolved_conflict) { + _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); + conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, + path, p1->name, NULL); + } } FREELIST(tmpfiles); } diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 71ed579..1c67372 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -41,7 +41,8 @@ void _alpm_conflict_free(pmconflict_t *conflict); int _alpm_conflict_isin(pmconflict_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages); alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages); -alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *root); +alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, + alpm_list_t *upgrade, alpm_list_t *remove); void _alpm_fileconflict_free(pmfileconflict_t *conflict); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 607057c..d3b5332 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -769,7 +769,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) { alpm_list_t *i, *j, *files = NULL; alpm_list_t *deltas = NULL; - pmtrans_t *tr = NULL; + pmtrans_t *tr_remove = NULL, *tr_upgrade = NULL; int replaces = 0; int errors = 0; const char *cachedir = NULL; @@ -914,61 +914,44 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) return(0); } - /* remove conflicting and to-be-replaced packages */ trans->state = STATE_COMMITING; - tr = _alpm_trans_new(); - if(tr == NULL) { + + /* Create remove and upgrade transactions */ + tr_remove = _alpm_trans_new(); + if(tr_remove == NULL) { _alpm_log(PM_LOG_ERROR, _("could not create removal transaction\n")); goto error; } + tr_upgrade = _alpm_trans_new(); + if(tr_upgrade == NULL) { + _alpm_log(PM_LOG_ERROR, _("could not create transaction\n")); + goto error; + } - if(_alpm_trans_init(tr, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, NULL, NULL, NULL) == -1) { + if(_alpm_trans_init(tr_remove, PM_TRANS_TYPE_REMOVE, PM_TRANS_FLAG_NODEPS, NULL, NULL, NULL) == -1) { _alpm_log(PM_LOG_ERROR, _("could not initialize the removal transaction\n")); goto error; } + if(_alpm_trans_init(tr_upgrade, PM_TRANS_TYPE_UPGRADE, trans->flags, trans->cb_event, trans->cb_conv, trans->cb_progress) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not initialize transaction\n")); + goto error; + } + /* adding targets */ for(i = trans->packages; i; i = i->next) { pmsyncpkg_t *sync = i->data; alpm_list_t *j; + /* remove transaction */ for(j = sync->removes; j; j = j->next) { pmpkg_t *pkg = j->data; - if(!_alpm_pkg_find(tr->packages, pkg->name)) { - if(_alpm_trans_addtarget(tr, pkg->name) == -1) { + if(!_alpm_pkg_find(tr_remove->packages, pkg->name)) { + if(_alpm_trans_addtarget(tr_remove, pkg->name) == -1) { goto error; } replaces++; } } - } - if(replaces) { - _alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n"); - if(_alpm_trans_prepare(tr, data) == -1) { - _alpm_log(PM_LOG_ERROR, _("could not prepare removal transaction\n")); - goto error; - } - /* we want the frontend to be aware of commit details */ - tr->cb_event = trans->cb_event; - if(_alpm_trans_commit(tr, NULL) == -1) { - _alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n")); - goto error; - } - } - _alpm_trans_free(tr); - tr = NULL; - - /* install targets */ - _alpm_log(PM_LOG_DEBUG, "installing packages\n"); - tr = _alpm_trans_new(); - if(tr == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not create transaction\n")); - goto error; - } - if(_alpm_trans_init(tr, PM_TRANS_TYPE_UPGRADE, trans->flags | PM_TRANS_FLAG_NODEPS, trans->cb_event, trans->cb_conv, trans->cb_progress) == -1) { - _alpm_log(PM_LOG_ERROR, _("could not initialize transaction\n")); - goto error; - } - for(i = trans->packages; i; i = i->next) { - pmsyncpkg_t *sync = i->data; + /* upgrade transaction */ pmpkg_t *spkg = sync->pkg; const char *fname; char *fpath; @@ -980,7 +963,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* Loop through the cache dirs until we find a matching file */ fpath = _alpm_filecache_find(fname); - if(_alpm_trans_addtarget(tr, fpath) == -1) { + if(_alpm_trans_addtarget(tr_upgrade, fpath) == -1) { FREE(fpath); goto error; } @@ -988,15 +971,50 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* using alpm_list_last() is ok because addtarget() adds the new target at the * end of the tr->packages list */ - spkg = alpm_list_last(tr->packages)->data; + spkg = alpm_list_last(tr_upgrade->packages)->data; spkg->reason = sync->newreason; } - if(_alpm_trans_prepare(tr, data) == -1) { - _alpm_log(PM_LOG_ERROR, _("could not prepare transaction\n")); - /* pm_errno is set by trans_prepare */ - goto error; + + /* fileconflict check */ + if(!(trans->flags & PM_TRANS_FLAG_FORCE)) { + EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); + + _alpm_log(PM_LOG_DEBUG, "looking for file conflicts\n"); + alpm_list_t *conflict = _alpm_db_find_fileconflicts(db_local, tr_upgrade, + tr_upgrade->packages, tr_remove->packages); + if(conflict) { + pm_errno = PM_ERR_FILE_CONFLICTS; + if(data) { + *data = conflict; + } else { + alpm_list_free_inner(conflict, (alpm_list_fn_free)_alpm_fileconflict_free); + alpm_list_free(conflict); + } + goto error; + } + + EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL); } - if(_alpm_trans_commit(tr, NULL) == -1) { + + /* remove conflicting and to-be-replaced packages */ + if(replaces) { + _alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages\n"); + if(_alpm_trans_prepare(tr_remove, data) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not prepare removal transaction\n")); + goto error; + } + /* we want the frontend to be aware of commit details */ + tr_remove->cb_event = trans->cb_event; + if(_alpm_trans_commit(tr_remove, NULL) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n")); + goto error; + } + } + + /* install targets */ + _alpm_log(PM_LOG_DEBUG, "installing packages\n"); + /* add_prepare is not needed */ + if(_alpm_trans_commit(tr_upgrade, NULL) == -1) { _alpm_log(PM_LOG_ERROR, _("could not commit transaction\n")); goto error; } @@ -1005,9 +1023,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) error: FREELIST(files); alpm_list_free(deltas); - deltas = NULL; - _alpm_trans_free(tr); - tr = NULL; + _alpm_trans_free(tr_remove); + _alpm_trans_free(tr_upgrade); return(ret); } diff --git a/pactest/tests/trans001.py b/pactest/tests/trans001.py index b3d7883..b9889b1 100644 --- a/pactest/tests/trans001.py +++ b/pactest/tests/trans001.py @@ -18,5 +18,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_EXIST=pkg3") - -self.expectfailure = True -- 1.6.1

1 1

[pacman-dev] [PATCH] makepkg: detect incorrect usage of provides array
by Allan McRae 02 Jan '09

02 Jan '09

Using > or < in the provides array is wrong so make it cause an error. Fixes FS#12540. Also, use bash substitution rather than spawning new processes where possible in the error checking. Move split package detection to a better position. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 4 +++- scripts/makepkg.sh.in | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index f90d8c0..6cc1aa9 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -160,7 +160,9 @@ name. The syntax is: `$$source=('filename::url')$$` depend on 'cron' rather than 'dcron OR fcron'. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' - dependency of other packages. + dependency of other packages. Provisions involving the '>' and '<' + operators are invalid as only specifc versions of a package may be + provided. *replaces (array)*:: An array of packages that this package should replace, and can be used diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 66aaa5e..3b7490a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1574,6 +1574,10 @@ if [ "$GENINTEG" = "1" ]; then exit 0 # $E_OK fi +if [ "${#pkgname[@]}" -gt "1" ]; then + SPLITPKG=1 +fi + # check for no-no's in the build script if [ -z "$pkgname" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" @@ -1587,19 +1591,15 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ $pkgver != ${pkgver//-/} ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ $pkgrel != ${pkgrel//-/} ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi -if [ "${#pkgname[@]}" -gt "1" ]; then - SPLITPKG=1 -fi - if [ "$arch" = 'any' ]; then CARCH='any' fi @@ -1613,6 +1613,14 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +for provide in ${provides[@]}; do + if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + error "$(gettext "%s is not allowed to contain comparisons involving the > or < operators.")" "provides" + exit 1 + fi +done +unset provide + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 -- 1.6.1

2 1

[pacman-dev] [PATCH] makepkg: tidy version package tests
by Allan McRae 02 Jan '09

02 Jan '09

The use if "! -z" to check if a string is not null is not good practice so replace with the "-n" option. Also use the AND comparison within one test rather than on two separate tests. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3b7490a..57f0a59 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1145,27 +1145,27 @@ devel_check() { # number to avoid having to determine the version number twice. # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver - if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then + if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then [ $(type -p darcs) ] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then + elif [ -n "${_cvsroot}" -a -n "${_cvsmod}" ] ; then [ $(type -p cvs) ] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then + elif [ -n "${_gitroot}" -a -n "${_gitname}" ] ; then [ $(type -p git) ] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then + elif [ -n "${_svntrunk}" -a -n "${_svnmod}" ] ; then [ $(type -p svn) ] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') - elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then + elif [ -n "${_bzrtrunk}" -a -n "${_bzrmod}" ] ; then [ $(type -p bzr) ] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) - elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then + elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then [ $(type -p hg) ] || return 0 msg "$(gettext "Determining latest hg revision...")" if [ -d ./src/$_hgrepo ] ; then -- 1.6.1

2 3

[pacman-dev] [PATCH] makepkg: detect incorrect unsage of >= in provides
by Allan McRae 02 Jan '09

02 Jan '09

Using >= in the provides array is stupid so make it cause an error. Fixes FS#12540. Also, use bash substitution rather than spawning new processes where possible in the error checking. Move split package detection to a better position. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 66aaa5e..634ee4e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1574,6 +1574,10 @@ if [ "$GENINTEG" = "1" ]; then exit 0 # $E_OK fi +if [ "${#pkgname[@]}" -gt "1" ]; then + SPLITPKG=1 +fi + # check for no-no's in the build script if [ -z "$pkgname" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" @@ -1587,19 +1591,15 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ $pkgver != ${pkgver//-/} ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ $pkgrel != ${pkgrel//-/} ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi -if [ "${#pkgname[@]}" -gt "1" ]; then - SPLITPKG=1 -fi - if [ "$arch" = 'any' ]; then CARCH='any' fi @@ -1613,6 +1613,10 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +if [ $(echo "${provides[@]" | grep ">=") ]; then + error "$(gettext "%s is not allowed to contain >= provisions.")" "provides" +fi + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 -- 1.6.1

3 3

[pacman-dev] [PATCH 2/2] makepkg: Add support for specifying LDFLAGS
by Allan McRae 01 Jan '09

01 Jan '09

Provide support for specifying LDFLAGS within makepkg.conf but leaves this undefined by default. Fixes FS#12542. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 8b3665b..044c69e 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -61,6 +61,11 @@ Options **CXXFLAGS=**"cxxflags":: Flags used for the C++ compiler; see CFLAGS for more info. +**LDFLAGS=**"ldflags":: + Flags used for the linker. Several options may be specified with common + usage resembling ``-Wl,--hash-style=gnu``. Read ld(1) for more details on + available linker flags. + **MAKEFLAGS=**"makeflags":: This is often used to set the number of jobs used, for example, `-j2`. Other flags that make accepts can also be passed. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9872d5d..675e5f9 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -31,6 +31,7 @@ CHOST="@CHOST@" # -mtune optimizes for an architecture, but builds for whole processor family CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +#LDFLAGS="" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eae2c31..66aaa5e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -678,7 +678,7 @@ run_build() { cd "$srcdir" # ensure all necessary build variables are exported - export CFLAGS CXXFLAGS MAKEFLAGS CHOST + export CFLAGS CXXFLAGS MAKEFLAGS LDFLAGS CHOST # save our shell options so build() can't override what we need local shellopts=$(shopt -p) @@ -730,7 +730,7 @@ run_package() { cd "$srcdir" # ensure all necessary build variables are exported - export CFLAGS CXXFLAGS MAKEFLAGS CHOST + export CFLAGS CXXFLAGS MAKEFLAGS LDFLAGS CHOST local ret=0 if [ "$LOGGING" = "1" ]; then -- 1.6.1

1 0

[pacman-dev] PATCH: Fix bug 9395 (allow sync to remove unresolvable packages if user wishes)
by Bryan Ischo 01 Jan '09

01 Jan '09

Hi, attached is a patch to fix bug 9395, against the current git tree for pacman, as described in an earlier email to this list. You may find a description of the changes I made in the Arch bug database for bug 9395. Please let me know if there are any questions. Thank you, and best wishes, Bryan diff -rupN -x '*\.git*' pacman/doc/pacman.8.txt pacman-fixbug9395/doc/pacman.8.txt --- pacman/doc/pacman.8.txt 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/doc/pacman.8.txt 2008-12-31 17:52:33.000000000 +1300 @@ -152,6 +152,11 @@ Options If an install scriptlet exists, do not execute it. Do not use this unless you know what you are doing. +*\--noignoreprompt*:: + Do not prompt the user to ask for confirmation that packages listed in + IgnorePkg and IgnoreGroup really should be ignored; instead, assume + that they should be and silently ignore them. + Query Options[[QO]] ------------------- diff -rupN -x '*\.git*' pacman/lib/libalpm/alpm.h pacman-fixbug9395/lib/libalpm/alpm.h --- pacman/lib/libalpm/alpm.h 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/lib/libalpm/alpm.h 2008-12-31 17:59:38.000000000 +1300 @@ -377,7 +377,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, - /* 0x20 flag can go here */ + PM_TRANS_CONV_REMOVE_PKGS = 0x20, PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 } pmtransconv_t; diff -rupN -x '*\.git*' pacman/lib/libalpm/deps.c pacman-fixbug9395/lib/libalpm/deps.c --- pacman/lib/libalpm/deps.c 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/lib/libalpm/deps.c 2008-12-31 17:52:41.000000000 +1300 @@ -546,17 +546,92 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *de return(NULL); } +typedef struct __pkginfo_t +{ + /* The package for which this info is being kept */ + pmpkg_t *pkg; + /* 0 if this package has been determined to be unresolvable, meaning that + it has dependencies that cannot be resolved, nonzero otherwise */ + int unresolvable; + /* 0 if this package was not pulled, nonzero if this package was pulled */ + int pulled; + /* Packages that are immediately dependent on this package. */ + alpm_list_t *dependents; +} pkginfo_t; + + +static pkginfo_t *_alpm_findinfo(alpm_list_t *list, pmpkg_t *pkg) +{ + alpm_list_t *i; + + for (i = list; i; i = i->next) { + pkginfo_t *info = (pkginfo_t *) i->data; + if (info->pkg == pkg) { + return info; + } + } + + return NULL; +} + + +static void _alpm_mark_unresolvable(alpm_list_t *list, pkginfo_t *info) +{ + alpm_list_t *i; + + if (info->unresolvable) { + return; + } + + info->unresolvable = 1; + + for (i = info->dependents; i; i = i->next) { + _alpm_mark_unresolvable(list, _alpm_findinfo(list, ((pmpkg_t *) i->data))); + } +} + +static void _alpm_info_free(pkginfo_t *info) +{ + alpm_list_free(info->dependents); + free(info); +} + + +static int _alpm_is_needed(alpm_list_t *infolist, pkginfo_t *info) +{ + /* Obviously if it's already been marked unresolvable, it is not needed */ + if (info->unresolvable) { + return(0); + } + /* Now, if all of the top-level packages which depend on it are + unresolvable, then it is unneeded */ + else { + alpm_list_t *i; + for (i = info->dependents; i; i = i->next) { + if (!_alpm_is_needed(infolist, _alpm_findinfo(infolist, (pmpkg_t *) i->data))) { + return(0); + } + } + + return(1); + } +} + + /* populates list with packages that need to be installed to satisfy all * dependencies of packages in list * * @param remove contains packages elected for removal */ -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data) +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t **list, + alpm_list_t **pulled, alpm_list_t *remove, alpm_list_t **data) { + int ret = 0; alpm_list_t *i, *j; alpm_list_t *targ; alpm_list_t *deps = NULL; + alpm_list_t *info = NULL; + alpm_list_t *unresolvable = NULL; ALPM_LOG_FUNC; @@ -565,8 +640,29 @@ int _alpm_resolvedeps(pmdb_t *local, alp } _alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n"); - for(i = list; i; i = i->next) { + + /* Build up a list of pkginfo_t structures describing the root level + packages */ + for(i = *list; i; i = i->next) { + pkginfo_t *thisinfo; + thisinfo = (pkginfo_t *) malloc(sizeof(pkginfo_t)); + if (thisinfo == NULL) { + pm_errno = PM_ERR_MEMORY; + ret = -1; + goto cleanup; + } + thisinfo->pkg = i->data; + thisinfo->unresolvable = 0; + thisinfo->pulled = 0; + thisinfo->dependents = NULL; + info = alpm_list_add(info, thisinfo); + } + + /* Now resolve */ + for(i = *list; i; i = i->next) { pmpkg_t *tpkg = i->data; + /* Find the info for tpkg */ + pkginfo_t *tinfo = _alpm_findinfo(info, tpkg); targ = alpm_list_add(NULL, tpkg); deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); alpm_list_free(targ); @@ -574,38 +670,122 @@ int _alpm_resolvedeps(pmdb_t *local, alp pmdepmissing_t *miss = j->data; pmdepend_t *missdep = alpm_miss_get_dep(miss); /* check if one of the packages in list already satisfies this dependency */ - if(_alpm_find_dep_satisfier(list, missdep)) { + pmpkg_t *spkg = _alpm_find_dep_satisfier(*list, missdep); + if(spkg != NULL) { + /* Check spkg to make sure that it was not unresolvable; if it is, mark tpkg as + unresolvable also */ + pkginfo_t *sinfo = _alpm_findinfo(info, spkg); + if (sinfo->unresolvable) { + _alpm_mark_unresolvable(info, tinfo); + /* No need to do any further dependency + checking for tpkg, even if it has other + dependencies, tpkg will not be installed + because it is not resolvable */ + break; + } + sinfo->dependents = alpm_list_add(sinfo->dependents, tpkg); continue; } /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, list, tpkg); - if(!spkg) { - pm_errno = PM_ERR_UNSATISFIED_DEPS; - char *missdepstring = alpm_dep_get_string(missdep); - _alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, tpkg->name); - free(missdepstring); - if(data) { - pmdepmissing_t *missd = _alpm_depmiss_new(miss->target, - miss->depend, miss->causingpkg); - if(missd) { - *data = alpm_list_add(*data, missd); - } - } - alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); - alpm_list_free(deps); - return(-1); - } else { + spkg = _alpm_resolvedep(missdep, dbs_sync, *list, tpkg); + if(spkg != NULL) { _alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); - list = alpm_list_add(list, spkg); + *list = alpm_list_add(*list, spkg); + pkginfo_t *sinfo; + sinfo = (pkginfo_t *) malloc(sizeof(pkginfo_t)); + if (sinfo == NULL) { + pm_errno = PM_ERR_MEMORY; + ret = -1; + goto cleanup; + } + sinfo->pkg = spkg; + sinfo->unresolvable = 0; + sinfo->pulled = 1; + sinfo->dependents = alpm_list_add(NULL, tpkg); + info = alpm_list_add(info, sinfo); + } else { + /* tpkg is not resolvable, so mark it and all of + its dependents as such */ + _alpm_mark_unresolvable(info, tinfo); } } alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); + deps = NULL; + } + + /* Build up a list of unresolvable top-level packages, so that they + can be queried about */ + for(i = info; i; i = i->next) { + pkginfo_t *info = (pkginfo_t *) i->data; + if (info->unresolvable && !info->pulled) { + unresolvable = alpm_list_add(unresolvable, info->pkg); + } + } + + /* If there were unresolvable packages, query the user to see if they + should be removed from the transaction */ + if(unresolvable != NULL) { + int remove_unresolved = 0; + QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolved); + if (remove_unresolved) { + /* Need to remove all packages which are: + - unresolvable, OR + - are pulled elements whose entire list of top-level + dependents are unresolvable */ + for (i = info; i; i = i->next) { + pkginfo_t *thisinfo = (pkginfo_t *) i->data; + if (!_alpm_is_needed(info, thisinfo)) { + *list = alpm_list_remove(*list, thisinfo->pkg, _alpm_pkg_cmp, NULL); + } + } + } else { + alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); + alpm_list_free(deps); + deps = NULL; + pm_errno = PM_ERR_UNSATISFIED_DEPS; + _alpm_log(PM_LOG_ERROR, _("cannot resolve dependencies for:\n")); + for (i = unresolvable; i; i = i->next) { + _alpm_log(PM_LOG_ERROR, _("\t%s\n"), alpm_pkg_get_name((pmpkg_t *) i->data)); + if (data) { + alpm_list_t *targ = alpm_list_add(NULL, i->data); + deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); + alpm_list_free(targ); + } + } + for(i = deps; i; i = i->next) { + pmdepmissing_t *miss = i->data; + pmdepmissing_t *missd = _alpm_depmiss_new(miss->target, miss->depend, miss->causingpkg); + if(missd) { + *data = alpm_list_add(*data, missd); + } + } + ret = -1; + } } + + /* Set pulled to be the last top-level item in the list */ + *pulled = NULL; + for(i = *list; i; i = i->next) { + pkginfo_t *thisinfo = _alpm_findinfo(info, i->data); + if (thisinfo->pulled) { + *pulled = i; + break; + } + } + + cleanup: + + alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); + alpm_list_free(deps); + alpm_list_free_inner(info, (alpm_list_fn_free)_alpm_info_free); + alpm_list_free(info); + alpm_list_free(unresolvable); + _alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n"); - return(0); + + return(ret); } /* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */ diff -rupN -x '*\.git*' pacman/lib/libalpm/deps.h pacman-fixbug9395/lib/libalpm/deps.h --- pacman/lib/libalpm/deps.h 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/lib/libalpm/deps.h 2008-12-31 17:52:41.000000000 +1300 @@ -48,8 +48,8 @@ void _alpm_depmiss_free(pmdepmissing_t * alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data); +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t **list, + alpm_list_t **pulled, alpm_list_t *remove, alpm_list_t **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); diff -rupN -x '*\.git*' pacman/lib/libalpm/sync.c pacman-fixbug9395/lib/libalpm/sync.c --- pacman/lib/libalpm/sync.c 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/lib/libalpm/sync.c 2008-12-31 18:01:17.000000000 +1300 @@ -417,9 +417,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, } if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { - /* store a pointer to the last original target so we can tell what was - * pulled by resolvedeps */ - alpm_list_t *pulled = alpm_list_last(list); + /* resolvedeps returns a pointer to the first element of the + * list which is a pulled element, and all elements after that + * are pulled as well */ + alpm_list_t *pulled; /* Resolve targets dependencies */ EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); @@ -432,13 +433,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, } } - if(_alpm_resolvedeps(db_local, dbs_sync, list, remove, data) == -1) { + if(_alpm_resolvedeps(db_local, dbs_sync, &list, &pulled, remove, data) == -1) { /* pm_errno is set by resolvedeps */ ret = -1; goto cleanup; } - for(i = pulled->next; i; i = i->next) { + for(i = pulled; i; i = i->next) { pmpkg_t *spkg = i->data; pmsyncpkg_t *sync = _alpm_sync_new(PM_PKG_REASON_DEPEND, spkg, NULL); if(sync == NULL) { diff -rupN -x '*\.git*' pacman/src/pacman/callback.c pacman-fixbug9395/src/pacman/callback.c --- pacman/src/pacman/callback.c 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/src/pacman/callback.c 2008-12-31 18:04:16.000000000 +1300 @@ -248,7 +248,10 @@ void cb_trans_conv(pmtransconv_t event, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - if(data2) { + if(config->noignoreprompt) { + *response = 0; + } + else if(data2) { /* TODO we take this route based on data2 being not null? WTF */ *response = yesno(_(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"), alpm_pkg_get_name(data2), @@ -274,6 +277,31 @@ void cb_trans_conv(pmtransconv_t event, (char *)data2, (char *)data2); break; + case PM_TRANS_CONV_REMOVE_PKGS: + { + /* Allocate a buffer big enough to hold all of the + package names */ + char *packagenames; + alpm_list_t *unresolved = (alpm_list_t *) data1; + alpm_list_t *i; + int len = 1, /* for trailing \0 */ where = 0, count = 0; + for (i = unresolved; i; i = i->next) { + count += 1; + len += 3 /* for \t, comma, and \n */ + + strlen(alpm_pkg_get_name(i->data)); + } + packagenames = (char *) malloc(len); + for (i = unresolved; i; i = i->next) { + where += snprintf(&(packagenames[where]), len - where, "\t%s%s\n", + alpm_pkg_get_name(i->data), (i->next) ? "," : ""); + } + *response = yesno(_(":: the following package%s cannot be upgraded due to unresolvable " + "dependencies:\n%s\nDo you want to skip %s package%s for this upgrade?"), + (count > 1) ? "s" : "", packagenames, (count > 1) ? "these" : "this", + (count > 1) ? "s" : ""); + free(packagenames); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), diff -rupN -x '*\.git*' pacman/src/pacman/conf.c.rej pacman-fixbug9395/src/pacman/conf.c.rej --- pacman/src/pacman/conf.c.rej 1970-01-01 12:00:00.000000000 +1200 +++ pacman-fixbug9395/src/pacman/conf.c.rej 2008-12-31 17:53:00.000000000 +1300 @@ -0,0 +1,16 @@ +*************** +*** 48,53 **** + newconfig->dbpath = NULL; + newconfig->logfile = NULL; + newconfig->syncfirst = NULL; + + return(newconfig); + } +--- 48,54 ---- + newconfig->dbpath = NULL; + newconfig->logfile = NULL; + newconfig->syncfirst = NULL; ++ newconfig->noignoreprompt = 0; + + return(newconfig); + } diff -rupN -x '*\.git*' pacman/src/pacman/conf.h pacman-fixbug9395/src/pacman/conf.h --- pacman/src/pacman/conf.h 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/src/pacman/conf.h 2008-12-31 18:04:47.000000000 +1300 @@ -69,6 +69,7 @@ typedef struct __config_t { * downloaded of the total download list */ unsigned short totaldownload; unsigned short cleanmethod; /* select -Sc behavior */ + unsigned short noignoreprompt; /* don't ask user to confirm ignored packages */ alpm_list_t *syncfirst; } config_t; diff -rupN -x '*\.git*' pacman/src/pacman/pacman.c pacman-fixbug9395/src/pacman/pacman.c --- pacman/src/pacman/pacman.c 2008-12-31 16:45:31.000000000 +1300 +++ pacman-fixbug9395/src/pacman/pacman.c 2008-12-31 17:53:00.000000000 +1300 @@ -137,15 +137,16 @@ static void usage(int op, const char * c " ignore a group upgrade (can be used more than once)\n")); printf(_(" -q, --quiet show less information for query and search\n")); } - printf(_(" --config <path> set an alternate configuration file\n")); - printf(_(" --logfile <path> set an alternate log file\n")); - printf(_(" --noconfirm do not ask for any confirmation\n")); - printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); - printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); - printf(_(" -v, --verbose be verbose\n")); - printf(_(" -r, --root <path> set an alternate installation root\n")); - printf(_(" -b, --dbpath <path> set an alternate database location\n")); - printf(_(" --cachedir <dir> set an alternate package cache location\n")); + printf(_(" --config <path> set an alternate configuration file\n")); + printf(_(" --logfile <path> set an alternate log file\n")); + printf(_(" --noconfirm do not ask for any confirmation\n")); + printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); + printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); + printf(_(" --noignoreprompt don't prompt to confirm packages in IngorePkg and IgnoreGroup\n")); + printf(_(" -v, --verbose be verbose\n")); + printf(_(" -r, --root <path> set an alternate installation root\n")); + printf(_(" -b, --dbpath <path> set an alternate database location\n")); + printf(_(" --cachedir <dir> set an alternate package cache location\n")); } } @@ -366,6 +367,7 @@ static int parseargs(int argc, char *arg {"debug", optional_argument, 0, 1003}, {"noprogressbar", no_argument, 0, 1004}, {"noscriptlet", no_argument, 0, 1005}, + {"noignoreprompt", no_argument, 0, 1006}, {"cachedir", required_argument, 0, 1007}, {"asdeps", no_argument, 0, 1008}, {"logfile", required_argument, 0, 1009}, @@ -422,6 +424,7 @@ static int parseargs(int argc, char *arg break; case 1004: config->noprogressbar = 1; break; case 1005: config->flags |= PM_TRANS_FLAG_NOSCRIPTLET; break; + case 1006: config->noignoreprompt = 1; break; case 1007: if(alpm_option_add_cachedir(optarg) != 0) { pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"), @@ -680,6 +683,9 @@ static int _parseconfig(const char *file } else if(strcmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(PM_LOG_DEBUG, "config: totaldownload\n"); + } else if(strcmp(key, "NoIgnorePrompt") == 0) { + config->noignoreprompt = 1; + pm_printf(PM_LOG_DEBUG, "config: noignoreprompt\n"); } else { pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), file, linenum, key);

4 8

[pacman-dev] Pacman contributors/developers (was: Fix bug 9395)
by Dan McGee 31 Dec '08

31 Dec '08

On Wed, Dec 31, 2008 at 2:55 PM, Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> wrote: > This sounds like a good idea. But it would involve greater changes to > libalpm then I felt comfortable doing. Unfortunately, when one is just a > patch contributor rather than a real developer, one feels the need to keep > all changes as minimal as possible, instead of reaching into lots of parts > of the code and doing cleanups and refactoring and such. But I would be > happy to do some of that, once I feel more comfortable with the code base. Just wanted to set the record straight here- if you are a patch contributor, you are a developer in my mind. I don't think the old timers or new timers are perfectly happy with the shape libalpm is in, so feel free to hack things up if it results in long term improvement. We definitely have done a lot of refactoring and cleanup to the code, but there is no shortage of places that could still use a good rework or rewrite. Obviously it is best if you can separate your work into patch chunks that are easier to digest, but sometimes that just isn't possible. GIT makes it real easy to go back and refactor your refactorings as you can easily mix and match your patches. -Dan

1 0

[pacman-dev] small pacman code clarification
by Allan McRae 31 Dec '08

31 Dec '08

Hi, I am fixing FS#12263 (problem with umask and db creation), which only requires moving the creation of the db directory for the package before the package archive starts getting extracted. This occurs in the if loop in libalpm/add.c at line 699. However, I am confused about that if loop. The archive is extraction is in a loop: if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { Why is there a need for that if? As far as I can tell, PM_TRANS_FLAG_DBONLY only happens with a -Rk operation. Is this here in case we want to add the -k flag to Sync operations? Or am I missing its point completely... Cheers, Allan

2 1

[pacman-dev] AUR pacman package fixes bug 9395 - comments?
by Bryan Ischo 31 Dec '08

31 Dec '08

Hi all. I'm sorry I didn't post to this list earlier about this issue; I kind of forgot that there was a pacman-dev list and I added my comments to the bug, not realizing that I should post here too. Anyway, I have created a patch for pacman 3.2.1 which changes the behavior of pacman when it encounters unresolvable dependencies during a sync. The current behavior is that any time a package to be upgraded has a dependency that cannot be resolved, pacman asks if the user would like to ignore the missing dependency and install the package anyway. If the user answers yes, the sync proceeds, resulting in broken dependencies. If the user answers no, then the sync fails immediately. This situation can be quite common if you use the IgnorePkg/IgnoreGroup feature, because any package which depends on an upgrade to an ignored package cannot be sync'd, and thus the user is forced to ignore more and more packages to prevent sync -Su from being impossible to complete. My patch causes pacman to, instead of issuing a force/fail question when an unresolvable dependency is discovered, keep track of which packages that it would upgrade cannot be upgraded for this reason, and issue a single question to the user at the end of the package resolution step, of this form: :: the following packages cannot be upgraded due to unresolvable dependencies: package1, package2, package3, etc. Do you want to skip these packages for this upgrade? [Y/n] If the user answers yes, then the offending packages will simply be removed from the sync operation and the remainder of the sync can occur as normal. If the user answers no, then the sync cannot proceed, and it fails. So this changes the "force/fail" question into a "skip/fail" question, which I think is better. In fact, I can't think of any disadvantages to doing it this way - can you? I don't have a patch to submit for this; instead I've created a patch as part of an AUR submission that produces a new version of pacman with the behavior I have described. I think this is an easier way for users to test this feature. But I would be more than happy to submit a patch to this list directly for this issue if it is the preferred means of getting this change into the official pacman sources. A question I have though, is exactly what should be patched? The NEWS file, configure.ac, etc? Or just the code? I ask because my patch introduces what I believe to be an incompatibility in libalpm with the previous version (because a new "question" has been added, that amounts to an addition to the API), which requires a new libalpm version number, so there are lots of files in the pacman source that need to be patched to effect this. Should I submit a patch to this list that takes pacman-3.2.1 to pacman-3.3.0 (with libalpm 4.0)? Or should I just submit the actual header and source file changes (plus man page and other documentation changes, I am sure) in a patch to this list? Any questions, concerns, comments, or other feedback about this patch would be most appreciated. The bug in question is at: http://bugs.archlinux.org/task/9395 The AUR package that I have created is at: http://aur.archlinux.org/packages.php?ID=11182 Thanks, and best wishes, Bryan

3 3

[pacman-dev] alpm_db_get_pkgcache and alpm_db_get_grpcache rename
by Sebastian Nowicki 30 Dec '08

30 Dec '08

Hi, Recently the alpm_db_get_{pkg,grp}cache() functions were renamed to alpm_db_get_{pkg,grp}cache()[1]. Since this is a public API change, shouldn't the old functions perhaps simply be deprecated and "alias" the new functions, instead of dropping them completely? I'd imagine this would potentially break some front-ends if libalpm gets updated, as was the case with a project of mine. [1]: commit: d05882db9e417244fa580c4697b45333faffcc79

4 5

[pacman-dev] small libdownload patch
by Johannes Krampf 29 Dec '08

29 Dec '08

Hi, I've found a small compatibility problem and static checking a minor buffer overflow in libdownload. Please excuse if this should already be fixed in git. Here's the patch, <stdint.h> is included for uintptr_t and fscanf writes a trailing \0, therefore requiring 1025 bytes in the worst case: diff -Naurd libdownload-1.3/common.c libdownload-1.3-mod/common.c --- libdownload-1.3/common.c Thu May 24 04:30:59 2007 +++ libdownload-1.3-mod/common.c Mon Nov 10 18:51:23 2008 @@ -42,6 +42,7 @@ #include <netdb.h> #include <pwd.h> #include <stdarg.h> +#include <stdint.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -634,7 +635,7 @@ { static char word[1024]; - if (fscanf(f, " %1024s ", word) != 1) + if (fscanf(f, " %1023s ", word) != 1) return (NULL); return (word); } kind regards Johannes

4 7

[pacman-dev] Aqpm, and some help needed
by Dario Freddi 29 Dec '08

29 Dec '08

Hello guys, I'm introducing you Aqpm, a QT/C++ wrapper to libalpm. I did this since Shaman backend was starting to get too much bloated, and since I needed to use Alpm in some other apps (and in Shaman 2 too). What's cool about it: I aim at a strong binary compatibility. This way, even when alpm introduces some binary-incompatible changes, modifying Aqpm internals will be enough to get all applications relying on Aqpm work again without a rebuild. This way we'll also avoid bad situation like Shaman crack this summer. It also wraps around the callback system and implements an easier Queue. It has solid internal threading where needed, and I'm planning to make it support PolicyKit, so that I'll also get rid of the problem of running Shaman with suid and other apps using Alpm running as root (even though Policykit could be directly added to alpm itself, I don't know). Enough talking, it's here: http://github.com/drf/aqpm/tree/master. If you want to test it, I moved Shaman to github and I have a branch there working with aqpm: http://github.com/drf/shaman1/tree/aqpm-work . Sure, it has some regressions, but really small stuff. Please note that Aqpm at the current status supports latest git revision of alpm, so it is not compilable with current stable pacman. I am writing you also to ask you for some help. I have one problem since libalpm 3, namely the download progress callback streaming always 0 in the "total" parameter. I got almost crazy over it, and I still can't find a reason why it does not work. I verified that when Alpm streams the callback, the value is correct, though when it gets received it becomes 0. So I kindly ask you a small review of my code, since I really don't know where to crash my head. It is the last missing bit to aqpm to work 100%, so I'd really appreciate if you could give some help. The relevant code is at: http://github.com/drf/aqpm/tree/master/trunk/libaqpm/Backend.cpp line 797-1010 (Transaction thread, but in that file you'll find every action aqpm does) http://github.com/drf/aqpm/tree/master/trunk/libaqpm/callbacks.cpp Callbacks are here. Also some feedbacks/suggestions would be highly appreciated Thanks and Cheers Dario

3 4

[pacman-dev] [PATCH] makepkg: move BUILDSCRIPT from makepkg.conf
by Allan McRae 27 Dec '08

27 Dec '08

Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing of options, broking the -p option and --help output. The solution is to move BUILDSCRIPT out of makepkg.conf. This patch moves the definition BUILDSCRIPT back to makepkg itself and adds configure option to allow easy changing of this value during build time. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 9 +++++++++ etc/makepkg.conf.in | 3 +-- scripts/Makefile.am | 2 ++ scripts/makepkg.sh.in | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c7841b8..5f1a153 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,11 @@ AC_ARG_WITH(db-ext, AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) +# Help line for buildscript filename +AC_ARG_WITH(buildscript, + AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), + [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) + # Help line for libdownload/libfetch AC_ARG_ENABLE(internal-download, AS_HELP_STRING([--disable-internal-download], [do not build with libdownload/libfetch support]), @@ -314,6 +319,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc # Set database file extension AC_SUBST(DBEXT) AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases]) +# Set makepkg build script name +AC_SUBST(BUILDSCRIPT) +AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) # Configuration files AC_CONFIG_FILES([ @@ -362,6 +370,7 @@ ${PACKAGE_NAME}: package extension : ${PKGEXT} source pkg extension : ${SRCEXT} database extension : ${DBEXT} + build script name : ${BUILDSCRIPT} Compilation options: Run make in doc/ dir : ${wantdoc} diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 87b115c..9872d5d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -95,13 +95,12 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #PACKAGER="John Doe <john(a)doe.com>" ######################################################################### -# BUILDSCRIPT/EXTENSION DEFAULTS +# EXTENSION DEFAULTS ######################################################################### # # WARNING: Do NOT modify these variables unless you know what you are # doing. # -BUILDSCRIPT='PKGBUILD' PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 014ae87..334b79a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -37,9 +37,11 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@DBEXT[@]|$(DBEXT)|g' \ + -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the ## wrong file by accident. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a999e0b..eae2c31 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -38,6 +38,7 @@ export COMMAND_MODE='legacy' myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' +BUILDSCRIPT='@BUILDSCRIPT@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -- 1.6.0.6

1 0

[pacman-dev] [PATCH] makepkg: quote all uses of BUILDSCRIPT
by Allan McRae 26 Dec '08

26 Dec '08

Allows specifying alternative build script with spaces in name Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1dc6415..a999e0b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1205,9 +1205,9 @@ devel_update() { if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT - source $BUILDSCRIPT + sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + source "$BUILDSCRIPT" fi fi fi @@ -1496,7 +1496,7 @@ if [ "$CLEANCACHE" = "1" ]; then fi fi -if [ -z $BUILDSCRIPT ]; then +if [ -z "$BUILDSCRIPT" ]; then error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$MAKEPKG_CONF" exit 1 fi @@ -1556,7 +1556,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then BUILDSCRIPT=/dev/stdin fi else - crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) + crlftest=$(file "$BUILDSCRIPT" | grep -F 'CRLF' || true) if [ "$crlftest" != "" ]; then error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" exit 1 -- 1.6.0.6

2 1

[pacman-dev] makepkg developmental version
by Allan McRae 25 Dec '08

25 Dec '08

Hi all, I have just packaged a version of makepkg from my git working branch for people to test out. This installs alongside the makepkg from pacman so won't affect your regular package building. i686: http://dev.archlinux.org/~allan/makepkg-git-20081223-1-i686.pkg.tar.gz x86_64: http://dev.archlinux.org/~allan/makepkg-git-20081223-1-x86_64.pkg.tar.gz New features of interest: Package splitting support! - multiple packages are specified in the pkgname variable - each package gets its own packaging function where package variables can be overridden - see PKGBUILD-split.proto (in /usr/share/pacman) for "documentation" Added optional package() function in PKGBUILDs - limits fakeroot usage to packaging stages - see "man PKGBUILD-git.conf" for more info Treat info pages like man pages: - automatically compress info pages - info pages are not removed with the !docs options Added purge option: - automatically removes common conflicting or removed files - specify files in PURGE_TARGETS in makepkg.conf - default PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) Replace getopt usage with internal function: - allows makepkg to run on systems with old getopt version (e.g. Mac OS X) Other smaller changes: - ability to pass PKGBUILD from pipe - package compression type auto-detection - add configuration option to specify man/info page directories - specify alternative configuration file using the --config option - all integrity sums provided are checked - some fixes from the pacman 3.2 maintenance branch: - detect CRLF line endings - when automatically updating an SCM package pkgver, pkgrel is reset to 1 - speed up mercurial package revision checking - improved compatibility with older bash versions Known issues: - The -p flag to specify an alternative name for a PKGBUILD is broken - Repackaging with split-packages definitely does not work - Repackaging when using package() function probably does not work... - Some minor output changes are needed for package splitting Bug reports either to the pacman-dev list or the pacman/makepkg section of the bug tracker. Enjoy, Allan

2 7

[pacman-dev] [PATCH] Remove libdownload support and fix libfetch one.
by Xavier Chantry 25 Dec '08

25 Dec '08

Aaron said to consider libdownload a dead project so libdownload support was removed to more easily fix libfetch one (otherwise many ifdef needed). There was no direct replacement for ferror to detect an error while downloading. So instead, I added a check at the end to see if the file was fully downloaded, which is just a small chunk of code taken from here: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/files/fetch.c?only_… Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- configure.ac | 13 +++++-------- lib/libalpm/dload.c | 37 ++++++++++++++++--------------------- lib/libalpm/error.c | 5 +---- 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index c7841b8..1b3d702 100644 --- a/configure.ac +++ b/configure.ac @@ -88,9 +88,9 @@ AC_ARG_WITH(db-ext, AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), [DBEXT=$withval], [DBEXT=.db.tar.gz]) -# Help line for libdownload/libfetch +# Help line for libfetch AC_ARG_ENABLE(internal-download, - AS_HELP_STRING([--disable-internal-download], [do not build with libdownload/libfetch support]), + AS_HELP_STRING([--disable-internal-download], [do not build with libfetch support]), [internaldownload=$enableval], [internaldownload=yes]) # Help line for documentation @@ -131,17 +131,14 @@ AM_GNU_GETTEXT_VERSION(0.13.1) AC_CHECK_LIB([archive], [archive_read_data], , AC_MSG_ERROR([libarchive is needed to compile pacman!])) -# Enable or disable usage of libdownload/libfetch -# - this is a nested check- first see if we need a library, if we do then -# check for libdownload first, then fallback to libfetch, then die +# Enable or disable usage of libfetch AC_MSG_CHECKING(whether to link with download library) if test "x$internaldownload" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library]) # Check for a download library if it was actually requested - AC_CHECK_LIB([download], [downloadParseURL], , - AC_CHECK_LIB([fetch], [fetchParseURL], , - AC_MSG_ERROR([libdownload or libfetch are needed to compile with internal download support])) ) + AC_CHECK_LIB([fetch], [fetchParseURL], , + AC_MSG_ERROR([libfetch is needed to compile with internal download support]) ) else AC_MSG_RESULT(no) fi diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9934f30..c0ee28d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -34,15 +34,7 @@ #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -#if defined(HAVE_LIBDOWNLOAD) -#include <download.h> -#define fetchFreeURL downloadFreeURL -#define fetchLastErrCode downloadLastErrCode -#define fetchLastErrString downloadLastErrString -#define fetchParseURL downloadParseURL -#define fetchTimeout downloadTimeout -#define fetchXGet downloadXGet -#elif defined(HAVE_LIBFETCH) +#if defined(INTERNAL_DOWNLOAD) #include <fetch.h> #endif @@ -109,7 +101,8 @@ static struct url *url_for_string(const char *url) static int download_internal(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew) { - FILE *dlf, *localf = NULL; + fetchIO *dlf = NULL; + FILE *localf = NULL; struct url_stat ust; struct stat st; int chk_resume = 0, ret = 0; @@ -208,16 +201,8 @@ static int download_internal(const char *url, const char *localpath, handle->dlcb(filename, 0, ust.size); } - while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) { + while((nread = fetchIO_read(dlf, buffer, PM_DLBUF_LEN)) > 0) { size_t nwritten = 0; - if(ferror(dlf)) { - pm_errno = PM_ERR_LIBFETCH; - _alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s\n"), - filename, fetchLastErrString); - ret = -1; - goto cleanup; - } - while(nwritten < nread) { nwritten += fwrite(buffer, 1, (nread - nwritten), localf); if(ferror(localf)) { @@ -233,12 +218,22 @@ static int download_internal(const char *url, const char *localpath, handle->dlcb(filename, dl_thisfile, ust.size); } } + + /* did the transfer complete normally? */ + if (ust.size != -1 && dl_thisfile < ust.size) { + pm_errno = PM_ERR_LIBFETCH; + _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; - fclose(dlf); + fetchIO_close(dlf); dlf = NULL; rename(tempfile, destfile); @@ -254,7 +249,7 @@ cleanup: fclose(localf); } if(dlf != NULL) { - fclose(dlf); + fetchIO_close(dlf); } fetchFreeURL(fileurl); return(ret); diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 80a4fb1..df93cb7 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -30,10 +30,7 @@ #include <sys/param.h> /* MAXHOSTNAMELEN */ #endif -#if defined(HAVE_LIBDOWNLOAD) -#include <download.h> /* downloadLastErrString */ -#define fetchLastErrString downloadLastErrString -#elif defined(HAVE_LIBFETCH) +#if defined(INTERNAL_DOWNLOAD) #include <fetch.h> /* fetchLastErrString */ #endif -- 1.6.0.6

1 0

[pacman-dev] [PATCH] Fix asciidoc manpage creation.
by Xavier Chantry 25 Dec '08

25 Dec '08

As reported here, man pages could no longer be built : http://archlinux.org/pipermail/pacman-dev/2008-December/007726.html I found the explanation here : http://www.methods.co.nz/asciidoc/source-highlight-filter.html "If you use a2x(1) to generate PDF you need to include the --no-xmllint option to suppress xmllint(1) checking — the programlisting language attribute (required by the dblatex source highlighter) is not part of the DocBook 4 specification (but it is in the newer DocBook 5 specification)." Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/Makefile.am | 1 + doc/PKGBUILD.5.txt | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index cce0a71..7992e54 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \ -a pacman_date="`date +%Y-%m-%d`" \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ + --no-xmllint \ -d manpage \ -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e42a8b8..466ef17 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -367,11 +367,10 @@ The following is an example PKGBUILD for the 'patch' package. For more examples, look through the build files of your distribution's packages. For those using Arch Linux, consult the ABS tree. -[sh] -source~~~~~ +[source,sh] +------------------------------- include::PKGBUILD-example.txt[] -source~~~~~ - +------------------------------- See Also -------- -- 1.6.0.6

1 0