February 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] pacman-contrib package
by Allan McRae 27 May '08

27 May '08

Hi everyone, With the release of pacman 3.1.2 I was reminded to get around to putting a pacman-contrib package into AUR/community like I said I would [1]. I have categorized the files in the contrib directory below. Utilities: pacdiff pacsearch re-pacman (needs some updates? [2]) wget-xdelta.sh vim: PKGBUILD.vim vimproject (needs updated - developer use only) Included in pacman package: bash_completion zsh_completion Old: gensync updatesync I think the pacman-contib package should only include pacdiff, pacserach, re-pacman, PKGBUILD.vim. I did a very quick review of the files to check if they still work with the current pacman. As far as I can tell pacdiff and pacsearch don't need updated. I will look into updating re-pacman as I don't see any commits to this file since [2]. No idea about the status with PKGBUILD.vim - I don't use vim for PKGBUILDs so can someone else comment here. Any comments on the status of these scripts or list of scripts to be included? Thanks, Allan [1] http://www.archlinux.org/pipermail/pacman-dev/2008-February/011076.html [2] http://www.archlinux.org/pipermail/pacman-dev/2008-January/010788.html

6 15

[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] -Sc and shared cache
by Xavier 12 Mar '08

12 Mar '08

This was already discussed here : http://www.archlinux.org/pipermail/pacman-dev/2008-January/010940.html And then more recently in bbs : http://bbs.archlinux.org/viewtopic.php?id=43809 The guy there started to write a little script on his own, and that made me realize that the behavior he wanted is actually pretty close to the current -Sc code. Only a small part needs to be changed, most of the code can be re-used. But instead of only keeping the packages which are in the local database, we would keep the packages which are in a sync database. http://bbs.archlinux.org/viewtopic.php?pid=330487#p330487 So I hacked a patch together. It's not really usable yet, because it's not configurable , only the second behavior will be used. It's only a proof of concept for now. (and anyway, it only prints the package that it wants to remove, it doesn't actually remove them, for testing purpose) I just wanted to know what others think about proposing two different behaviors for -Sc, and how the user could choose between both (maybe an additional flag, but which?).

6 19

[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] New --nonew option
by Nagy Gabor 11 Mar '08

11 Mar '08

See the attachment for patch. Other recommendations for option name and English language fixes are welcome :-P ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

6 21

[pacman-dev] Suggestion for a QUIET arg to makepkg
by Mark Constable 09 Mar '08

09 Mar '08

When it comes to using makepkg from a wrapper script, to build a series of packages, it would be good if there was an option to send logging to a file and not to STDOUT at the same time. This is just a suggestion and an example of one place where I need to patch my local makepkg. Perhaps this could be generalised via a VERBOSE arg instead where, for instance, VERBOSE=9 could be noisier than VERBOSE=1 (rather than just an on/off toggle). --markc --- /usr/bin/makepkg.orig 2008-02-21 01:52:39.000000000 +1000 +++ /usr/bin/makepkg 2008-02-21 02:04:31.000000000 +1000 @@ -58,6 +58,7 @@ SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 +QUIET=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. @@ -689,8 +690,11 @@ done mv "$BUILDLOG" "$BUILDLOG.$i" fi - - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + if [ "$QUIET" = "1" ]; then + build > "$BUILDLOG" 2>&1; ret=${PIPESTATUS[0]} + else + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + fi else build 2>&1 || ret=$? fi @@ -1069,6 +1073,7 @@ echo "$(gettext " -m, --nocolor Disable colorized output messages")" echo "$(gettext " -o, --nobuild Download and extract files only")" printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" + echo "$(gettext " -q, --quiet Less verbose output to STDOUT")" echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" @@ -1121,9 +1126,9 @@ SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsSV" +OPT_SHORT="AbcCdefFghiLmop:qrRsSV" OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,quiet,rmdeps,repackage,source,syncdeps,usesudo,version" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" @@ -1159,6 +1164,7 @@ -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDSCRIPT=$1 ;; + -q|--quiet) QUIET=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --source) SOURCEONLY=1 ;;

2 1

[pacman-dev] Add delta creation to repo-add.
by Nathan Jones 04 Mar '08

04 Mar '08

For the first patch, I added the -n flag to gzip in order to prevent the md5sum problem. The apply-delta script is not as efficient as it could be. There is an extra gunzip+gzip step that could be avoided if we create a delta on the .tar rather than the .tar.gz. Doing so would complicate makepkg a bit, so I stuck with the extra step. For the second patch, I created a second function, create_xdelta_latest, which creates a delta for the latest package with a given package name. I did this because otherwise a delta would be created for every package given on the command line which is annoying for me because I use *.pkg.tar.gz. Problems: * gzip upgrade could produce different md5sums - could have had the problem before if a zlib upgrade did the same thing * all delta files that currently exist will not work (probably not a problem)

2 5

[pacman-dev] [PATCH] makepkg: Support for resuming source downloads
by Roman Kyrylych 04 Mar '08

04 Mar '08

Hi! The inability of makepkg to resume broken source downloads annoyed me pretty much, so here's a patch attached. ;-) Before applying the patch: $ makepkg -o ==> Making package: audacious-itouch-control 0.1.1-2 (неділя, 10 лютого 2008 17:23:53 +0200) ==> Retrieving Sources... -> Downloading itouch-control-0.1.1.tar.gz... [ . . . skipped . . . ] 13% [====> ] 44 560 24,7K/s ==> ERROR: Aborted by user! Exiting... [roman@home audacious-itouch-control]$ makepkg -o ==> Making package: audacious-itouch-control 0.1.1-2 (неділя, 10 лютого 2008 17:24:04 +0200) ==> Retrieving Sources... -> Using cached copy of itouch-control-0.1.1.tar.gz ==> Validating source files with md5sums... itouch-control-0.1.1.tar.gz ... FAILED ==> ERROR: One or more files did not pass the validity check! This is because makepkg doesn't know if file is complete, or not. But pacman is able to resume downloads. This inspired me to do a very similar implementation in makepkg. After applying the patch: [roman@home audacious-itouch-control]$ makepkg -o ==> Making package: audacious-itouch-control 0.1.1-2 (неділя, 10 лютого 2008 17:28:22 +0200) ==> Retrieving Sources... -> Downloading itouch-control-0.1.1.tar.gz... [ . . . skipped . . . ] 12% [====> ] 41 672 24,2K/s ==> ERROR: Aborted by user! Exiting... [roman@home audacious-itouch-control]$ makepkg -o ==> Making package: audacious-itouch-control 0.1.1-2 (неділя, 10 лютого 2008 19:04:24 +0200) ==> Retrieving Sources... -> Downloading itouch-control-0.1.1.tar.gz... [ . . . skipped . . . ] 80% [+++++++========================> ] 259 593 --.-K/s in 16m 40s 2008-02-10 19:21:07 (197 B/s) - Read error at byte 259593/323774 (Connection timed out). Продовження спроб. --2008-02-10 19:21:08-- (спроба: 2) [ . . . skipped . . . ] 100%[++++++++++++++++++++++++++++++++=======>] 323 774 18,1K/s in 3,5s 2008-02-10 19:21:12 (18,1 KB/s) - `itouch-control-0.1.1.tar.gz.part' saved [323774/323774] ==> Validating source files with md5sums... itouch-control-0.1.1.tar.gz ... Passed ==> Extracting Sources... -> bsdtar -x -f itouch-control-0.1.1.tar.gz ==> Sources are ready. The patch also includes changes to man makepkg.conf, and makepkg.conf itself, because of introduced %o and %u pseudo-variables (same as in XferCommand). -- Roman Kyrylych (Роман Кирилич)

5 14