January 2008 - 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] Don't ask for install confirmation if no dependencies
by mmiikkee13＠gmail.com 12 Mar '08

12 Mar '08

This is a patch to make Pacman only ask for confirmation if anything different from what the user requested (i.e. dependencies) is going to be installed. Since the user took the time to type out "pacman -Sy foo", they obviously did want foo installed, and it really wouldn't make sense to ask them this again unless something else will be installed.

8 9

[pacman-dev] [PATCH] New sync1007.py pactest
by Nagy Gabor 11 Mar '08

11 Mar '08

From 9274e45ad97cce0749e23340cf51d8a3de0935b9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 29 Jan 2008 13:43:08 +0100 Subject: [PATCH] New sync1007.py pactest This pactest shows that checkdeps can be fooled when a package exists in multiple repos. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync1007.py | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync1007.py diff --git a/pactest/tests/sync1007.py b/pactest/tests/sync1007.py new file mode 100644 index 0000000..4245142 --- /dev/null +++ b/pactest/tests/sync1007.py @@ -0,0 +1,18 @@ +self.description = "Conflicting package names in sync repos (checkdeps is fooled)" + +sp1 = pmpkg("pkg1") +sp1.depends = [ "pkg2=1.0" ] +self.addpkg2db("community", sp1) + +sp2 = pmpkg("pkg2", "1.1-1") +self.addpkg2db("testing", sp2) + +sp3 = pmpkg("pkg2", "1.0-1") +self.addpkg2db("extra", sp3) + +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|1.0-1") -- 1.5.3.8

3 2

[pacman-dev] [PATCH] Autoversion deps upon package creation in makepkg
by Darwin Bautista 11 Mar '08

11 Mar '08

Hi all, Attached is a patch to add "autoversion of dependencies" in makepkg. I think the usage of the term "autoversion" is a little vague but I can't of any other term. Anyway, autoversioning will save package maintainers a lot of time in adding and bumping the minimum required versions of a certain package's dependencies directly in the PKGBUILD. Of course, this autoversioning can be overridden by directly specifying the minimum/maximum (if ever)/exact version of a dep. Autoversioning can be disabled by using these opts: '-v' or '--nodepsver'. I've seen quite a lot of packages (extra, community) which have "out-dated" or wrong minimum versions of the deps. For instance, I've seen a package (which I can't remember) of a KDE app built against KDE 3.5.8 yet the specified minimum version is 3.5.7 (or older?). This can help prevent bugs resulting from this seemingly subtle issue. -- Darwin M. Bautista BS Electronics and Communications Engineering University of the Philippines Diliman http://www.darwin.uk.to University of the Philippines Linux Users' Group http://www.uplug.org

6 11

[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] pacman.conf little clean up
by Xavier 06 Feb '08

06 Feb '08

1) Why do we have this comment everywhere in the conf file : # Add your preferred servers here, they will be used first In my opinion, all these lines could disappear. It's recommended that you keep all your repositories in sync. That means using the same mirror for all official repo. And since all official repo already have this by default : Include = /etc/pacman.d/mirrorlist Only that file needs to be edited, and this will affect all official repo automatically. Advanced users who know what they are doing might not want to use the same mirror everywhere for specific reasons. But I don't think they need a comment everywhere explaining how to do it. But that comment might rather belong to the mirrorlist file. 2) For similar reasons, I don't think the following comment is needed : # REPOSITORIES # - can be defined here or included from another file I doubt many people use that. pacman.conf currently has only two parts : a few options, and the repositories. I don't think there is a need to split these. And again, people who do it probably know what they are doing. 3) I find pacman.conf more readable with more new lines (especially when read without syntax highlighting), so I added a few of these as well, to better separate the different parts, like the comments and the commented lines. Anyway, all these things are not important at all, and might be stupid ideas. It's just random thoughts that came to my mind after seeing an user messed up again configuring his pacman.conf. --- pacman.conf 2008-01-25 19:34:04.000000000 +0100 +++ pacman.conf.new 2008-01-25 18:03:29.000000000 +0100 @@ -6,19 +6,22 @@ # # GENERAL OPTIONS # + [options] + # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. + #RootDir = / #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log + HoldPkg = pacman glibc #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u # # REPOSITORIES -# - can be defined here or included from another file # - pacman will search repositories in the order defined here # - local/custom mirrors can be added here or in separate files # - repositories listed first will take precedence when packages @@ -34,31 +37,28 @@ # # Testing is disabled by default. To enable, uncomment the following -# two lines. You can add preferred servers immediately after the header, -# and they will be used before the default mirrors. +# two lines. + #[testing] #Include = /etc/pacman.d/mirrorlist [core] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [extra] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist [community] -# Add your preferred servers here, they will be used first Include = /etc/pacman.d/mirrorlist # Unstable is disabled by default. To enable, uncomment the following -# two lines. You can add preferred servers immediately after the header, -# and they will be used before the default mirrors. +# two lines. + #[unstable] #Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. + #[custom] #Server = file:///home/custompkgs -

3 3

[pacman-dev] pmtransconv_t + cb_trans_conv
by Nagy Gabor 05 Feb '08

05 Feb '08

Hi! Some background: FS#7524 and http://bbs.archlinux.org/viewtopic.php?id=42959 So I decided to rephrase our questions and messages to give more information about what happening "inside". Then I soon ran into the question: "Is pmtransconv_t needed?". Why do we restrict ourselves to some pre-defined questions? The question string [char *] should also work, and then the front-end could put a " [Y/n]" after the question (or add yes/no buttons in a graphic dialog box). But after looking into cb_trans_conv I got the answer: the front-end must know the "meaning" of the question to apply its --no-confirm or (removed) --ask rules. I also saw in the comment, that function is tagged as ugly. My compromise: let the backend formulate the question (snprintf + pass char* question param or by using va_list) and keep this pmtransconv_t. An example: PM_TRANS_CONV_CONFLICT_PKG: "foo [pulled dependency] conflicts with bar. Do you remove bar?" Or we could use a more general PM_TRANS_CONV_REMOVE_LOCAL type... Opinions, ideas? Bye

2 3

[pacman-dev] gensync and updatesync status
by Xavier 04 Feb '08

04 Feb '08

I am confused by all the db scripts we have : gensync, updatesync, repo-add, repo-remove. So I had a look a bit at git history. It seems like originally, there were only gensync and updatesync. Then repo-add and repo-remove were created, doing mostly what gensync and updatesync did. But then, gensync and updatesync were rewritten using repo-add and repo-remove. What this done for a compatibility purpose maybe? Are these two tools still use anywhere? I heard (from Dan ;)) that core/extra used didn't even use the scripts in pacman git repo, but the ones in dbscripts git repo instead. But that community did use repo-add. Do they use repo-add directly, or do they use updatesync? What bothers me here is that there is apparently a functionality that is only found in updatesync/gensync, not repo-add : force flag support. Apparently, updatesync need both the PKGBUILD and the package. It reads the PKGBUILD, look if the force option is specified, and then calls repo-add (with --force option if force flag was found) on the package. That sounds rather ugly. Why don't we handle this the more usual way? makepkg could add a force line in .PKGINFO if it finds the force option in the PKGBUILD. And then repo-add add the force flag if it finds it in .PKGINFO. After that, gensync and updatesync could be totally removed, right?

6 14

[pacman-dev] pamcan don't show the size of invididual package in remove list and 'Total remove size:' in operation -R
by Vojtěch Gondžala 31 Jan '08

31 Jan '08

Hi all, I think something like this: --------- # pacman -Rc amarok-engine-xine loading package data... done. checking dependencies... Targets: amarok-base [28.60 MB] amarok-engine-xine [0.21 MB] Total Removed Size: 28.81 MB Do you want to remove these packages? [Y/n] ---------- and ---------- # pacman -S qca2 resolving dependencies... looking for inter-conflicts... :: qca2 conflicts with qca. Remove qca? [Y/n] Remove: qca [2.94 MB] Total Removed Size: 2.94 MB Targets: qca2-2.0.0-1 [0.66 MB] Total Download Size: 0.00 MB Total Installed Size: 1.92 MB Proceed with installation? [Y/n] ---------- in attachment is patch for this --vogo

3 2

Re: [pacman-dev] pamcan don't show the size of invididual package in remove list and 'Total remove size:' in operation -R
by Vojtěch Gondžala 31 Jan '08

31 Jan '08

> This is already implemented for -S and -Q (see > http://bugs.archlinux.org/task/6667). > Add ShowSize option to pacman.conf. > So this should be just extended to support -R. > > -- > Roman Kyrylych (Роман Кирилич) no wholly in -S, see this line without patch: :: qca2 conflicts with qca. Remove qca? [Y/n] Remove: qca <<<<< Total Removed Size: 2.94 MB with patch: :: qca2 conflicts with qca. Remove qca? [Y/n] Remove: qca [2.94 MB] <<<<< Total Removed Size: 2.94 MB --vogo

2 1