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

[pacman-dev] [PATCH 3/4] Add a PKGBUILD for easy testing.
by Victor Lowther 27 Jul '10

27 Jul '10

We don't need the whole usual pkgbuild, but having one in the git tree sure makes testing simpler. --- PKGBUILD | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..16cf977 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 83376 2010-06-21 12:52:09Z dan $ +# Maintainer: Aaron Griffin <aaron(a)archlinux.org> +# Maintainer: Dan McGee <dan(a)archlinux.org> + +pkgname=pacman-git +pkgver=$(date +%s) +pkgrel=$(git log --pretty=format:%h |head -n 1) +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') +makedepends=('asciidoc') +optdepends=('fakeroot: for makepkg usage as normal user') +provides=('pacman=9999') +backup=('etc/pacman.conf' 'etc/makepkg.conf') +conflicts=('pacman') +options=(!libtool) + +build() { + cd .. + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc + make || return 1 +} + +package() { + cd $srcdir/.. + srcdir="$PWD" + make DESTDIR=$pkgdir install || return 1 + + # install Arch specific stuff + mkdir -p $pkgdir/etc + # set things correctly in the default conf file + case "$CARCH" in + i686) + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 " + ;; + x86_64) + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64 " + ;; + esac + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman + mkdir -p $pkgdir/usr/share/zsh/site-functions/ + install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} + +# vim: set ts=2 sw=2 et: -- 1.7.1.1

1 0

[pacman-dev] [PATCH 2/4] Add very basic transaction hooks to alpm.
by Victor Lowther 27 Jul '10

27 Jul '10

libalpm compliant programs now support running pre-commit and post-commit hooks. Currently, the implementation is as simple as I can make it -- if /etc/pacman.d/hooks.d/transact.sh exists, it will be run with the 'pre-commit' parameter just before a transaction is committed, and it will be run with 'post-commit' after the transaction has been completed. The intent is for transact.sh to be a wrapper that calls scripts in /etc/pacman.d/hooks.d/transact.d with the arg it is passed, but since this is just for a demo I did not actually include any of that. I also didn't bother adhering to any of the coding standards, as that will be easy enough to fix up once we have something a bit more fleshed out. --- lib/libalpm/hooks.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/hooks.h | 4 ++++ lib/libalpm/trans.c | 4 +++- 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/hooks.c b/lib/libalpm/hooks.c index 9630c70..5982ea5 100644 --- a/lib/libalpm/hooks.c +++ b/lib/libalpm/hooks.c @@ -30,6 +30,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/statvfs.h> +#include <sys/wait.h> #include <errno.h> /* libalpm */ @@ -46,3 +47,30 @@ #include "alpm.h" #include "deps.h" #include "cache.h" + +int alpm_hook_transact(char* phase) { + char filename[PATH_MAX]; + struct stat sbuf; + pid_t childpid, retpid; + int status; + /* ignore transaction hooks when targeting another root filesystem + if (!strcmp(handle->root,"/")) + return 1;*/ + snprintf(filename,PATH_MAX,"%s/transact.sh",ALPM_HOOKS_DIR); + /* if we cannot stat transact.sh, just return */ + if (stat(filename,&sbuf) != 0) + return 1; + fflush(NULL); + childpid=fork(); + if (childpid == -1) { + return 1; + } else if (childpid == 0) { + execl(filename,"transact.sh",phase,(char *)0); + } else { + /* return the exit status of the transact.sh program. */ + do { + retpid = waitpid(childpid,&status,0); + } while (!WIFEXITED(status) && !WIFSIGNALED(status)); + } + return !WEXITSTATUS(status); +} diff --git a/lib/libalpm/hooks.h b/lib/libalpm/hooks.h index d60b1f4..f79d2c4 100644 --- a/lib/libalpm/hooks.h +++ b/lib/libalpm/hooks.h @@ -25,4 +25,8 @@ #include "alpm.h" +#define ALPM_HOOKS_DIR "/etc/pacman.d/hooks.d" + +int alpm_hook_transact(char*); + #endif /*ALPM_HOOKS_H */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 523f33b..ed26aa6 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -195,7 +195,8 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) if(trans->add == NULL && trans->remove == NULL) { return(0); } - + if (! alpm_hook_transact("pre-commit")) + return (-1); trans->state = STATE_COMMITING; if(trans->add == NULL) { @@ -211,6 +212,7 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) } trans->state = STATE_COMMITED; + alpm_hook_transact("post-commit"); return(0); } -- 1.7.1.1

1 0

[pacman-dev] [PATCH 1/4] Add skeleton for hooks support
by Victor Lowther 27 Jul '10

27 Jul '10

This begins work on adding some sort of hook infrastructure to pacman. There has been much discussion and little code that I have seen, so I figured I would go ahead an implement a very basic skeleton for transaction hooks support. --- lib/libalpm/Makefile.am | 1 + lib/libalpm/{sync.h => hooks.c} | 34 +++++++++++++++++++++++++--------- lib/libalpm/{add.h => hooks.h} | 19 ++++++++----------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 3473a73..b4fdadf 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -44,6 +44,7 @@ libalpm_la_SOURCES = \ sync.h sync.c \ trans.h trans.c \ util.h util.c \ + hooks.h hooks.c \ version.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) diff --git a/lib/libalpm/sync.h b/lib/libalpm/hooks.c similarity index 65% copy from lib/libalpm/sync.h copy to lib/libalpm/hooks.c index 000a09c..9630c70 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/hooks.c @@ -1,9 +1,10 @@ /* - * sync.h + * hooks.c * * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.org> * * This program is free software; you can redistribute it and/or modify @@ -19,14 +20,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ALPM_SYNC_H -#define _ALPM_SYNC_H -#include "alpm.h" - -int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); -int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data); +#include "config.h" -#endif /* _ALPM_SYNC_H */ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/statvfs.h> +#include <errno.h> -/* vim: set ts=2 sw=2 noet: */ +/* libalpm */ +#include "hooks.h" +#include "trans.h" +#include "alpm_list.h" +#include "package.h" +#include "util.h" +#include "log.h" +#include "handle.h" +#include "add.h" +#include "remove.h" +#include "sync.h" +#include "alpm.h" +#include "deps.h" +#include "cache.h" diff --git a/lib/libalpm/add.h b/lib/libalpm/hooks.h similarity index 73% copy from lib/libalpm/add.h copy to lib/libalpm/hooks.h index eb37dc7..d60b1f4 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/hooks.h @@ -1,8 +1,11 @@ /* - * add.h + * hooks.h * * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> + * Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.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 @@ -17,15 +20,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _ALPM_ADD_H -#define _ALPM_ADD_H +#ifndef _ALPM_HOOKS_H +#define _ALPM_HOOKS_H -#include "db.h" -#include "alpm_list.h" -#include "trans.h" +#include "alpm.h" -int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db); - -#endif /* _ALPM_ADD_H */ - -/* vim: set ts=2 sw=2 noet: */ +#endif /*ALPM_HOOKS_H */ -- 1.7.1.1

1 0

Re: [pacman-dev] New patchset for package signing
by Denis A. Altoé Falqueto 26 Jul '10

26 Jul '10

On Thu, Jul 22, 2010 at 12:17 AM, Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> wrote: > Guys, > > The previous patches were not much commented. I believe the main problem was > the fact that I didn't use gpgme (and, instead, undone some work already done). > > So, I changed the code to use gpgme. Here are the patches for your evaluation. Hi, Now that ArchCon has ended, I believe we can continue with the discussion, right? The replies are rare, so I don't know if there is not enough interest or if my implementation is so bad that can't be fixed :) I am open to any constructive criticism and suggestions, as always. -- A: Because it obfuscates the reading. Q: Why is top posting so bad? ------------------------------------------- Denis A. Altoe Falqueto -------------------------------------------

2 2

[pacman-dev] [PATCH] bash_completion: negate expression inside brackets
by Dave Reisner 26 Jul '10

26 Jul '10

Avoids letting the shell evaluate ! as something else (e.g. an alias). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- contrib/bash_completion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 1ec2cd5..bdc4754 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -75,8 +75,8 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core - elif ! [[ $prev =~ ^-\w*[Vbhr] || - $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] + elif [[ ! $prev =~ ^-\w*[Vbhr] && + ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || case ${o% *} in -- 1.7.2

1 0

[pacman-dev] [PATCH] bash_completion: negate expression inside brackets
by Dave Reisner 26 Jul '10

26 Jul '10

Avoids letting the shell evaluate the ! as something else (e.g. if ! is an alias). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- contrib/bash_completion | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 1ec2cd5..486870f 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -75,7 +75,7 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core - elif ! [[ $prev =~ ^-\w*[Vbhr] || + elif [[ ! $prev =~ ^-\w*[Vbhr] || $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || -- 1.7.2

2 3

[pacman-dev] Unnecessary syscalls
by Tim Nieradzik 26 Jul '10

26 Jul '10

Hello, it's my first message on this list. I'd like to make a few contributions to improve Pacman's performance. Pacman is a great package manager which I'm now using for a few years without any problems. It also has a very clear and well-structured code but its disk stress concerns me a bit. Looking at strace, a few syscalls appear superfluous to me. Deleting them made pacman -Syu (right after a disk flush) about 10s faster (70% less syscalls). Here's the patch: http://pastebin.archlinux.fr/406557 I've already talked about it on the forum but they advised me to discuss it here instead. There are also some suggestions for further optimizations: http://bbs.archlinux.org/viewtopic.php?id=101702 What do you think? --Tim

2 1

[pacman-dev] [PATCH 1/2] Add two pactests for group and --needed interaction
by Dan McGee 26 Jul '10

26 Jul '10

The first step for resolving FS#20221. sync023 is the case from the bug report; sync022 is already working fine but we have no tests at all that test the --needed option in any form. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/sync022.py | 25 +++++++++++++++++++++++++ test/pacman/tests/sync023.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/sync022.py create mode 100644 test/pacman/tests/sync023.py diff --git a/test/pacman/tests/sync022.py b/test/pacman/tests/sync022.py new file mode 100644 index 0000000..eebbe07 --- /dev/null +++ b/test/pacman/tests/sync022.py @@ -0,0 +1,25 @@ +self.description = "Install a group from a sync db using --needed" + +lp1 = pmpkg("pkg1") +lp2 = pmpkg("pkg2") +lp3 = pmpkg("pkg3") + +sp1 = pmpkg("pkg1", "1.1-1") +sp2 = pmpkg("pkg2") +sp3 = pmpkg("pkg3") + +for p in lp1, lp2, lp3, sp1, sp2, sp3: + setattr(p, "groups", ["grp"]) + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p) + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.args = "-S --needed grp" + +self.addrule("PACMAN_RETCODE=0") +for p in sp1, sp2, sp3: + self.addrule("PKG_EXIST=%s" % p.name) +self.addrule("PKG_VERSION=pkg1|1.1-1") diff --git a/test/pacman/tests/sync023.py b/test/pacman/tests/sync023.py new file mode 100644 index 0000000..9253497 --- /dev/null +++ b/test/pacman/tests/sync023.py @@ -0,0 +1,31 @@ +self.description = "Install a group from a sync db using --needed (testing repo)" + +lp1 = pmpkg("pkg1", "1.1-1") +lp2 = pmpkg("pkg2") +lp3 = pmpkg("pkg3") + +sp1 = pmpkg("pkg1") +sp2 = pmpkg("pkg2") +sp3 = pmpkg("pkg3") +newp1 = pmpkg("pkg1", "1.1-1") + +for p in lp1, lp2, lp3, sp1, sp2, sp3, newp1: + setattr(p, "groups", ["grp"]) + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p) + +self.addpkg2db("testing", newp1); + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.args = "-S --needed grp" + +self.addrule("PACMAN_RETCODE=0") +for p in sp1, sp2, sp3: + self.addrule("PKG_EXIST=%s" % p.name) +# The newer version should still be installed +self.addrule("PKG_VERSION=pkg1|1.1-1") + +self.expectfailure = True -- 1.7.2

1 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 25 Jul '10

25 Jul '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs Signed-off-by: Dave Reisner <d(a)falconindy.com> --- src/pacman/pacman.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 049bc40..6d9d954 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1172,6 +1173,29 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(0)) { + char line[BUFSIZ]; + int i = 0; + while((line[i] = fgetc(stdin)) != EOF) { + if(isspace(line[i])) { + line[i] = 0; + /* avoid adding zero length arg, if multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + continue; + } + ++i; + } + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + freopen(ctermid(NULL), "r", stdin); + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.2

4 4

Re: [pacman-dev] Pacman.conf
by Dan McGee 21 Jul '10

21 Jul '10

if you think they aren't clear, by all means please file a bug report. And when you mention you volunteered to help, I guess I'm not sure who this is considering the email is from Tech Support Department, I'm not even quite sure who I'm talking to. -Dan On Wednesday, July 21, 2010, Tech Support Department <tech(a)frontrowcomputer.com> wrote: > > > > > > > Okay. It was just that since I had already offered > to help on the various man pages and was not taken up on the > offer, there was no way I could help fix the poor writing in the > man pages, and by extension, get the information I needed myself > unless I went directly to the source. I guess we users will have > to start a new document somewhere based upon trial and error. > > Thanks anyway. > > > On 07/21/2010 10:11 AM, Dan McGee wrote: > > On Wed, Jul 21, 2010 at 9:07 AM, Tech Support Department > <tech(a)frontrowcomputer.com> <tech(a)frontrowcomputer.com> wrote: > > > Could you please explain the following statements, which I found at > http://www.archlinux.org/pacman/pacman.conf.5.html: > > During parsing, pacman will define the $repo variable to the name of the > current section. This is often utilized in files specified using the Include > directive so all repositories can use the same mirrorfile. pacman also > defines the $arch variable to the value of Architecture, so the same > mirrorfile can even be used for different architectures. > > > > The Arch Linux forums, IRC channel, or mailing lists are a much better > venue for such questions. > > If you would still like my private assistance, I would be glad to > assist once we discuss payment options. My billing rate is $65/hour. > > -Dan > > > > > >

2 1