June 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] links problem in bacman
by Carlo Bersani 28 Jul '08

28 Jul '08

I just discovered test -e tries to resolve the link before testing, so if the link is copied before the actual file, the script exits. Here's the simple fix to this bug: --- bacman 2008-06-16 17:42:45.000000000 +0200 +++ bacman.new 2008-06-16 17:52:17.000000000 +0200 @@ -136,7 +136,7 @@ bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - # Workaround to bsdtar not reporting a missing file as an error - if [ ! -e "$work_dir"/"$i" ]; then + if [ ! -e "$work_dir"/"$i" ] && [ ! -L "$work_dir"/"$i" ]; then echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then"

5 14

[pacman-dev] [PATCH] GPG signature support for makepkg:
by geoffroy.carrier＠koon.fr 16 Jul '08

16 Jul '08

From: Geoffroy Carrier <geoffroy.carrier(a)koon.fr> --- This should be the last version I submit here. I should start including support in pacman soon. It will rely directly on the gpg binary, and should work a lot like git. It has a very nice embedded "lib" to launch processes. I might embed parts of it in my pacman branch, as it's generic and seems very well-written. doc/makepkg.conf.5.txt | 3 +++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 113ad14..b6f4385 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -92,6 +92,9 @@ Options previous package must be available in the makepkg cache directory for this to occur. + *sign*;; + Generate a PGP signature file using GnuPG. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 47ed0a4..7d1fbb8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -38,7 +38,7 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta !sign) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user @@ -46,8 +46,9 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation #-- xdelta: Generate delta patch from previous to current package +#-- sign: Generate PGP signature file # -BUILDENV=(fakeroot !distcc color !ccache !xdelta) +BUILDENV=(fakeroot !distcc color !ccache !xdelta !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6e2f1ad..c4d8c2e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -855,6 +855,25 @@ create_package() { fi } +create_signature() { + if [ "$(check_buildenv sign)" != "y" ]; then + return + fi + local ret = 0 + local filename = "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + msg "$(gettext "Signing package...")" + if [ ! $(type -p "gpg") ]; then + error "$(gettext "Cannot find the gpg binary! Is gnupg installed?")" + exit 1 # $E_MISSING_PROGRAM + fi + gpg --detach-sign $filename || ret = $? + if [ $ret -eq 0 ]; then + msg2 "$(gettext "Created signature file %s.")" $filename.sig + else + warning "$(gettext "Failed to sign package file.")" + fi +} + create_xdelta() { if [ "$(check_buildenv xdelta)" != "y" ]; then return @@ -1494,6 +1513,8 @@ fi msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +create_signature + install_package exit 0 #E_OK -- 1.5.5.3

4 5

[pacman-dev] [PATCH] makepkg : switch from getopt to getopts builtin
by Xavier 11 Jul '08

11 Jul '08

>From f5c5a277e2df14650ae441f32950aa6d4deee50f Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed, 28 May 2008 21:57:28 +0200 Subject: [PATCH] makepkg : switch from getopt to getopts builtin getopt is an external script for parsing and is less portable than getopts which is a bash builtin. The main problem is that it only supports short opts, so long opts had to be dropped. The benefits are a much better portability and a simpler code for the arguments parsing. TODO: better testing, fix man page. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/makepkg.sh.in | 143 +++++++++++++++++++++--------------------------- 1 files changed, 63 insertions(+), 80 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..f880091 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, sed +# gettext, grep, gzip, sed # gettext initialization export TEXTDOMAIN='pacman' @@ -1056,31 +1056,31 @@ usage() { printf "$(gettext "Usage: %s [options]")\n" "$0" echo echo "$(gettext "Options:")" - printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT" - echo "$(gettext " -c, --clean Clean up work files after build")" - echo "$(gettext " -C, --cleancache Clean up source files from the cache")" - echo "$(gettext " -d, --nodeps Skip all dependency checks")" - echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" - echo "$(gettext " -f, --force Overwrite existing package")" - echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" - echo "$(gettext " -h, --help This help")" - echo "$(gettext " -i, --install Install package after successful build")" - echo "$(gettext " -L, --log Log package build process")" - echo "$(gettext " -m, --nocolor Disable colorized output messages")" - echo "$(gettext " -o, --nobuild Download and extract files only")" + printf "$(gettext " -A Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT" + echo "$(gettext " -c Clean up work files after build")" + echo "$(gettext " -C Clean up source files from the cache")" + echo "$(gettext " -d Skip all dependency checks")" + echo "$(gettext " -e Do not extract source files (use existing src/ dir)")" + echo "$(gettext " -f Overwrite existing package")" + echo "$(gettext " -g Generate integrity checks for source files")" + echo "$(gettext " -h This help")" + echo "$(gettext " -i Install package after successful build")" + echo "$(gettext " -L Log package build process")" + echo "$(gettext " -m Disable colorized output messages")" + echo "$(gettext " -o Download and extract files only")" printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" - echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" + echo "$(gettext " -r Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" - echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" - echo "$(gettext " --asroot Allow makepkg to run as root user")" - echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" - echo "$(gettext " --source Do not build package; generate a source-only tarball")" + echo "$(gettext " -R Repackage contents of pkg/ without building")" + echo "$(gettext " -s Install missing dependencies with pacman")" + echo "$(gettext " -O Allow makepkg to run as root user")" + echo "$(gettext " -H Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " -S Do not build package; generate a source-only tarball")" echo echo "$(gettext "These options can be passed to pacman:")" echo - echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" - echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" + echo "$(gettext " -n Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " -N Do not show a progress bar when downloading files")" echo printf "$(gettext "If -p is not specified, makepkg will look for '%s'")\n" "$BUILDSCRIPT" echo @@ -1130,66 +1130,49 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsSV" -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" -# Pacman Options -OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" -if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then - # This is a small hack to stop the script bailing with 'set -e' - echo; usage; exit 1 # E_INVALID_OPTION; -fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +OPT_SHORT="AcCdefF:ghHiLmnNoOp:rRsSVX" -while true; do - case "$1" in +while getopts "$OPT_SHORT" name; do + case $name in # Pacman Options - --noconfirm) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; - --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; + n) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; + N) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # Makepkg Options - --asroot) ASROOT=1 ;; - -A|--ignorearch) IGNOREARCH=1 ;; - -c|--clean) CLEANUP=1 ;; - -C|--cleancache) CLEANCACHE=1 ;; - -d|--nodeps) NODEPS=1 ;; - -e|--noextract) NOEXTRACT=1 ;; - -f|--force) FORCE=1 ;; - #hidden opt used by fakeroot call for svn/cvs/etc PKGBUILDs to set pkgver - --forcever) shift; FORCE_VER=$1;; - -F) INFAKEROOT=1 ;; - -g|--geninteg) GENINTEG=1 ;; - --holdver) HOLDVER=1 ;; - -i|--install) INSTALL=1 ;; - -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n' ;; - -o|--nobuild) NOBUILD=1 ;; - -p) shift; BUILDSCRIPT=$1 ;; - -r|--rmdeps) RMDEPS=1 ;; - -R|--repackage) REPKG=1 ;; - --source) SOURCEONLY=1 ;; - -s|--syncdeps) DEP_BIN=1 ;; - - # BEGIN DEPRECATED - -S|--usesudo) - warning "$(gettext "Sudo is used by default now. The --usesudo option is deprecated!")" ;; - # END DEPRECATED - - -h|--help) usage; exit 0 ;; # E_OK - -V|--version) version; exit 0 ;; # E_OK - - --) OPT_IND=0; shift; break;; - *) usage; exit 1 ;; # E_INVALID_OPTION + A) IGNOREARCH=1 ;; + c) CLEANUP=1 ;; + C) CLEANCACHE=1 ;; + d) NODEPS=1 ;; + e) NOEXTRACT=1 ;; + f) FORCE=1 ;; + # hidden opt used by fakeroot call for svn/cvs/etc PKGBUILDs to set pkgver + F) FORCE_VER="$OPTARG";; + g) GENINTEG=1 ;; + H) HOLDVER=1 ;; + i) INSTALL=1 ;; + L) LOGGING=1 ;; + m) USE_COLOR='n' ;; + o) NOBUILD=1 ;; + O) ASROOT=1 ;; + p) BUILDSCRIPT="$OPTARG" ;; + r) RMDEPS=1 ;; + R) REPKG=1 ;; + s) DEP_BIN=1 ;; + S) SOURCEONLY=1 ;; + # hidden opt to indicate fakeroot call + X) INFAKEROOT=1 ;; + + h) usage; exit 0 ;; # E_OK + V) version; exit 0 ;; # E_OK + + ?) usage; exit 1 ;; # E_INVALID_OPTION esac - shift done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then - # The extra '--' is here to prevent gettext from thinking --holdver is + # The extra '--' is here to prevent gettext from thinking -H is # an option - error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" + error "$(gettext "\\0-H and -F cannot both be specified" )" exit 1 fi @@ -1233,12 +1216,12 @@ if [ "$INFAKEROOT" = "0" ]; then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" - plain "$(gettext "wish to run as root, please use the --asroot option.")" + plain "$(gettext "wish to run as root, please use the -O option.")" exit 1 # $E_USER_ABORT elif [ $EUID -gt 0 -a "$ASROOT" = "1" ]; then - # Warn those who try to use the --asroot option when they are not root - error "$(gettext "The --asroot option is meant for the root user only.")" - plain "$(gettext "Please rerun makepkg without the --asroot flag.")" + # Warn those who try to use the -O option when they are not root + error "$(gettext "The -O option is meant for the root user only.")" + plain "$(gettext "Please rerun makepkg without the -O flag.")" exit 1 # $E_USER_ABORT elif [ "$(check_buildenv fakeroot)" = "y" -a $EUID -gt 0 ]; then if [ ! $(type -p fakeroot) ]; then @@ -1254,7 +1237,7 @@ if [ "$INFAKEROOT" = "0" ]; then fi else if [ "$FAKEROOTKEY" = "" ]; then - error "$(gettext "Do not use the '-F' option. This option is only for use by makepkg.")" + error "$(gettext "Do not use the '-X' option. This option is only for use by makepkg.")" exit 1 # TODO: error code fi fi @@ -1333,7 +1316,7 @@ if [ "$install" -a ! -f "$install" ]; then fi # We need to run devel_update regardless of whether we are in the fakeroot -# build process so that if the user runs makepkg --forcever manually, we +# build process so that if the user runs makepkg -F (forcever) manually, we # 1) output the correct pkgver, and 2) use the correct filename when # checking if the package file already exists - fixes FS #9194 devel_check @@ -1469,9 +1452,9 @@ else msg "$(gettext "Entering fakeroot environment...")" if [ "$newpkgver" != "" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 -F $newpkgver -X $ARGLIST || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -X $ARGLIST || exit $? fi fi -- 1.5.5.1

6 15

[pacman-dev] vercmp behavior changed on "1.5b versus 1.5" compare
by Nagy Gabor 07 Jul '08

07 Jul '08

Hi! I hope this wasn't discussed here earlier, I haven't followed this thread lately. I think I said everything in subject, the old vercmp said that 1.5b<1.5, the new one says 1.5b>1.5. The same for 1.5b versus 1.5. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

4 7

[pacman-dev] Pending 3.2 release thread
by Dan McGee 03 Jul '08

03 Jul '08

This thread is meant for discussion about the upcoming 3.2 release which I would like to do in the next two to three weeks. It has been a while since a major release and I think we should get one out the door. At this point I think we can say there should be no large-scale feature addition before the release, and I would encourage you to heavily use and test the current master git branch on your system to ensure we aren't letting anything slip by we shouldn't. I updated pacman-git tonight in my repository for i686. I will try to get an x86_64 build updated sometime as well. Nagy has mentioned that FS#8905 should get looked at before the release, and I tend to agree, although I am not sure how to proceed with this. Please let me know what you guys think, and if we have any pending patches outstanding to fix this issue please resubmit. If you feel an outstanding bug should be a blocker, speak now or never. We will need one week for translation requests and updates to be submitted, so we can continue to do some small-scale fixes at that point if they don't affect strings. On-topic thoughts/comments/questions are welcome. -Dan

4 5

[pacman-dev] repo-add error in BSD
by Antonio Huete Jimenez 01 Jul '08

01 Jul '08

repo-add uses readlink -f in linux to find out file's real path. readlink is part of coreutils. I've found that readlink in BSD don't support -f option so we need to use realpath instead. Attached you can find a mini-patch. Cheers, Antonio Huete

5 14

[pacman-dev] Alternative to autotools: waf?
by Sebastian Nowicki 30 Jun '08

30 Jun '08

Hi, I have been looking for a nice build system, for personal, for quite some time now. I saw waf at one point and thought it might be a good system, but I never paid much attention to it. Recently I again started looking into it and I decided to use pacman to test out how good it is. In comparison to autotools, the language (python) is a lot simpler and easier to understand, although it still took a while to understand waf. The size of the configuration script is significantly smaller (see statistics below). The waf website also claims that it is faster than autotools, I believe it is, but I did not actually benchmark anything. So far I've managed to get libalpm to compile (shared library only), and pacman shouldn't be too hard since most of the stuff is already there. The script is far from being finished, I simply wanted to see how difficult it was to get something compiled, while linking against external libraries. I just wanted to see if anyone was interested in actually using waf as the build system for pacman. If not, I'm not sure that I'll be bothering with compiling pacman, since I only really need libalpm. Not sure if all these files are created by people, but even configure.ac alone is larger; > $ wc -l configure.ac Makefile.am config.* acinclude.m4 > 404 configure.ac > 29 Makefile.am > 1526 config.guess > 614 config.rpath > 1658 config.sub > 4952 acinclude.m4 > 9183 total > > $ wc -l wscript > 143 wscript Note: The build script has only been tested on Mac OS X, and thus I don't know if it links properly against libdownload. From wscript: > VERSION = '3.1.4' > APPNAME = 'pacman' > LIB_VERSION = '2.3.1' > LIB_NAME = 'libalpm' > > srcdir = '.' > blddir = 'build' > > def set_options(opt): > opt.tool_options('compiler_cc') > # TODO: Optparse on Mac OSX Leopard seems outdated, this doesn't > work there > # opt.set_defaults( > # root_dir='/', > # pkg_ext='.pkg.tar.gz', > # src_ext='.src.tar.gz', > # db_ext='.db.tar.gz', > # use_internal_download=True, > # want_doc=False, > # want_doxygen=False, > # want_asciidoc=False, > # want_debug=False, > # want_gitver=False, > # pacman_static=True > # ) > > opt.add_option('--with-root-dir', dest='root_dir', > help='set the location of pacman\'s root operating directory [/]', > default='/') > opt.add_option('--with-pkg-ext', dest='pkg_ext', > help='set the file extension used by packages [pkg.tar.gz]', > default='pkg.tar.gz') > opt.add_option('--with-src-ext', dest='src_ext', > help='set the file extension used by source packages > [src.tar.gz]', default='src.tar.gz') > opt.add_option('--with-db-ext', dest='db_ext', > help='set the file extension used by the database [db.tar.gz]', > default='db.tar.gz') > # opt.add_option('--disable-internal-download', type='store_false', > # dest='use_internal_download', > # help='do not build with libdownload/libfetch support') > # opt.add_option('--disable-doc', type='store_false', > # dest='want_doc', > # help='do not generate documentation') > # opt.add_option('--enable-doxygen', dest='want_doxygen', > type='store_true', > # help='build your own API docs via Doxygen') > # opt.add_option('--enable-asciidoc', dest='want_asciidoc', > type='store_true', > # help='build your own manpages with Asciidoc') > # opt.add_option('--enable-debug', dest='want_debug', > type='store_true', > # help='enable debugging support') > pass > > def configure(conf): > import Params > > def conf_check_function(name, mandatory=1, headers=[], > header_code='', define=''): > functest = conf.create_function_enumerator() > functest.mandatory = mandatory > functest.function = name > if headers: > functest.headers = headers > if not define: > define='HAVE_' + name.upper() > if header_code: > functest.header_code = header_code > functest.define = define > functest.run() > > conf.check_tool('compiler_cc checks') > > headers = [ > 'fcntl.h', > 'libintl.h', > 'limits.h', > 'locale.h', > 'string.h', > 'strings.h', > 'sys/ioctl.h', > 'sys/param.h', > 'sys/statvfs.h', > 'sys/syslimits.h', > 'sys/time.h', > 'syslog.h', > 'wchar.h', > ] > > for header in headers: > headerconf = conf.create_header_configurator() > headerconf.name = header > headerconf.mandatory = 1 > headerconf.message = header + ' is required.' > headerconf.run() > > conf_check_function('geteuid', 1, ['unistd.h']) > conf_check_function('realpath', 1, ['stdlib.h']) > conf_check_function('regcomp', 1, ['regex.h']) > conf_check_function('strcasecmp', 1, ['string.h']) > #conf_check_function('strndup', 1, ['string.h'], > header_code='#define _GNU_SOURCE') #TODO: FIX > conf_check_function('strrchr', 1, ['string.h']) > conf_check_function('strsep', 1, ['string.h']) > #conf_check_function('strverscmp', 1, ['string.h'], > header_code='#define _GNU_SOURCE') > conf_check_function('swprintf', 1, ['stdio.h', 'wchar.h']) > conf_check_function('wcwidth', 1, ['wchar.h']) > conf_check_function('uname', 1, ['sys/utsname.h']) > conf_check_function('archive_read_data', 1, ['archive.h'], > define='HAVE_LIBARCHIVE') > conf_check_function('downloadParseURL', 0, ['download.h'], > define='HAVE_LIBDOWNLOAD') > conf_check_function('fetchParseURL', 0, ['sys/param.h', 'stdio.h', > 'fetch.h'], define='HAVE_LIBFETCH') > if conf.env['HAVE_LIBDOWNLOAD'] != 1 and conf.env['HAVE_LIBFETCH'] ! > = 1: > #TODO: Print error > #fatal('libdownload or libfetch are needed to compile with > internal download support') > return > > conf.env['LIB_ARCHIVE'] = 'archive' > conf.env['LIB_DOWNLOAD'] = 'download' > conf.env['LIB_FETCH'] = 'fetch' > > conf.define('PACKAGE', APPNAME) > conf.define('PACKAGE_VERSION', VERSION) > conf.define('LIB_VERSION', LIB_VERSION) > conf.define('ROOTDIR', Params.g_options.root_dir) > conf.define('DBEXT', Params.g_options.db_ext) > conf.define('PKGEXT', Params.g_options.pkg_ext) > conf.define('DBPATH', '/usr/lib/pacman/') > conf.define('LOGFILE', '/usr/log/pacman.log') > conf.define('CACHEDIR', '/var/cache/pacman/pkg/') > conf.define('CONFFILE', '/etc/pacman.conf') #TODO: make path > configurable > conf.define('RETSIGTYPE', 'int') #TODO: Fix? (AC_TYPE_SIGNAL > replacement) > #conf.define('HAVE_CONFIG_H', 1) # autotools compatibility > > conf.write_config_header('config.h') > > def build(build): > import Constants > env = build.env() > libalpm = build.create_obj('cc', 'shlib') > libalpm.name = LIB_NAME > libalpm.target = 'alpm' # waf prepends 'lib' (why?) > libalpm.uselib = 'ARCHIVE' > if env['HAVE_LIBDOWNLOAD'] != Constants.UNDEFINED: > libalpm.uselib += ' DOWNLOAD' > elif env['HAVE_LIBFETCH'] != Constants.UNDEFINED: > libalpm.uselib += ' FETCH' > libalpm.find_sources_in_dirs('lib/libalpm', exts=['.c']) > > # pacman = build.create_obj('cc', 'program') > # pacman.name = 'pacman' > # pacman.target = 'pacman' > # pacman.uselib = 'libalpm' > # pacman.find_sources_in_dirs('src/pacman', exts=['.c'])

1 0

[pacman-dev] pac-file utility script
by pete morris 29 Jun '08

29 Jun '08

Hi all, First a quick introduction, since this is my first message to the list. I am a CS grad student at James Madison University in Harrisonburg, VA, and I also do IT work for JMU's art department. I've been using arch for around 2.5 years now. Anyway, I've written a script that takes advantage of the [repo].files.tar.gz filelists that are now available to discover which package provides a particular file, when that package is not installed on the user's machine. It is similar to debian's apt-file, if you are familiar with that. I would appreciate any comments on the script, with an eye toward possible inclusion in Allan's pacman-contrib community package. The script uses the mirrors defined in the user's /etc/pacman.d/mirrorlist and downloads the filelists for the repos enabled in /etc/pacman.conf. It is available from http://threadstates.com/downloads/pac-file. The only major issue I can see is in the handling of non-standard repos, including local ones. The repo names are obtained from pacman.conf's "[repo]" lines, and the name of the repo is substituted for $repo in the mirror url from the mirrorlist. If a local repo (for example) is defined in pacman.conf as "[local]", on a 'sync' operation, pac-file will attempt to download local.files.tar.gz from every mirror enabled in the mirrorlist. This will not cause the script to fail (it will report that the file is unavailable from any mirror and continue on), but it will waste time. I am hesitant to limit the possible repos to the official ones because there might be third party repos that provides filelists. Suggestions? Thanks, Pete

5 5

[pacman-dev] [PATCH] Remove symlinks to libtool files
by Allan McRae 27 Jun '08

27 Jun '08

This prevents dangling symlinks to removed libtool files when the !libtool option is used. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..7f51065 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -751,7 +751,7 @@ tidy_install() { if [ "$(check_option libtool)" = "n" ]; then msg2 "$(gettext "Removing libtool .la files...")" - find . -type f -name "*.la" -exec rm -f -- '{}' \; + find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi if [ "$(check_option emptydirs)" = "n" ]; then -- 1.5.6

1 0