December 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Updated Hungarian translation
by Nagy Gabor 12 Dec '07

12 Dec '07

Hi! Patch attached. Note: As Giovanni noted, the call-for-translators .po files weren't fully up-to-date. ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-675-gf5478d6
by Dan McGee 11 Dec '07

11 Dec '07

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 f5478d68a67741236a2e9f42f2e524ee1bb26517 (commit) via 685a659656d670acb0d606f8e91c8984d47c98b5 (commit) via 9558639d8009483fbf422b138d020745986f82f1 (commit) via f8b113ed97652da62c217cef139c58ca1d75d647 (commit) via 565d2eeed5fdd85b516cbc76bc48be439e42c41f (commit) via 9781d0d637fb2a077b0c4b262af1e2fb4decc2a0 (commit) via 572bdb5c997846c426aba53392800e5866f725bd (commit) via bd83a1fd85c0e1e41be998b3633f613bce75f08c (commit) via 90d72bd24f67e1ec32525ca0c36fece4d6364eab (commit) via 7249c08bdf6beacc087607db558ef16d3527b9b6 (commit) via 815a2ead3ef2b8daedb9e93e5e141356d5003e6e (commit) from b6acb30aae5504736fd23f97402389baabbddb1b (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 f5478d68a67741236a2e9f42f2e524ee1bb26517 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Nov 29 23:39:51 2007 -0600 Add real scriptlet checking for pactest Due to commit da1222de2e30aabcae9d17bbfa10bbf0672338af, we can now use fakechroot to completely run scriptlet pactests Use "which" functionality so as not to REQUIRE it for all users Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 685a659656d670acb0d606f8e91c8984d47c98b5 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Nov 29 23:37:53 2007 -0600 Add "which" path searching functionality to pactest Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> commit 9558639d8009483fbf422b138d020745986f82f1 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Nov 29 23:30:57 2007 -0600 popen does NOT require /bin/sh in a subchroot I appears that when chrooted, the /bin/sh used by popen is that of the parent process. This is true until the process forks once chrooted, which we do not want to do. As such, this actually makes things nicer. We don't need a /bin/sh in a chroot to run install scriptlets, and don't need to check for it in the root directory Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f8b113ed97652da62c217cef139c58ca1d75d647 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Nov 29 22:33:45 2007 -0600 Fail sanely on OUTPUT rules when --nolog is passed Check for existence of the logfile first, and output an error if not found Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 565d2eeed5fdd85b516cbc76bc48be439e42c41f Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Nov 29 13:58:00 2007 -0600 Correct scriptlet usage pattern The new pattern is as follows: . /path/to/scriptlet post_upgrade X Y This requires less frameworking in the install scripts (the three lines that shift and eval a function are nasty) Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9781d0d637fb2a077b0c4b262af1e2fb4decc2a0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 10 22:55:22 2007 -0600 Update GNU GPL boilerplate and copyright dates Update the GPL boilerplate to direct people to the GNU website for a copy of the license, as well as bump all of Judd's copyrights to 2007. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 572bdb5c997846c426aba53392800e5866f725bd Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 14:30:11 2007 -0600 pactest: if we are root, don't use fakeroot Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bd83a1fd85c0e1e41be998b3633f613bce75f08c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 10 12:06:12 2007 -0600 Updates to PKGBUILD manpage Make the manpage a little more distro agnostic by referring to ABS in the context of Arch Linux, and saying that prototype files are also available with the pacman source. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 90d72bd24f67e1ec32525ca0c36fece4d6364eab Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 9 13:49:38 2007 -0600 Rename prototype install file Most (sane) people name their install file pkgname.install, and this move of the prototype reflects that. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7249c08bdf6beacc087607db558ef16d3527b9b6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 8 23:42:04 2007 -0600 Improve changelog handling through addition of open/read/close functions Thanks to Allan for inspiring all this work on what was one little TODO item in the codebase. :) Change changelog handling so we can now dump a changelog from both installed packages and package files (fixes FS#7371). We do this by moving all of the machinery to the backend where it should have been in the first place. The changelog reading is now done through a open/read/close interface similar to the fopen/fread/fclose functions (can you guess how it is done?). It is buffered by the frontend, so programs using the library can read as much or as little as they want at a time. Unfortunately, I could not implement a changelog_feof function due to some shortcomings of libarchive. However, I left the stub code in there, commented out, in case it becomes possible later or anyone wants to take a stab at it. Original-work-by: Allan McRae <mcrae_allan(a)hotmail.com> Improved-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 815a2ead3ef2b8daedb9e93e5e141356d5003e6e Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Sun Dec 9 11:38:08 2007 +0100 Updated Italian Translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: COPYING | 31 +- contrib/pacdiff | 4 +- contrib/pacsearch | 3 +- contrib/{install.proto => proto.install} | 4 - contrib/re-pacman | 4 +- doc/PKGBUILD.5.txt | 17 +- lib/libalpm/add.c | 4 +- lib/libalpm/add.h | 6 +- lib/libalpm/alpm.c | 4 +- lib/libalpm/alpm.h | 11 +- lib/libalpm/alpm_list.c | 6 +- lib/libalpm/alpm_list.h | 6 +- lib/libalpm/backup.c | 4 +- lib/libalpm/backup.h | 6 +- lib/libalpm/be_files.c | 4 +- lib/libalpm/cache.c | 6 +- lib/libalpm/cache.h | 6 +- lib/libalpm/conflict.c | 6 +- lib/libalpm/conflict.h | 6 +- lib/libalpm/db.c | 6 +- lib/libalpm/db.h | 6 +- lib/libalpm/delta.c | 4 +- lib/libalpm/delta.h | 4 +- lib/libalpm/deps.c | 6 +- lib/libalpm/deps.h | 6 +- lib/libalpm/error.c | 6 +- lib/libalpm/error.h | 6 +- lib/libalpm/group.c | 6 +- lib/libalpm/group.h | 6 +- lib/libalpm/handle.c | 6 +- lib/libalpm/handle.h | 6 +- lib/libalpm/log.c | 6 +- lib/libalpm/log.h | 6 +- lib/libalpm/md5.c | 5 +- lib/libalpm/md5.h | 5 +- lib/libalpm/package.c | 115 +++++++- lib/libalpm/package.h | 6 +- lib/libalpm/remove.c | 6 +- lib/libalpm/remove.h | 6 +- lib/libalpm/server.c | 4 +- lib/libalpm/server.h | 4 +- lib/libalpm/sync.c | 6 +- lib/libalpm/sync.h | 6 +- lib/libalpm/trans.c | 19 +- lib/libalpm/trans.h | 6 +- lib/libalpm/util.c | 6 +- lib/libalpm/util.h | 6 +- pactest/pactest.py | 4 +- pactest/pmdb.py | 4 +- pactest/pmenv.py | 4 +- pactest/pmfile.py | 4 +- pactest/pmpkg.py | 4 +- pactest/pmrule.py | 12 +- pactest/pmtest.py | 15 +- pactest/tests/scriptlet001.py | 17 +- pactest/tests/scriptlet002.py | 17 +- pactest/util.py | 12 +- po/it.po | 478 ++++++++++++++++-------------- scripts/abs.sh.in | 4 +- scripts/gensync.sh.in | 4 +- scripts/makepkg.sh.in | 4 +- scripts/makeworld.sh.in | 4 +- scripts/pacman-optimize.sh.in | 4 +- scripts/rankmirrors.py.in | 4 +- scripts/repo-add.sh.in | 4 +- scripts/repo-remove.sh.in | 4 +- scripts/updatesync.sh.in | 4 +- src/pacman/add.c | 4 +- src/pacman/callback.c | 4 +- src/pacman/callback.h | 4 +- src/pacman/conf.c | 6 +- src/pacman/conf.h | 6 +- src/pacman/deptest.c | 6 +- src/pacman/package.c | 44 ++-- src/pacman/package.h | 8 +- src/pacman/pacman.c | 4 +- src/pacman/pacman.h | 4 +- src/pacman/query.c | 13 +- src/pacman/remove.c | 6 +- src/pacman/sync.c | 4 +- src/pacman/util.c | 6 +- src/pacman/util.h | 4 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 4 +- src/util/vercmp.c | 4 +- 85 files changed, 574 insertions(+), 586 deletions(-) rename contrib/{install.proto => proto.install} (91%) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [PATCH] Database with index??
by JJDaNiMoTh 10 Dec '07

10 Dec '07

Hello to all. After 2 weeks of intensive work (:P) I'm glad to post the first proof-of-concept code about using index in our life. Do you remember the discussion Backend DB, where we talked about in November? If not, see http://archlinux.org/pipermail/pacman-dev/2007-November/009938.html : Mikos proposed to see how pacman works with a big database file, like pacman1, but with a smaller index, that contains some information ( like pkgname - pkgver ) and where an entries start and finish in the big database. So, I've thinked about the making of index every time that users do pacman -Sy; but we haven't time to re-make index all times; so, I've coded all on the "B-side" of pacman: repo-add. The result are two file: txtdb.idx ===> big, big database file; index.idx ===> smaller file, that has this format: pkgname - pkgver - line_start - line_end Example: chpax - 0.12 - 22 - 53 Reading the line that contains "chpax", I see that the entries in txtdb.idx starts on line 22 and ends on line 53. Note that this patch doesn't modify the old way to make database. It simply add a new one :D Now the only part that I need to code is the pacman-side. Why I haven't coded this yet? Because pacman-side is ( in my point of view ) the more difficult part, and ( last but no last ) I want to hear your opinion about this. Excuse my elementary english ( I have rewrited 3 times the introduction to the patch :D ) and excuse If I can't explain how patch works ( I don't write any comments.. ). I will do all ( comments and explain ) tomorrow.. now it's very late :) Thanks -- JJDaNiMoTh - ArchLinux Trusted User

2 2

[pacman-dev] [PATCH] Only query pacman upgrade when performing actual upgrade
by Allan McRae 10 Dec '07

10 Dec '07

Attached is a patch that fixes FS#7147. The query about upgrading pacman separately is not needed when the -p and -w flags are used. It is really only a one line patch... I wasn't sure whether to use "alpm_trans_get_flags()" or "config->flags" as this seems to vary across files. Allan From df921cc477d3c999bb8889b4c88cdb3867691c0c Mon Sep 17 00:00:00 2001 From: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sun, 9 Dec 2007 19:44:30 +1000 Subject: [PATCH] Only query pacman upgrade when performing actual upgrade Fixes FS#7147. Do not ask about upgrading pacman when -w and -p flags are used. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- src/pacman/sync.c | 74 +++++++++++++++++++++++++++------------------------- 1 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index df102af..c8c017a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -514,43 +514,45 @@ static int sync_trans(alpm_list_t *targets, int sync_only) goto cleanup; } - /* check if pacman itself is one of the packages to upgrade. - * this can prevent some of the "syntax error" problems users can have - * when sysupgrade'ing with an older version of pacman. - */ - pkgs = alpm_trans_get_pkgs(); - for(i = pkgs; i; i = alpm_list_next(i)) { - pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *spkg = alpm_sync_get_pkg(sync); - /* TODO pacman name should probably not be hardcoded. In addition, we - * have problems on an -Syu if pacman has to pull in deps, so recommend - * an '-S pacman' operation */ - if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { - printf("\n"); - printf(_(":: pacman has detected a newer version of itself.\n" - ":: It is recommended that you upgrade pacman by itself\n" - ":: using 'pacman -S pacman', and then rerun the current\n" - ":: operation. If you wish to continue the operation and\n" - ":: not upgrade pacman separately, answer no.\n")); - if(yesno(_(":: Cancel current operation? [Y/n] "))) { - if(alpm_trans_release() == -1) { - fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerrorlast()); - retval = 1; - goto cleanup; - } - if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, - cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerrorlast()); - return(1); - } - if(alpm_trans_addtarget("pacman") == -1) { - fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast()); - retval = 1; - goto cleanup; + if(!(config->op_s_downloadonly) && !(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { + /* check if pacman itself is one of the packages to upgrade. + * this can prevent some of the "syntax error" problems users can have + * when sysupgrade'ing with an older version of pacman. + */ + pkgs = alpm_trans_get_pkgs(); + for(i = pkgs; i; i = alpm_list_next(i)) { + pmsyncpkg_t *sync = alpm_list_getdata(i); + pmpkg_t *spkg = alpm_sync_get_pkg(sync); + /* TODO pacman name should probably not be hardcoded. In addition, we + * have problems on an -Syu if pacman has to pull in deps, so recommend + * an '-S pacman' operation */ + if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { + printf("\n"); + printf(_(":: pacman has detected a newer version of itself.\n" + ":: It is recommended that you upgrade pacman by itself\n" + ":: using 'pacman -S pacman', and then rerun the current\n" + ":: operation. If you wish to continue the operation and\n" + ":: not upgrade pacman separately, answer no.\n")); + if(yesno(_(":: Cancel current operation? [Y/n] "))) { + if(alpm_trans_release() == -1) { + fprintf(stderr, _("error: failed to release transaction (%s)\n"), + alpm_strerrorlast()); + retval = 1; + goto cleanup; + } + if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, + cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { + fprintf(stderr, _("error: failed to init transaction (%s)\n"), + alpm_strerrorlast()); + return(1); + } + if(alpm_trans_addtarget("pacman") == -1) { + fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast()); + retval = 1; + goto cleanup; + } + break; } - break; } } } -- 1.5.3.7

3 2

[pacman-dev] [PATCH] Improve changelog handling
by Allan McRae 09 Dec '07

09 Dec '07

Hi all, Below is a patch that tries to improve the handling of changelog dumping. Now changelogs should also get dumped when using "pacman -Qcp <file>" syntax as well as "pacman -Qc <pkg>" (See http://bugs.archlinux.org/task/7321) This is my first patch to the pacman/libalpm code base so it probably needs lots of checking. I stared at the code for a couple of hours before I started but I am probably using some libalpm functions wrongly. I would pay particular attention to the entirely new "alpm_pkg_get_changelog" function in libalpm/package.c. The code builds cleanly but I can't test much more than that at the moment due to my testing box having what I think is RAM issues leaving me only my work laptop... Cheers, Allan From 47affca982ec2d449bd6d96846172052dbdd3da6 Mon Sep 17 00:00:00 2001 From: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sat, 8 Dec 2007 02:35:00 +1000 Subject: [PATCH] Improve changelog handling Allows dumping of changelog for both installed packages and from package files (See FS#7321). Moves querying of changelog file in alpm backend. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/package.c | 33 ++++++++++------------ src/pacman/package.h | 2 +- src/pacman/query.c | 9 +----- 5 files changed, 89 insertions(+), 27 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1e18ad9..7f6c9eb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -216,6 +216,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); +alpm_list_t *alpm_pkg_get_changelog(pmpkg_t *pkg); unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg); unsigned long alpm_pkg_download_size(pmpkg_t *newpkg, pmdb_t *db_local); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 172456d..bbdb95d 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -491,6 +491,77 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg) return pkg->backup; } +alpm_list_t SYMEXPORT *alpm_pkg_get_changelog(pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(NULL)); + ASSERT(pkg != NULL, return(NULL)); + + int ret = ARCHIVE_OK; + alpm_list_t *cl = NULL; + char clfile[PATH_MAX]; + char *tmpfile = NULL; + struct archive *archive; + struct archive_entry *entry; + int fd = -1; + char line[PATH_MAX]; + + if(pkg->origin == PKG_FROM_CACHE) { + snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", + alpm_option_get_dbpath(), + alpm_db_get_name(alpm_db_register_local()), + alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + } else if(pkg->origin == PKG_FROM_FILE) { + const char *pkgfile = pkg->origin_data.file; + + if((archive = archive_read_new()) == NULL) { + RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL); + } + + archive_read_support_compression_all(archive); + archive_read_support_format_all(archive); + + if (archive_read_open_filename(archive, pkgfile, + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + RET_ERR(PM_ERR_PKG_OPEN, NULL); + } + + while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { + const char *entry_name = archive_entry_pathname(entry); + + if(strcmp(entry_name, ".CHANGELOG") == 0) { + tmpfile = strdup("/tmp/alpm_XXXXXX"); + fd = mkstemp(tmpfile); + archive_read_data_into_fd(archive, fd); + break; + } + } + snprintf(clfile, PATH_MAX, "%s", tmpfile); + } + + FILE* fp = fopen(clfile, "r"); + if(fp == NULL){ + return cl; + } + + while(!feof(fp)) { + fgets(line, (int)PATH_MAX, fp); + cl = alpm_list_add(cl, strdup(line)); + } + fclose(fp); + + if(pkg->origin == PKG_FROM_FILE) { + unlink(tmpfile); + FREE(tmpfile); + close(fd); + } + + return cl; +} + unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg) { ALPM_LOG_FUNC; diff --git a/src/pacman/package.c b/src/pacman/package.c index ac3f820..00c3535 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -232,29 +232,26 @@ void dump_pkg_files(pmpkg_t *pkg) fflush(stdout); } -/* Display the changelog of an installed package +/* Display the changelog of a package */ -void dump_pkg_changelog(char *clfile, const char *pkgname) +void dump_pkg_changelog(pmpkg_t *pkg) { - FILE* fp = NULL; - char line[PATH_MAX+1]; - - if((fp = fopen(clfile, "r")) == NULL) - { - fprintf(stderr, _("error: no changelog available for '%s'.\n"), pkgname); + alpm_list_t *changelog = NULL; + alpm_list_t *i; + char line[PATH_MAX]; + + changelog = alpm_pkg_get_changelog(pkg); + if(changelog == NULL) { + fprintf(stderr, _("error: no changelog available for '%s'.\n"), alpm_pkg_get_name(pkg)); return; - } - else - { - while(!feof(fp)) - { - fgets(line, (int)PATH_MAX, fp); - printf("%s", line); - line[0] = '\0'; + } else { + for(i = changelog; i; i = alpm_list_next(i)) { + snprintf(line, PATH_MAX-1, "%s", (char*)alpm_list_getdata(i)); + fprintf(stdout, "%s\n", line); } - fclose(fp); - return; } + + FREELIST(changelog); } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/package.h b/src/pacman/package.h index 0e4bb0f..7dfc054 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -28,7 +28,7 @@ void dump_pkg_sync(pmpkg_t *pkg, const char *treename); void dump_pkg_backups(pmpkg_t *pkg); void dump_pkg_files(pmpkg_t *pkg); -void dump_pkg_changelog(char *clfile, const char *pkgname); +void dump_pkg_changelog(pmpkg_t *pkg); #endif /* _PM_PACKAGE_H */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 8a8765b..1307077 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -312,14 +312,7 @@ static void display(pmpkg_t *pkg) dump_pkg_files(pkg); } if(config->op_q_changelog) { - char changelog[PATH_MAX]; - /* TODO should be done in the backend- no raw DB stuff up front */ - snprintf(changelog, PATH_MAX, "%s/%s/%s-%s/changelog", - alpm_option_get_dbpath(), - alpm_db_get_name(db_local), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - dump_pkg_changelog(changelog, alpm_pkg_get_name(pkg)); + dump_pkg_changelog(pkg); } if(!config->op_q_info && !config->op_q_list && !config->op_q_changelog) { if (!config->quiet) { -- 1.5.3.7

9 25

Re: [pacman-dev] [PATCH] Only query pacman upgrade when performing actual upgrade
by Xavier 09 Dec '07

09 Dec '07

On Sun, Dec 09, 2007 at 07:54:37PM +1000, Allan McRae wrote: > Attached is a patch that fixes FS#7147. The query about upgrading > pacman separately is not needed when the -p and -w flags are used. It > is really only a one line patch... > > I wasn't sure whether to use "alpm_trans_get_flags()" or "config->flags" > as this seems to vary across files. > > Allan > Ah yes, I see. I think you don't really have the choice before the trans is initialized (before alpm_trans_init call). You have to use config->flags. But in the part you edited, the trans is already initialized, so I guess we can use both there, without any differences. Since alpm_trans_get_flags is already used in that part, it's probably fine to use that. > From df921cc477d3c999bb8889b4c88cdb3867691c0c Mon Sep 17 00:00:00 2001 > From: Allan McRae <mcrae_allan(a)hotmail.com> > Date: Sun, 9 Dec 2007 19:44:30 +1000 > Subject: [PATCH] Only query pacman upgrade when performing actual upgrade > > Fixes FS#7147. Do not ask about upgrading pacman when -w and -p > flags are used. > > Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> > --- > src/pacman/sync.c | 74 > +++++++++++++++++++++++++++------------------------- > 1 files changed, 38 insertions(+), 36 deletions(-) > The lines are broken again :( I believe the policy is to put the patch inline, but personally I would prefer a working attached patch, rather than a broken inline one. Besides, as vmiklos pointed out earlier, mutt shows them inline, even when they are attached. Why don't other mail clients do this :p

3 2

[pacman-dev] [PATCH] Updated Italian Translation fix
by Giovanni Scafora 09 Dec '07

09 Dec '07

Hi, here's an updated translation to fix 5 fuzzy translations. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-664-gb6acb30
by Dan McGee 09 Dec '07

09 Dec '07

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 b6acb30aae5504736fd23f97402389baabbddb1b (commit) via 4437033d2a822d41820c67ab98d95db97daa7fd8 (commit) via 2ef78355fc65a38bd64e430c8f19e2ae9ab7648f (commit) via 97fe3d3f5adecfbf9d6bf201161d743361107e32 (commit) via f0664fbd93f0002bc568b24de2206e31187fda85 (commit) via c49b2a00d628c2ecb86b3908c1901ab3edee0b1a (commit) via 43eacf2852a15828a4becff74efad04f85305a92 (commit) via 145c8eb52d7c782748bdc1e6a087c932243903bc (commit) from 9615d82343148301884bfc79d87e2f408aad64bd (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 b6acb30aae5504736fd23f97402389baabbddb1b Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 8 09:58:49 2007 +0100 src/pacman/: use the FREELIST macro when possible. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4437033d2a822d41820c67ab98d95db97daa7fd8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 8 00:01:32 2007 +0100 testdb.c : add vim modeline according to HACKING, and reindent the file. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ef78355fc65a38bd64e430c8f19e2ae9ab7648f Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Dec 9 02:04:28 2007 +0100 _alpm_unpack: return 1 when the file is not found. If _alpm_unpack has a specific file to extract (not NULL), but doesn't find it, it'll now return 1, for indicating the failure. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 97fe3d3f5adecfbf9d6bf201161d743361107e32 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Dec 7 09:45:20 2007 -0600 libalpm/server.c : fix segfault when downloading failed. The alpm_list_free(complete) needs to be done OUTSIDE the loop walking through the server list. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0664fbd93f0002bc568b24de2206e31187fda85 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 5 20:34:38 2007 -0600 Update pacman manpage with description of --clean option Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c49b2a00d628c2ecb86b3908c1901ab3edee0b1a Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Dec 5 23:47:54 2007 +0100 pacman/sync.c : improve the sync db cleanup feature. This feature (introduced by b118ce55bd01c7ebd42b5b6d4a0f34aa925701d8 as a part of -Sc) could actually be helpful in the 3.0 -> 3.1 transition, because all sync dbs will be left in /var/lib/pacman/, while the updated ones will go to /var/lib/pacman/sync/. So it'll now clean everything in /var/lib/pacman/, and only the unused databases in /var/lib/pacman/sync/ (with the exception of local/ and sync/ in both cases). Note: This feature is undocumented. I wonder if moving it to another option, something like -S --dbclean, wouldn't help for documenting it. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43eacf2852a15828a4becff74efad04f85305a92 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Dec 5 12:02:41 2007 +0100 Remove duplicated PM_TRANS_CONV_INSTALL_IGNOREPKG message Now alpm_checkdeps first search for literals, then search for no-literal satisfiers Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Dan: fix spelling of INTALL, fix line wrapping] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 145c8eb52d7c782748bdc1e6a087c932243903bc Author: Nathan Jones <nathanj(a)insightbb.com> Date: Wed Dec 5 10:45:23 2007 -0500 Update zsh completion. Update zsh completion file to version 0.5-2 from AUR and add the new options in pacman 3.1. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion | 85 ++++++++++++++++----- doc/pacman.8.txt | 19 +++-- lib/libalpm/deps.c | 4 +- lib/libalpm/server.c | 2 +- lib/libalpm/util.c | 3 +- src/pacman/add.c | 3 +- src/pacman/callback.c | 4 +- src/pacman/remove.c | 3 +- src/pacman/sync.c | 27 ++++--- src/util/testdb.c | 198 ++++++++++++++++++++++++------------------------ 10 files changed, 200 insertions(+), 148 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] [PATCH] Improve changelog handling
by Xavier 09 Dec '07

09 Dec '07

On Sat, Dec 08, 2007 at 02:47:23AM +1000, Allan McRae wrote: > From 47affca982ec2d449bd6d96846172052dbdd3da6 Mon Sep 17 00:00:00 2001 > From: Allan McRae <mcrae_allan(a)hotmail.com> > Date: Sat, 8 Dec 2007 02:35:00 +1000 > Subject: [PATCH] Improve changelog handling > > Allows dumping of changelog for both installed packages and from package > files > (See FS#7321). Moves querying of changelog file in alpm backend. > > Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> > --- > lib/libalpm/alpm.h | 1 + > lib/libalpm/package.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++++ > src/pacman/package.c | 33 ++++++++++------------ > src/pacman/package.h | 2 +- > src/pacman/query.c | 9 +----- > 5 files changed, 89 insertions(+), 27 deletions(-) > > diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h > index 1e18ad9..7f6c9eb 100644 > --- a/lib/libalpm/alpm.h > +++ b/lib/libalpm/alpm.h > @@ -216,6 +216,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); > +alpm_list_t *alpm_pkg_get_changelog(pmpkg_t *pkg); > unsigned short alpm_pkg_has_scriptlet(pmpkg_t *pkg); > > unsigned long alpm_pkg_download_size(pmpkg_t *newpkg, pmdb_t *db_local); > diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c > index 172456d..bbdb95d 100644 > --- a/lib/libalpm/package.c > +++ b/lib/libalpm/package.c > @@ -491,6 +491,77 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t > *pkg) > return pkg->backup; > } > > +alpm_list_t SYMEXPORT *alpm_pkg_get_changelog(pmpkg_t *pkg) > +{ > + ALPM_LOG_FUNC; > + > + /* Sanity checks */ > + ASSERT(handle != NULL, return(NULL)); > + ASSERT(pkg != NULL, return(NULL)); > + > + int ret = ARCHIVE_OK; > + alpm_list_t *cl = NULL; > + char clfile[PATH_MAX]; > + char *tmpfile = NULL; > + struct archive *archive; > + struct archive_entry *entry; > + int fd = -1; > + char line[PATH_MAX]; > + > + if(pkg->origin == PKG_FROM_CACHE) { > + snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", > + alpm_option_get_dbpath(), > + alpm_db_get_name(alpm_db_register_local()), I believe you should use handle->db_local here rather than alpm_db_register_local(); > + alpm_pkg_get_name(pkg), > + alpm_pkg_get_version(pkg)); > + } else if(pkg->origin == PKG_FROM_FILE) { > + const char *pkgfile = pkg->origin_data.file; > + > + if((archive = archive_read_new()) == NULL) { > + RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL); > + } > + > + archive_read_support_compression_all(archive); > + archive_read_support_format_all(archive); > + > + if (archive_read_open_filename(archive, pkgfile, > + ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { > + RET_ERR(PM_ERR_PKG_OPEN, NULL); > + } > + > + while((ret = archive_read_next_header(archive, &entry)) == > ARCHIVE_OK) { > + const char *entry_name = archive_entry_pathname(entry); > + > + if(strcmp(entry_name, ".CHANGELOG") == 0) { > + tmpfile = strdup("/tmp/alpm_XXXXXX"); > + fd = mkstemp(tmpfile); > + archive_read_data_into_fd(archive, fd); > + break; > + } > + } > + snprintf(clfile, PATH_MAX, "%s", tmpfile); > + } > + You probably got this part from _alpm_pkg_load, I guess it's alright (except you probably want to add an archive_read_finish(archive); there). But you could also use _alpm_unpack, like in _alpm_runscriptlet. Btw, I couldn't get your patch to apply cleanly, because of many line breaks. So I started rewriting it from the start, but in the same time, I wanted to experiment reading directly from the archive, which resulted in the patch I submitted somewhere else in this thread. I don't know if it's better or not, but if it is, all the credits still go to you, for looking at the problem in the first place, and providing a good patch to work with. So thanks again.

1 1

[pacman-dev] [PATCH] Add test directory for testing private libalpm functions.
by Nathan Jones 07 Dec '07

07 Dec '07

I found this useful when testing the shortest_delta_path code. Recently, I ran valgrind on the test which helped to discover the memory leak. Not sure if you guys will want to apply this, but here it is. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- Makefile.am | 2 +- configure.ac | 1 + lib/libalpm/test/.gitignore | 3 + lib/libalpm/test/Makefile.am | 47 +++++++++++++++++ lib/libalpm/test/deltatest.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+), 1 deletions(-) create mode 100644 lib/libalpm/test/.gitignore create mode 100644 lib/libalpm/test/Makefile.am create mode 100644 lib/libalpm/test/deltatest.c diff --git a/Makefile.am b/Makefile.am index e07321b..c68786a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib +SUBDIRS = lib/libalpm lib/libalpm/test src/util src/pacman scripts doc etc po pactest contrib # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README diff --git a/configure.ac b/configure.ac index 9a5f3b3..f9f27a7 100644 --- a/configure.ac +++ b/configure.ac @@ -309,6 +309,7 @@ AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databas AC_CONFIG_FILES([ lib/libalpm/Makefile lib/libalpm/po/Makefile.in +lib/libalpm/test/Makefile src/pacman/Makefile src/util/Makefile scripts/Makefile diff --git a/lib/libalpm/test/.gitignore b/lib/libalpm/test/.gitignore new file mode 100644 index 0000000..64ebea7 --- /dev/null +++ b/lib/libalpm/test/.gitignore @@ -0,0 +1,3 @@ +deltatest +.deps +.libs diff --git a/lib/libalpm/test/Makefile.am b/lib/libalpm/test/Makefile.am new file mode 100644 index 0000000..b033018 --- /dev/null +++ b/lib/libalpm/test/Makefile.am @@ -0,0 +1,47 @@ +AUTOMAKE_OPTIONS = gnu + +bin_PROGRAMS = deltatest + +DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@ + +AM_CFLAGS = -pedantic -D_GNU_SOURCE -I.. -I../../.. + +if ENABLE_VISIBILITY_CC +AM_CFLAGS += -fvisibility=internal +endif +if ENABLE_GNU89_INLINE_CC +AM_CFLAGS += -fgnu89-inline +endif + +deltatest_SOURCES = deltatest.c +deltatest_LDADD = ../.libs/libalpm.a + +libalpm_sources = \ + ../add.h ../add.c \ + ../alpm.h ../alpm.c \ + ../alpm_list.h ../alpm_list.c \ + ../backup.h ../backup.c \ + ../be_files.c ../\ + ../cache.h ../cache.c \ + ../conflict.h ../conflict.c \ + ../db.h ../db.c \ + ../delta.h ../delta.c \ + ../deps.h ../deps.c \ + ../error.h ../error.c \ + ../group.h ../group.c \ + ../handle.h ../handle.c \ + ../log.h ../log.c \ + ../md5.h ../md5.c \ + ../package.h ../package.c \ + ../remove.h ../remove.c \ + ../server.h ../server.c \ + ../sync.h ../sync.c \ + ../trans.h ../trans.c \ + ../util.h ../util.c + +all: ../.libs/libalpm.a + +../.libs/libalpm.a: $(libalpm_sources) + cd .. && make + +# vim:set ts=2 sw=2 noet: diff --git a/lib/libalpm/test/deltatest.c b/lib/libalpm/test/deltatest.c new file mode 100644 index 0000000..e2c3c2e --- /dev/null +++ b/lib/libalpm/test/deltatest.c @@ -0,0 +1,112 @@ +/* + * deltatest.c + * + * Copyright (c) 2007 by Judd Vinet <jvinet(a)zeroflux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ +#include "string.h" +#include "assert.h" + +#include "alpm.h" +#include "alpm_list.h" +#include "delta.h" + +int main() +{ + alpm_list_t *deltas = NULL, *path = NULL; + pmdelta_t d1, d2, d3, d4, d5; + + strcpy(d1.from, "1.0-1"); + strcpy(d1.to, "1.1-1"); + d1.size = 10000; + + strcpy(d2.from, "1.1-1"); + strcpy(d2.to, "1.2-1"); + d2.size = 12000; + + strcpy(d3.from, "1.2-1"); + strcpy(d3.to, "1.2-2"); + d3.size = 8000; + + strcpy(d4.from, "1.2-2"); + strcpy(d4.to, "1.3-1"); + d4.size = 15000; + + strcpy(d5.from, "1.0-1"); + strcpy(d5.to, "1.3-1"); + d5.size = 20000; + + deltas = alpm_list_add(deltas, &d1); + deltas = alpm_list_add(deltas, &d2); + deltas = alpm_list_add(deltas, &d3); + deltas = alpm_list_add(deltas, &d4); + deltas = alpm_list_add(deltas, &d5); + + /* test standard path */ + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.1-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 10000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.2-1"); + assert(alpm_list_count(path) == 2); + assert(_alpm_delta_path_size(path) == 22000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.2-2"); + assert(alpm_list_count(path) == 3); + assert(_alpm_delta_path_size(path) == 30000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.3-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 20000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.2-2", "1.3-1"); + assert(alpm_list_count(path) == 1); + assert(_alpm_delta_path_size(path) == 15000); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.2-1", "1.3-1"); + assert(alpm_list_count(path) == 2); + assert(_alpm_delta_path_size(path) == 23000); + alpm_list_free(path); + + /* test no path */ + path = _alpm_shortest_delta_path(deltas, "0.9-1", "1.3-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "1.0-1", "1.4-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + path = _alpm_shortest_delta_path(deltas, "0.9-1", "1.4-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + /* test reverse direction */ + path = _alpm_shortest_delta_path(deltas, "1.1-1", "1.0-1"); + assert(alpm_list_count(path) == 0); + alpm_list_free(path); + + alpm_list_free(deltas); + + return 0; +} + -- 1.5.3.7

3 2