December 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] 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] 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] makepkg patch - simple pkg class feature
by K. Piche 17 Jan '08

17 Jan '08

Hi, I hope everyone had a great holiday! Perl module PKGBUILDs tend to be a mess and some build() functions are not "standard". Now with the new upcoming perl policy all of the PKGBUILDs need to be "standardized" again. To help combat this problem I hacked up a package class feature where all the functions and package defaults are set in a class file and sourced before the package is built. The class file can define a set of build functions to call instead of just build(). Some advantages: - standardization of package types, even AUR packages could be uniform - code in makepkg could be moved to a class so that it could easily be override by people doing non-standard things: no man pages, i585 ports - anything set in the PKGBUILD takes precedence over the class - defined build functions can be optional (see the sample perl class) The patch is backwards compatible with non-class PKGBUILDs and I have been using my classy makepkg for 5 days. Attached is the patch, a perl class, and sample PKGBUILD for Sys::Syslog. Right now the class file has to be in the same directory as the PKGBUILD. Happy New Year! k -- K. Piche <kpiche(a)rogers.com>

5 11

[pacman-dev] PKGBUILD and install file drafts for release
by Dan McGee 10 Jan '08

10 Jan '08

Attached. I'd appreciate people looking them over and offering comments and/or fixes. -Dan

6 14

[pacman-dev] Bug in pactest suite
by Nagy Gabor 29 Dec '07

29 Dec '07

Hi! I noticed, that with fileconflict*.py the .FILELISTs of generated packages isn't generated correctly: the symlinks are missing. So we can ignore the results of these pactests now. Bye

4 6

[pacman-dev] another case when pacman is asking for confirmation when it should not
by Karolina Lindqvist 29 Dec '07

29 Dec '07

There is another case where pacman-git asks for confirmation, when it should not. It is when removing packages. If running with makeworld --noconfirm --rmdeps the question will come to the log file, and never appear on the console, so you can wait forever wondering what is happening. *** src/pacman/remove.c~ Tue Dec 11 05:06:48 2007 --- src/pacman/remove.c Sun Dec 16 20:34:12 2007 *************** *** 155,161 **** list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ ! if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { remove_cleanup(); FREELIST(finaltargs); return(1); --- 155,161 ---- list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ ! if(!config->noconfirm && yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { remove_cleanup(); FREELIST(finaltargs); return(1);

3 2

[pacman-dev] alpm_pkg_checkmd5sum
by Allan McRae 29 Dec '07

29 Dec '07

Hi, I was looking at FS#7155 (http://bugs.archlinux.org/task/7155) which I believe to be fixed now but during then I notice some left overs from what appears to be a rewrite of the md5sum checking. In the bug report, it was asking for more information than "error: failed to commit transaction (invalid or corrupted package)". Trying to look at this I noticed that the "invalid of corrupted package" part can only generated by alpm_pkg_checkmd5sum() which is not used anywhere. The "error: failed to commit transaction" part is generated by sync_trans() if alpm_trans_commit() fails which in this case can be followed through to test_md5sum() failing. So it looks like md5sum checking was overhauled at some stage. So my question is: Is alpm_pkg_checkmd5sum() a leftover of the past and need removing? Cheers, Allan

4 3

[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