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

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] [patch] add support for scriptlets functions embedded in $BUILDSCRIPT
by Alessio 'mOLOk' Bolognino 25 Feb '08

25 Feb '08

Hi, I think there isn't a real need to split PKGBUILD and $pkgname.install, this patch allows you to put the scriptlets functions into the PKGBUILD. This IMHO follows the KISS philosophy. If at least a {post,pre}_{install,upgrade,remove} function is found in the PKGBUILD, then the install file (if it exists) is ignored; otherwise, if there isn't any scriptlet function in the PKGBUILD the install file is included, as usually. Enjoy: From e206a96ebe1e9a11f85de1502fc46e75321ba192 Mon Sep 17 00:00:00 2001 From: Alessio 'mOLOk' Bolognino <themolok(a)gmail.com> Date: Sat, 21 Jul 2007 06:15:34 +0200 Subject: [PATCH] Added support for scriptlets functions embedded in $BUILDSCRIPT --- scripts/makepkg.sh.in | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a3e4d9c..fb931a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -831,9 +831,18 @@ create_package() { local comp_files=".PKGINFO .FILELIST" - # check for an install script + # check for scriptlets fuctions or an install script # TODO: should we include ${pkgname}.install if it exists and $install is unset? - if [ "$install" != "" ]; then + scriptlet=$(declare -f {post,pre}_{install,remove,upgrade} || return 0) + if [ "$scriptlet" != "" ]; then + msg2 "$(gettext "Adding scriptlet functions (install script will be ignored)...")" + ( echo "$scriptlet" + echo 'op=$1' + echo 'shift' + echo '[ "$(type -t "$op")" = "function" ] && $op "$@"' + ) > .INSTALL + comp_files="$comp_files .INSTALL" + elif [ "$install" != "" ]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL comp_files="$comp_files .INSTALL" @@ -1175,6 +1184,7 @@ fi unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract +unset {post,pre}_{install,remove,upgrade} if [ ! -f "$BUILDSCRIPT" ]; then error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" -- 1.5.2.4 -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User Please send personal email to themolok(a)gmail.com Public Key http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xFE0270FB GPG Key ID = 1024D / FE0270FB 2007-04-11 Key Fingerprint = 9AF8 9011 F271 450D 59CF 2D7D 96C9 8F2A FE02 70FB

9 20

[pacman-dev] Asciidoc manpages
by Dan McGee 29 Dec '07

29 Dec '07

Does anyone on the list know a lot about Asciidoc? Specifically, I noticed that our manpage generation has gotten a bit weird. Notice that every manpage generated in the pacman-git release (or in your own working tree when using --enable-asciidoc) has: * a weird Notes section at the bottom * a broken "See Also" section (looks like the macro is busted or something) In addition, the PKGBUILD example nclude in PKGBUILD.5 does not look so hot. Does anyone (Andrew, are you still around?) want to look into this and see what they can come up with to fix it? I swear we had it working for a while, so this may be related to a docbook-xsl upgrade. If you do investigate, be sure whatever changes you make keep both the HTML and the manpage format looking OK. -Dan

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-626-g72f40b3
by Dan McGee 02 Dec '07

02 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 72f40b3876263f7a8dcda1390026f43f599f8823 (commit) via d683033d3ea79956faf8786f784ce2e271179892 (commit) via 11133da587ebc1c78478cfcd05d5e8298bd61b84 (commit) via 7d37d9278d0ab6eb46ec4689c8091780382cbb95 (commit) from 1e9a1a0292dbbf8039b8fb7536dbff2af28c7afb (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 72f40b3876263f7a8dcda1390026f43f599f8823 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Nov 20 09:57:38 2007 +0100 _alpm_checkconflicts split _alpm_innerconflicts: check for target<->target conflicts _alpm_outerconflicts: check for target<->localpkg conflicts This will be useful in sync.c clean-up and in testdb.c As an application the patch also fixes a misleading message (and a memleak) in add.c Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d683033d3ea79956faf8786f784ce2e271179892 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Nov 25 16:13:56 2007 -0600 pacman/query.c : -Qo optimization. I didn't understand why realpath was called on every files of every filelist in query_fileowner : ppath = resolve_path(path); It turns out this is needed for the diverted files. For example, cddb_get installs /usr/lib/perl5/site_perl/5.8.8/CDDB_get.pm which actually ends in /usr/lib/perl5/site_perl/current/CDDB_get.pm . And for making pacman -Qo /usr/lib/perl5/site_perl/current/CDDB_get.pm , realpath has to be called on both the target, and the file in the filelist. However, realpath is costly, and calling it on every single file resulted in a poor -Qo performance. Worst case : pacman -Qo /lib/libz.so.1 0.35s user 1.51s system 99% cpu 1.864 total So I did a little optimization to avoid calling realpath as much as possible: first compare the basename of each file. Result: src/pacman/pacman -Qo /lib/libz.so.1 0.24s user 0.05s system 99% cpu 0.298 total Obviously, the difference will be even bigger at the first run (no fs cache), though it's quite scary on my system : 1.7s vs 40s previously. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11133da587ebc1c78478cfcd05d5e8298bd61b84 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Nov 25 16:13:30 2007 -0600 Move mbasename from pacman.c to util.c This function can be useful in other places. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7d37d9278d0ab6eb46ec4689c8091780382cbb95 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Sun Aug 12 22:26:54 2007 +0200 Fix for sync1003 and sync1004 pactests checkdeps and resolvedeps now take both a remove list and an install list as arguments, allowing dependencies to be calculated correctly. This broke the sync990 pactest, but this pactest used dependencies and provides in an unusual way, so it has been changed. Dan: the sync990 pactest was just plain wrong. It didn't satisfy the dependencies correctly, so should never have succeeded. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: some variable renaming, clarification in commit message] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 50 +++------ lib/libalpm/alpm.h | 4 +- lib/libalpm/conflict.c | 29 ++++- lib/libalpm/conflict.h | 2 + lib/libalpm/deps.c | 285 ++++++++++++++++++++-------------------------- lib/libalpm/deps.h | 4 +- lib/libalpm/remove.c | 4 +- lib/libalpm/sync.c | 100 +++++----------- pactest/tests/sync990.py | 7 +- src/pacman/pacman.c | 22 ---- src/pacman/query.c | 8 ++ src/pacman/util.c | 22 ++++ src/pacman/util.h | 1 + src/util/testdb.c | 2 +- 14 files changed, 233 insertions(+), 307 deletions(-) hooks/post-receive -- The official pacman repository

5 22

[pacman-dev] resolvedeps is negligent: resolvedeps.py
by Nagy Gabor 02 Dec '07

02 Dec '07

Hi! This is a not-to-commit pactest, I just refer to this old thread...: http://www.archlinux.org/pipermail/pacman-dev/2007-August/009072.html I don't know whether we should fix this or not... This is not a critical bug, just resolvedeps is a bit negligent, but checkdeps will report its negligence (however, pacman doesn't seem to be very informative...). By fixing this the code would be cleaner, more clever, but _notably_ slower, so I still don't know what to do... What do you think? ---resolvedeps.py--- self.description = "resolvedeps test" sp1 = pmpkg("pkg1") sp1.depends = [ "pkg2>=2.0-1" , "provision" ] self.addpkg2db("sync", sp1) sp2 = pmpkg("pkg2", "2.0-1") self.addpkg2db("sync", sp2) sp3 = pmpkg("provision") self.addpkg2db("sync", sp3) lp = pmpkg("pkg2", "1.0-1") lp.provides = [ "provision" ] self.addpkg2db("local", lp) self.args = "-S pkg1 pkg2" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_VERSION=pkg2|2.0-1") self.addrule("PKG_EXIST=provision") ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 15

[pacman-dev] more universal testdb -- bugs in our sync repos
by Nagy Gabor 30 Nov '07

30 Nov '07

Hi! Imho that would be helpful if testdb were more flexible. This may not be the proper ML (but I'm sure that reporting bugs is better than being silent), but I made some tests on sync repos, and I found the following inconsistencies in our sync dbs, mostly in community (I have only core, extra, community "enabled"): Unsatisfied dependencies: ------------------------- firefox-i18n -> firefox-i18n=2.0.0.9 dfm -> xfree86 fvwm-themes-devel -> fvwm-devel icomplete -> vim-devel perl-xml-feed -> perl-datetime-format-mail -> perl-datetime>=0.1705 perl-xml-rss -> perl-datetime-format-mail -> perl-datetime>=0.1705 perl-datetime-format-strptime -> perl-datetime>=0.1402 portaudio_cpp -> portaudio Strange dependency (cycle): --------------------------- archboot->archboot Some of them (like firefox-i18n) is not actual yet, but these things could be tested by a clever app (a modified testdb for internal use) to avoid these bugs. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] [PATCH] New sync1005.py pactest
by Nagy Gabor 30 Nov '07

30 Nov '07

Hi! Patch attached. Note: I found an issue in resolvedeps, it simply pulls both pkg1s with this pactest (debug log), but the pactest doesn't fail [I don't know why]: ---sync1006.py--- self.description = "Conflicting package names in sync repos (2)" sp1 = pmpkg("pkg1") sp1.provides = [ "provision1" ] self.addpkg2db("sync1", sp1) sp2 = pmpkg("pkg1") sp2.provides = ["provision2"] self.addpkg2db("sync2", sp2) sp3 = pmpkg("pkg2") sp3.depends = ["provision1", "provision2"] self.addpkg2db("sync1", sp3) self.args = "-S pkg2" self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] Fast binary database
by Sivert Berg 29 Nov '07

29 Nov '07

Hello, I have been playing with the idea of speeding up pacman for a little while. This is my first try. It's a binary database that uses a ternary search tree to speedup file lookup and package lookup. The result can be found at http://owwsnap.com/sarcina-0.0.1.tar.gz. To compile it you need to run the normal ./configure && make, but you would probably want to edit src/sarcina.c and change the hardcoded paths. If you're running a new version of pacman (3.1 or something) you probably need to change libsarc/sarc.c:505: db_local = alpm_db_register("local"); into alpm_option_set_dbpath("/var/lib/pacman/"); db_local = alpm_db_register_local(); I see you have discussed the database question several times. I hope this code could give you some answers (is a binary database really faster etc). To run this program you first need to build the database using sarcina -u. Then you can: - find who owns a file (sarcina -o file) - list files that are outdated (sarcina -s) - "install" a package (sarcina -i package). This is pretty much just a proof-of-concept, so don't expect it to do much, but I think it might be a start. Sivert

4 3

[pacman-dev] Bug with rxvt-unicode version check
by bardo 28 Nov '07

28 Nov '07

Hi all. I'm experiencing a strange problem: rxvt-unicode should be upgraded from 8.4-1 to 8.5a-1, but when it comes the time of checking if the package has been cached, 8.4-1 is marked as a match, and gets installed instead of the new version. I can reproduce this whenever I want, since pacman tries to upgrade rxvt-unicode with every -Su. The relevant part of pacman -Syu --debug is attached, I can upload the whole log if needed (~750KB). Corrado

5 10

[pacman-dev] [PATCH] Optimize string comparison on 1 character compare
by Dan McGee 27 Nov '07

27 Nov '07

No need to do strcmp when we can check for direct equality, but is it worth the optimization? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_files.c | 4 ++-- lib/libalpm/util.c | 2 +- src/pacman/sync.c | 4 ++-- src/pacman/util.c | 2 +- src/util/testdb.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 078136e..74932d2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -170,7 +170,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) /* search for a specific package (by name only) */ rewinddir(db->handle); while(!found && (ent = readdir(db->handle)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* stat the entry, make sure it's a directory */ @@ -201,7 +201,7 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) if(ent == NULL) { return(NULL); } - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { isdir = 0; continue; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2a42948..3ce1f04 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -463,7 +463,7 @@ int _alpm_rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += _alpm_rmrf(name); } } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 58e616e..e9c16f5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -61,7 +61,7 @@ static int sync_cleandb(const char *dbpath) { int found = 0; char *dname = ent->d_name; - if(!strcmp(dname, ".") || !strcmp(dname, "..")) { + if(*dname == '.' || !strcmp(dname, "..")) { continue; } /* skip the local and sync directories */ @@ -145,7 +145,7 @@ static int sync_cleancache(int level) char path[PATH_MAX]; pmpkg_t *localpkg = NULL, *dbpkg = NULL; - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* build the full filepath */ diff --git a/src/pacman/util.c b/src/pacman/util.c index a925be3..5025b3f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -154,7 +154,7 @@ int rmrf(const char *path) if(dp->d_ino) { char name[PATH_MAX]; sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { + if(strcmp(dp->d_name, "..") && *(dp->d_name) != '.') { errflag += rmrf(name); } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 31b4ff0..c3f86d8 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -75,7 +75,7 @@ static int db_test(char *dbpath) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(*(ent->d_name) == '.' || !strcmp(ent->d_name, "..")) { continue; } /* check for desc, depends, and files */ -- 1.5.3.6

3 3