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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-710-g26c05b1
by Dan McGee 29 Dec '07

29 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 26c05b1c8c6fe639cd4eea5decac694c86cc7c00 (commit) via fdab7207e2bc96ca0f22397a0073f5d1a9c2a2c7 (commit) via c913c53322a7bd4a006a905df4087092a0630ab4 (commit) via 73aa6b610e22377a40c567156b610319ffb9e024 (commit) via 630541a72e2ca041d2fb4401b374670134b12c3d (commit) via 457692b928617cf15d012477af49ced8a3060e9c (commit) via c84feb92dbbc6d5f60cb58db53cfc372acf0516c (commit) via 14d6832ef24aeda7fe77cf4285538baa6e21670c (commit) via cca4ec647e6b5e1959206348360cc7412a5e8ed2 (commit) via d8a10a8e72a4a4c776f52ccdb66c0914b274ea4f (commit) from 9addd88a7d12c8c8445ec226e2837afe01e660b7 (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 26c05b1c8c6fe639cd4eea5decac694c86cc7c00 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 21 23:47:18 2007 -0600 Ensure that manpages are always distributed and installed Commit 012f7939784358b02726c169543aa99436439335 was a bit misguided in its thinking, and resulted in a package built without asciidoc enabled not installing the manpages to the system on a 'make install' operation. Fix this behavior by making manpages required in a normal build, and in order to disable their existence, the '--disable-doc' option must be used. Hopefully this solves manpage issues for both developers and package builders while allowing as much flexibility as possible. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fdab7207e2bc96ca0f22397a0073f5d1a9c2a2c7 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Sat Dec 22 19:59:34 2007 +0100 Updated Italian translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c913c53322a7bd4a006a905df4087092a0630ab4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 20:54:01 2007 +0100 libalpm/add.c: disable buggy backup handling code that didn't do anything. As I mentioned earlier on the ML : http://www.archlinux.org/pipermail/pacman-dev/2007-December/010416.html the first part of commit 843d368ef6 had no effect because of a bug. So I fixed the bug, but since this would change backup handling behavior, and possibly require other bigger changes to work right, I decided to just disable that part temporarily, and left a TODO in the code. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73aa6b610e22377a40c567156b610319ffb9e024 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 20:32:57 2007 +0100 fix two broken pactests because of date localization. query002 and sync1100 had PACMAN_OUTPUT rules that looked at the build/install date (localized). Instead of looking at the month name, it will now check the year, which should be safer. I also had to add another pactest (query005) for keeping the same coverage. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 630541a72e2ca041d2fb4401b374670134b12c3d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 18:51:49 2007 +0100 french translation : one broken message caused a segfault. pacman segfaulted on sync012 pactest because of one broken translation. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 457692b928617cf15d012477af49ced8a3060e9c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 17:47:19 2007 +0100 libalpm/remove.c : switch back to lstat usage. commit b55abdce7a changed every instance of lstat to alpm_stat to remove an eventual trailing /, but in remove.c, this is not wanted. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010451.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c84feb92dbbc6d5f60cb58db53cfc372acf0516c Author: K. Piche <kevin(a)archlinux.org> Date: Sat Dec 22 18:58:49 2007 -0500 Makepkg missing check for empty pkgname I thought it was wierd that makepkg didn't do a sanity check for the $pkgname. This makes for a simple first try at a GIT patch. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14d6832ef24aeda7fe77cf4285538baa6e21670c Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sun Dec 23 01:57:43 2007 +1000 Allow NULL parameter in alpm_trans_commit Fixes FS#7380: alpm crashes on passing NULL to alpm_trans_commit in a sync operation. Adds check that data parameter is not NULL in several functions. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: fix whitespace] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cca4ec647e6b5e1959206348360cc7412a5e8ed2 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sat Dec 22 21:28:08 2007 +1000 Add remove counterparts to alpm_option_add_* functions Fixes FS#7428. Added functions to remove cachedir, noupgrade, noextract, ignorepkg, holdpkg and ignoregrp. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: fix whitespace] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8a10a8e72a4a4c776f52ccdb66c0914b274ea4f Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 28 18:43:49 2007 -0600 Update path for Belnet mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 5 +- configure.ac | 17 ++ doc/Makefile.am | 17 +- etc/pacman.d/mirrorlist.in | 2 +- lib/libalpm/add.c | 25 ++- lib/libalpm/alpm.h | 6 + lib/libalpm/handle.c | 83 ++++++ lib/libalpm/po/fr.po | 4 +- lib/libalpm/remove.c | 6 +- lib/libalpm/sync.c | 46 ++-- lib/libalpm/trans.c | 4 +- pactest/tests/query002.py | 6 +- pactest/tests/{query002.py => query005.py} | 8 +- pactest/tests/sync1100.py | 2 +- po/it.po | 419 ++++++++++++++-------------- scripts/makepkg.sh.in | 4 + 16 files changed, 391 insertions(+), 263 deletions(-) copy pactest/tests/{query002.py => query005.py} (69%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Makepkg missing check for empty pkgname
by K. Piche 29 Dec '07

29 Dec '07

I thought it was wierd that makepkg didn't do a sanity check for the $pkgname. This makes for a simple first try at a GIT patch. Can outgoing SMTP be setup on patch generation? Seems silly to import a text file in evolution everytime... Signed-off-by: K. Piche <kevin(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ef7bae5..f37772a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1288,6 +1288,10 @@ fi source "$BUILDSCRIPT" # check for no-no's in the build script +if [ -z "$pkgname" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + exit 1 +fi if [ -z "$pkgver" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" exit 1 -- 1.5.3.7 -- K. Piche <kpiche(a)rogers.com>

2 1

Re: [pacman-dev] December 74% OFF
by Doctor Carmen Byrne 26 Dec '07

26 Dec '07

1 0

[pacman-dev] [PATCH] Add check for NULL data parameter in sync commit
by Allan McRae 24 Dec '07

24 Dec '07

3 5

[pacman-dev] [PATCH] Add remove counterparts to alpm_option_add_* functions
by Allan McRae 24 Dec '07

24 Dec '07

5 17

[pacman-dev] [PATCH] libalpm/remove.c : switch back to lstat usage.
by Chantry Xavier 22 Dec '07

22 Dec '07

commit b55abdce7a changed every instance of lstat to alpm_stat to remove an eventual trailing /, but in remove.c, this is not wanted. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010451.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/remove.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0e8b57a..125719a 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -203,7 +203,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans) } } - if(_alpm_lstat(file, &buf)) { + if(lstat(file, &buf)) { _alpm_log(PM_LOG_DEBUG, "file %s does not exist\n", file); return; } -- 1.5.3.7

2 2

[pacman-dev] [PATCH] french translation : one broken message caused a segfault.
by Chantry Xavier 22 Dec '07

22 Dec '07

pacman segfaulted on sync012 pactest because of one broken translation. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/po/fr.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index f9e1093..836ff82 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -6,14 +6,12 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-12-21 11:06+0100\n" -"PO-Revision-Date: 2007-12-21 11:07+0100\n" +"PO-Revision-Date: 2007-12-22 18:43+0100\n" "Last-Translator: Xavier <shiningxc(a)gmail.com>\n" "Language-Team: solsTiCe d'Hiver <solstice.dhiver(a)laposte.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" #: lib/libalpm/add.c:86 #, c-format @@ -168,7 +166,7 @@ msgstr "base de données non initialisée\n" #: lib/libalpm/deps.c:171 msgid "dependency cycle detected:\n" -msgstr "cycle de dépendances détecté: %s\n" +msgstr "cycle de dépendances détecté:\n" #: lib/libalpm/deps.c:173 #, c-format -- 1.5.3.7

3 3

[pacman-dev] [PATCH] New fileconflict003.py and fileconflict004.py pactests
by Nagy Gabor 22 Dec '07

22 Dec '07

From e22982584b226b541779fbe63aee18d9eea6b781 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 22 Dec 2007 22:33:43 +0100 Subject: [PATCH] New fileconflict003.py and fileconflict004.py pactests These pactests check whether pacman detects filesystem vs package directory-symlink (file)conflicts. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/fileconflict003.py | 16 ++++++++++++++++ pactest/tests/fileconflict004.py | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/fileconflict003.py create mode 100644 pactest/tests/fileconflict004.py diff --git a/pactest/tests/fileconflict003.py b/pactest/tests/fileconflict003.py new file mode 100644 index 0000000..1a6b354 --- /dev/null +++ b/pactest/tests/fileconflict003.py @@ -0,0 +1,16 @@ +self.description = "Fileconflict with symlinks (3)" + +lp = pmpkg("dummy") +lp.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg(p1) + +self.args = "-A %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/fileconflict004.py b/pactest/tests/fileconflict004.py new file mode 100644 index 0000000..5078f29 --- /dev/null +++ b/pactest/tests/fileconflict004.py @@ -0,0 +1,16 @@ +self.description = "Fileconflict with symlinks (4)" + +lp = pmpkg("dummy") +lp.files = ["dir/localdir/", + "dir/symdir -> localdir"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg(p1) + +self.args = "-A %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") -- 1.5.3.7

1 0

Re: [pacman-dev] [arch-dev-public] Fwd: [signoff] bash 3.2.0330-1 and filesystem 2007.11-4
by Xavier 22 Dec '07

22 Dec '07

Aaron Griffin wrote: > Please retest. This bash package overrides the previous one. Patch > level updated, profile.bash added to backup=() array. > > Potential issue: Apparently /etc/profile is not replaced if modified. > Can someone verify if this is fixed or not? I will investigate further > as I fear it may be a pacman bug - if so, I'm guessing keeping > etc/profile in BOTH backup arrays for the time being may fix this. > Just to sum up : old bash has /etc/profile, in its backup array old filesystem doesn't have that file new bash doesn't have that file new filesystem has /etc/profile, in its backup array When doing the upgrade, the following debug logs appear : [22:08:55] debug: file in backup array, adding to add and remove skiplist: etc/profile That's line 443 of libalpm/conflict.c.There is a whole part in the file conflict checking to see if a file has changed hands. Since the file was added to add skiplist, here is what happens when filesystem is extracted in libalpm/add.c : [22:08:55] debug: etc/profile is in trans->skip_add, skipping extraction So there is no profile.pacnew extracted at this point. However, if you reinstall filesystem after that, the .pacnew will now show up, as usual. I know, that was the easy part of just saying what is going on. And no progress on the hard part to think about a fix.

1 0

[pacman-dev] [PATCH] libalpm/add.c: disable buggy backup handling code that didn't do anything.
by Chantry Xavier 22 Dec '07

22 Dec '07

As I mentioned earlier on the ML : http://www.archlinux.org/pipermail/pacman-dev/2007-December/010416.html the first part of commit 843d368ef6 had no effect because of a bug. So I fixed the bug, but since this would change backup handling behavior, and possibly require other bigger changes to work right, I decided to just disable that part temporarily, and left a TODO in the code. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 11c5eb8..292a011 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -234,26 +234,37 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm tr->skip_remove = alpm_list_strdup(trans->skip_remove); const alpm_list_t *b; - /* Add files in the OLD and NEW backup array to the NoUpgrade array + /* Add files in the NEW backup array to the NoUpgrade array * so this removal operation doesn't kill them */ alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade); /* old package backup list */ - for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) { - const char *backup = b->data; + for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { + char *backup = _alpm_backup_file(b->data); _alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n", backup); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + backup); } + + /* TODO: we could also add files in the OLD backup array, but this would + * change the backup handling behavior, and break several pactests, and we + * can't do this just before 3.1 release. + * The unlink_file function in remove.c would also need to be reviewed. */ +#if 0 /* new package backup list */ - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - const char *backup = b->data; + for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) { + char *backup = _alpm_backup_file(b->data); /* make sure we don't add duplicate entries */ if(!alpm_list_find_ptr(handle->noupgrade, backup)) { _alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n", backup); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + _alpm_backup_file(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + backup); } } +#endif int ret = _alpm_remove_commit(tr, db); -- 1.5.3.7

1 0