July 2008 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix some memleaks in alpm/add.c
by Nagy Gabor 19 Jul '08

19 Jul '08

From b9673a106b1f985cb81f620f394620e6eca88516 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 15 Jul 2008 13:30:34 +0200 Subject: [PATCH] Fix some memleaks in alpm/add.c In case of error some allocated memory wasn't freed in commit_single_pkg. Note: The return value of this function is not used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5bf3fcd..3b60fb3 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -689,7 +689,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, /* set up fake remove transaction */ int ret = upgrade_remove(oldpkg, newpkg, trans, db); if(ret != 0) { - return(ret); + goto cleanup; } } @@ -701,7 +701,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, _alpm_log(PM_LOG_DEBUG, "extracting files\n"); if ((archive = archive_read_new()) == NULL) { - RET_ERR(PM_ERR_LIBARCHIVE, -1); + pm_errno = PM_ERR_LIBARCHIVE; + ret = -1; + goto cleanup; } archive_read_support_compression_all(archive); @@ -710,7 +712,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, _alpm_log(PM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file); if(archive_read_open_filename(archive, newpkg->origin_data.file, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { - RET_ERR(PM_ERR_PKG_OPEN, -1); + pm_errno = PM_ERR_PKG_OPEN; + ret = -1; + goto cleanup; } /* save the cwd so we can restore it later */ @@ -772,7 +776,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } if(errors) { - ret = 1; + ret = -1; if(is_upgrade) { _alpm_log(PM_LOG_ERROR, _("problem occurred while upgrading %s\n"), newpkg->name); @@ -798,7 +802,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); alpm_logaction("error: could not update database entry %s-%s\n", alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); - RET_ERR(PM_ERR_DB_WRITE, -1); + pm_errno = PM_ERR_DB_WRITE; + ret = -1; + goto cleanup; } if(_alpm_db_add_pkgincache(db, newpkg) == -1) { @@ -833,9 +839,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, EVENT(trans, PM_TRANS_EVT_ADD_DONE, newpkg, oldpkg); } +cleanup: _alpm_pkg_free(oldpkg); - - return(0); + return(ret); } int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) -- 1.5.6.2

3 5

[pacman-dev] Linking to OpenSSL
by Teran McKinney 19 Jul '08

19 Jul '08

Hi, I have been working on an Arch fork for the past several months, and thus have been following Arch developments closely. I noticed this commit ( http://projects.archlinux.org/gitweb.cgi?p=pacman.git;a=commit;h=b8a66d6859… ), where OpenSSL replaces the usage of md5sum and sha1sum utilities for Pacman. While I like the idea of using libraries instead of external binaries, I feel that linking to OpenSSL complicates a few things. For one, it is big, and must be included with any non-static binaries of Pacman (in the installer, this would not be so ideal, unless OpenSSL is included anyways). Another, is that it is simply not legal under the GPL. OpenSSL includes an advertising clause that makes it incompatible with the GPL. Wget and climm had to modify their GPL licenses to link to it ( http://en.wikipedia.org/wiki/Openssl#Licensing ). I purpose using GNUTLS instead. It is released under the LGPLv2.1, should be fully capable, and is compatible with the GPL. Many projects that use OpenSSL can also optionally link to GNUTLS instead, so I would suggest doing so with all possible packages (lftp, elinks, wget). What are your thoughts about this? Pacman is an excellent package manager; thank you for all of the work that you put into it. Cheers, Teran (sega01)

3 3

[pacman-dev] [translation] Updated Russian Translation
by serg 19 Jul '08

19 Jul '08

updated translation for 3.2 release

2 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-248-gb4f2cb5
by Dan McGee 19 Jul '08

19 Jul '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via b4f2cb53ef568534e672a877f3d47f85ca18f2af (commit) via 2b73d451274f48f89ae434297399565aca812035 (commit) via a8405847e63c89e5694a84a96bef5023de890024 (commit) via 99be5ab8d17ba2de351fff889012e1af85236ae0 (commit) via 471ed04790992cd2d1ec6f405f132ce544fcadd2 (commit) via 59295081982b33640f4e16589ef281872da540b5 (commit) via 03021713e5315312b150e6ac9c5cf48fe68f7615 (commit) via ffa3056010b6ea104a8d772d0349a705575a13ca (commit) via 37b5972212f9e5d08b28a47f2990ba2b102056da (commit) via 17e9c9d9ff8b10f4fd82ba17ea968e071a273482 (commit) via 0bf66b097fc8ccb394cb910764d171476e15d124 (commit) via 95995ae93f90faab2f4c9fe59ea95167d20c88de (commit) via 874190827676e3a974e8c5fef6c51b9e9d6b60fa (commit) via fd8969f67875ad6854725165b9530f4be26c5d96 (commit) via f724fb27022551e536496f8f99bc4be33b4ce3b7 (commit) via 1d9d47d62c8dab07bbd411ed0c1919ad4149cd43 (commit) from b196cc43a50e6fd1dfa9425d7ff8a9302e6fec84 (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 b4f2cb53ef568534e672a877f3d47f85ca18f2af Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Jul 19 16:34:02 2008 +0200 Rephrase some debug messages in alpm/sync.c Debug messages were removed from _alpm_sync_find, because it is a general purpose function; debug messages should be placed in the caller function. I inserted "adding package foo-1.0-1 to the transaction targets" debug message to find_replacements and sync_sysupgrade. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2b73d451274f48f89ae434297399565aca812035 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Jul 19 15:57:25 2008 +0200 Use NULL instead of "" as no causingpkg Our STRDUP macro (used in _alpm_depmiss_new) is NULL safe. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8405847e63c89e5694a84a96bef5023de890024 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 18 14:20:24 2008 +1000 Strip *.a libraries in makepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 99be5ab8d17ba2de351fff889012e1af85236ae0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 18 13:38:34 2008 +1000 Use LC_ALL=C everywhere Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 471ed04790992cd2d1ec6f405f132ce544fcadd2 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Jul 16 15:57:08 2008 +0200 alpm_list_remove treat NULL needle as "nothing" So if you want to remove NULL needle from a list, alpm_list_remove will return with "not found". Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 59295081982b33640f4e16589ef281872da540b5 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Jul 16 15:27:37 2008 +0200 Fix a possible segfault in alpm/remove.c Before removing a package from target list (in remove_prepare_keep_needed), we should check whether we have already removed it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03021713e5315312b150e6ac9c5cf48fe68f7615 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 15 01:07:22 2008 +0200 _alpm_db_add_pkgincache rework Commit 8240da6cb3ff95ad480efe3e1876104024398fae broke some alpm hierarchy and introduced a new memleak (trans->packages was never freed in case of add transaction, even if the transaction wasn't committed), so it is reverted now. We follow a different approach to reduce memory usage: _alpm_db_add_pkgincache doesn't duplicate the whole package before adding it to the cache, only the package name and version (INFRQ_BASE). This method needs very small extra memory (compared to the reverted method), and after transaction commit we use less memory than before (since the big 'files' fields are not copied to cache), this is useful in GUIs. Note: The old add_pkgincache was a bit broken, since pkg->origin wasn't filled in correctly. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Acked-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ffa3056010b6ea104a8d772d0349a705575a13ca Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 8 10:57:57 2008 +0200 Use "pacman -S $dep" in makepkg's dependency resolving This method is equivalent with pacman's resolvedeps. $dep can be any (versioned) dependency. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37b5972212f9e5d08b28a47f2990ba2b102056da Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 15 13:30:34 2008 +0200 Fix some memleaks in alpm/add.c In case of error some allocated memory wasn't freed in commit_single_pkg. Note: The return value of this function is not used. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 17e9c9d9ff8b10f4fd82ba17ea968e071a273482 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 15 12:36:10 2008 +0200 Fix a wrong FREELIST usage in add.c The dynamic pmconflict_t must be freed with _alpm_conflict_free. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0bf66b097fc8ccb394cb910764d171476e15d124 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 15 19:09:15 2008 -0500 makepkg: speed up svn revision check for large repositories Using the suggestion from FS#10905, use 'svn info' rather than 'svn log' to get the current revision number, which is much quicker for large Subversion repositories. Eventually git will rule the world. :) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 95995ae93f90faab2f4c9fe59ea95167d20c88de Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 15 19:05:24 2008 -0500 Remove pacman.static build from build files This presents plenty of problems on OSes besides Linux, and even on Linux when the libtool file for libarchive isn't present. The static build isn't all that useful anyway as missing something such as glibc will still leave you unable to run the pacman.static binary. Remove it from the formal build process. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 874190827676e3a974e8c5fef6c51b9e9d6b60fa Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jun 15 13:19:58 2008 +0200 src/pacman/sync.c : Display only errors with -Sp and -Sw operations. In particular, this avoids warnings cluttering the output of these operations. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fd8969f67875ad6854725165b9530f4be26c5d96 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 8 10:07:05 2008 +0200 sync_addtarget rework Now '-S provision' handling is done in the back-end. In case of multiple providers, the first one is selected (behavior change: deleted provision002.py). The old processing order was: literal, group, provision; the new one: literal, provision, group. This is more rational, but "pacman -S group" will be slower now. "pacman -S repo/provision" also works. Provision was generalized to dependencies, so you can resolve deps by hand: "pacman -S 'bash>2.0'" or "pacman -S 'core/bash>2.0'" etc. This can be useful in makepkg dependency resolving. The changes were documented in pacman manual. alpm_find_pkg_satisfiers and _alpm_find_dep_satisfiers functions were removed, since they are no longer needed. I added some verbosity to "select provider instead of literal" and "fallback to group". Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f724fb27022551e536496f8f99bc4be33b4ce3b7 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 8 10:17:19 2008 +0200 remove_addtarget rework (in front-end) Now "pacman -R foo" first searches for literal, and then for group. This is faster in most cases, see: http://www.archlinux.org/pipermail/pacman-dev/2008-July/012311.html "-R group" implementation was broken, since alpm_grp_get_pkgs returns with an pmpkg_t list, not a string list. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d9d47d62c8dab07bbd411ed0c1919ad4149cd43 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 8 10:30:28 2008 +0200 New remove060.py pactest This is a group removal test. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 16 ------- doc/pacman.8.txt | 4 +- lib/libalpm/add.c | 23 +++++++---- lib/libalpm/alpm.h | 1 - lib/libalpm/alpm_list.c | 4 ++ lib/libalpm/cache.c | 22 +++++++++- lib/libalpm/deps.c | 30 +------------ lib/libalpm/deps.h | 1 - lib/libalpm/remove.c | 3 + lib/libalpm/sync.c | 79 ++++++++++++++--------------------- lib/libalpm/trans.c | 3 +- pactest/tests/provision002.py | 15 ------- pactest/tests/remove060.py | 19 ++++++++ scripts/makepkg.sh.in | 17 +++---- src/pacman/.gitignore | 2 - src/pacman/Makefile.am | 7 --- src/pacman/remove.c | 92 ++++++++++++++++++++-------------------- src/pacman/sync.c | 45 ++++---------------- 18 files changed, 161 insertions(+), 222 deletions(-) delete mode 100644 pactest/tests/provision002.py create mode 100644 pactest/tests/remove060.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Rephrase some debug messages in alpm/sync.c
by Nagy Gabor 19 Jul '08

19 Jul '08

From 2433ae595f715847c38d6df312a4941d73ea39f2 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 19 Jul 2008 16:34:02 +0200 Subject: [PATCH] Rephrase some debug messages in alpm/sync.c Debug messages were removed from _alpm_sync_find, because it is a general purpose function; debug messages should be placed in the caller function. I inserted "adding package foo-1.0-1 to the transaction targets" debug message to find_replacements and sync_sysupgrade. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ee260f6..7a577a1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -149,6 +149,8 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, return(-1); } sync->removes = alpm_list_add(NULL, lpkg); + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); *syncpkgs = alpm_list_add(*syncpkgs, sync); } _alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n", @@ -259,6 +261,8 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, alpm_list_free(replaced); return(-1); } + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); *syncpkgs = alpm_list_add(*syncpkgs, sync); } } @@ -342,8 +346,8 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy if(sync == NULL) { return(-1); } - _alpm_log(PM_LOG_DEBUG, "adding target '%s' to the transaction set\n", - alpm_pkg_get_name(spkg)); + _alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n", + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); trans->packages = alpm_list_add(trans->packages, sync); return(0); @@ -1042,13 +1046,10 @@ pmsyncpkg_t *_alpm_sync_find(alpm_list_t *syncpkgs, const char* pkgname) pmpkg_t *pkg = alpm_sync_get_pkg(syncpkg); if(strcmp(alpm_pkg_get_name(pkg), pkgname) == 0) { - _alpm_log(PM_LOG_DEBUG, "found package '%s-%s' in sync\n", - alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); return(syncpkg); } } - _alpm_log(PM_LOG_DEBUG, "package '%s' not found in sync\n", pkgname); return(NULL); /* not found */ } -- 1.5.6.3

1 0

[pacman-dev] [PATCH] Use NULL instead of "" as no causingpkg
by Nagy Gabor 19 Jul '08

19 Jul '08

From 84b7a3ca3b5d2c52d43706ffc07a59eda7523d7f Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 19 Jul 2008 15:57:25 +0200 Subject: [PATCH] Use NULL instead of "" as no causingpkg Our STRDUP macro (used in _alpm_depmiss_new) is NULL safe. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 0f3f45c..c667daa 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -277,7 +277,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, _alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n", missdepstring, alpm_pkg_get_name(tp)); free(missdepstring); - miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), depend, ""); + miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), depend, NULL); baddeps = alpm_list_add(baddeps, miss); } } -- 1.5.6.3

1 0

[pacman-dev] Odd -Su checkdeps error message
by Nagy Gabor 19 Jul '08

19 Jul '08

[ngaba@Arch pacman]$ LANG=C sudo pacman -Su :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... error: failed to prepare transaction (could not satisfy dependencies) :: firefox-i18n: requires firefox=3.0 [ngaba@Arch pacman]$ LANG=C pacman -Qi firefox Name : firefox Version : 3.0-2 ... Hm. What's this? [ngaba@Arch pacman]$ LANG=C sudo pacman -Su --debug | grep firefox [12:20:47] debug: new version of 'firefox' found (3.0-2 => 3.0.1-1) [12:20:47] debug: package 'firefox' not found in sync ... Aha. We should somehow inform the user about the selected packages. Btw, these --debug messages are also odd, (instead of 'firefox' not found in sync (== target list), we should say adding firefox to the target list). Bye

2 3

[pacman-dev] [translation] Update cs for 3.2
by Vojtěch Gondžala 19 Jul '08

19 Jul '08

Hi, here is updated cs translation for pacman 3.2. -- Vojtěch „vogo“ Gondžala

1 0

[pacman-dev] [translation] Update en_GB for 3.2
by Jeff Bailes 19 Jul '08

19 Jul '08

Hi, Here's the updated en_GB translations for the pacman 3.2 release. Jeff

1 0

[pacman-dev] pacman i18n
by Hugo Doria 18 Jul '08

18 Jul '08

Hi everyone, My name is Hugo and i am new in this ML, but i already contribute with pacman's translations to pt_BR. Recently i turned a Arch developer and i am creating a i18n project for it. I would like to integrate all pacman's po files to the project. I would also like to make all the translation process more transparent. The page of the project can be viewed here (i still need to finish some parts): http://hdoria.archlinux-br.org/uploads/arch-i18n/arch-i18n.html I will be moving it to dev.archlinux.org soon. If you take a look on the page you will notice that i also created a .POT file for repo-add (using xgettext). Where is the POT file that you provide? I did not found. I saw that pacman 3.2 is with string freeze and that a call for translators was opened. This is the kind of thing that would fit in this i18n project. How can integrate everything? Thanks. -- Hugo Doria

6 12