- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Don't duplicate packages in requiredby list
by Nagy Gabor 01 Jul '08

01 Jul '08

From 0320ac5dabb67813dfe64fddf31a371ec8934126 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 1 Jul 2008 21:06:32 +0200 Subject: [PATCH] Don't duplicate packages in requiredby list This is a "fix" for FS#10226. I think that multiple versioned dependencies are quite common now, and the old behavior is quite annoying there. This patch won't cause any slow-down (but 1 ns speed-up instead;-) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/package.c | 5 ++--- pactest/vercmptest.sh | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 3708a58..79cc64e 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -537,9 +537,7 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg) * @brief Compute the packages requiring a given package. * @param pkg a package * @return the list of packages requiring pkg - * - * A depends on B through n depends <=> A listed in B's requiredby n times - * n == 0 or 1 in almost all cases */ + */ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) { const alpm_list_t *i, *j; @@ -560,6 +558,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n", cachepkgname, pkg->name); reqs = alpm_list_add(reqs, strdup(cachepkgname)); + break; } } } -- 1.5.6.1

1 0

[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

[pacman-dev] Dangling symlink to libtool file - Was: Re: [arch-dev-public] signoff: xfsprogs 2.9.8-1 for i686
by Allan McRae 27 Jun '08

27 Jun '08

Eric Belanger wrote: > > Although the '!libtool' option is used, there is a libtool file in the > package: lib/libhandle.la > I'm guessing that makepkg doesn't search /lib for libtool files so it > needs to be manually removed. Of course, I assume that it's not needed. > That is actually a dangling symlink to the actual libtool file which was removed. Sending to pacman-dev so this can be fixed. Allan

2 5

Re: [pacman-dev] pac-file utility script
by pete morris 26 Jun '08

26 Jun '08

On Thu Jun 26, 2008 at 10:07AM, Allan McRae wrote: > Hi Pete, > > Can you post the script inline so it would be easier for us to comment > on. Sure, see below: #!/bin/bash #----------------------------------------------------------- # A utility for discovering which ArchLinux package contains # a given file. Downloads filelists for all active repos in # pacman.conf; uses mirrors in order according to pacman's # mirrorlist file. # # Peter Morris 2008 #----------------------------------------------------------- db=/var/lib/pacman/filelists pacmanconf=/etc/pacman.conf mirrorlist=/etc/pacman.d/mirrorlist #----------------------------------------------------------- # Print active repos in $pacmanconf. #----------------------------------------------------------- function list_repos() { sed -n '/REPOSITORIES/,$ s/^\[$.*$\]/\1/p' $pacmanconf } #----------------------------------------------------------- # Print active mirrors in $mirrorlist. #----------------------------------------------------------- function list_mirrors() { sed -n 's/^Server = $.*$$/\1/p' $mirrorlist } #----------------------------------------------------------- # Download the filelist for repo $1. Assumes $mirrors # is an array of urls to check for $file. #----------------------------------------------------------- function download() { repo=$1 file="${repo}.files.tar.gz" i=0 while [[ ! -e "${db}/${file}" ]]; do if (( $i >= ${#mirrors[@]} )); then return 1 fi url=$(echo "${mirrors[$i]}" | sed "s/\$repo/$repo/g") wget --connect-timeout=15 -P "$db" "${url}/${file}" let i+=1 done } #----------------------------------------------------------- # Decompress $1 into dir $2. #----------------------------------------------------------- function decompress() { file=$1 repo=$2 mkdir "${db}/${repo}" tar -xzf "${db}/${file}" -C "${db}/${repo}" rm -f "${db}/${file}" } #----------------------------------------------------------- # Download the filelist for each active repo in # pacman.conf. Tries mirrors in order until successful. #----------------------------------------------------------- function sync() { mirrors=($(list_mirrors)) for repo in $(list_repos); do echo "Fetching filelist for $repo" download "$repo" if [[ $? == 0 ]]; then decompress "$file" "$repo" else echo echo "Error: unable to retrieve $file from any mirror." echo fi done } #----------------------------------------------------------- # Print usage message. #----------------------------------------------------------- function usage() { echo "usage: $(basename $0) [options] [pattern]" echo echo "Search package filelists for [pattern]." echo "options:" echo " $(basename $0) [-h --help] Print this help message." echo " $(basename $0) [-S --sync] Syncronize package filelists." } #----------------------------------------------------------- # Start of `main'. #----------------------------------------------------------- case "$1" in -S|--sync) if [[ $EUID != 0 ]]; then echo "error: you cannot perform this operation unless you are root." exit 1; fi echo "Syncronizing ${db}..."; echo rm -rf "$db" && mkdir -p "$db" sync ;; -h|--help) usage ;; *) if [[ $# < 1 ]]; then echo "not enough parameters"; echo usage exit 1 fi if [[ ! -d "$db" ]]; then echo "File database \"$db\" does not exist!" echo "Have you synchronized the database?" echo exit 1 fi grep -rE "$@" "$db" | sed "s|$db/$.*$/files:|\1 |g" ;; esac

1 0

[pacman-dev] pactest coverage
by Allan McRae 23 Jun '08

23 Jun '08

Hi all, I "discovered" gcov so was testing out the coverage of the pactests. During searching for more info about gcov I saw Dan already had written something on it (http://toofishes.net/blog/using-gcov-code-coverage-testing/) so not as novel as I thought... Anyway, as an FYI, here is a list of functions/important sections of the code that are not covered by pactests. libalpm/add.c 372-375: case 11 - symlink in package to existing dir 386-389: dir in package, symlink to non-dir in filesystem 393-396: case 10 - trying to overwrite dir tree with file, don't allow it 399: case 6 - trying to overwrite file with dir libalpm/package.c changelog functions libalpm/remove.c 191-192: -Rcs libalpm/sync.c 290-300: _alpm_sync_addtarget() - adding target from given repo pacman/package.c dump_pkg_backups() dump_pkg_files() dump_pkg_changelog() pacman/query.c resolve_path() query_fileowner() query_group() query_upgrades() is_foreign() is_unrequired() pacman/sync.c sync_cleandb() sync_cleandb_all() sync_cleancache() sync_group() pacman/upgrade.c pacman_upgrade() - URL targets pacman/util.c needs_transaction() makepath() rmrf() mdirname() strtoupper() pm_vasprintf() and everything to do with deltas... We really should have coverage for the sections in libalpm/add.c so I am writing pactests for those now. It would be easy to add one for -Rcs and changelogs as well so that will give fairly complete coverage of libalpm. Allan

2 1

[pacman-dev] [PATCH] Additional path quoting and srcdir/pkgdir usage
by Allan McRae 23 Jun '08

23 Jun '08

Removes the remaining $startdir/{src,pkg} usage and adds quoting around (hopefully) all remaining path variables Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..4fa6945 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -148,8 +148,7 @@ clean_up() { if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" - cd "$startdir" - rm -rf pkg src + rm -rf "$pkgdir" "$srcdir" if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" @@ -510,7 +509,7 @@ generate_checksums() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -557,7 +556,7 @@ check_checksums() { errors=1 continue else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -598,7 +597,7 @@ extract_sources() { plain "$(gettext "Aborting...")" exit 1 else - file=$SRCDEST/$file + file="$SRCDEST/$file" fi fi @@ -960,7 +959,7 @@ create_srcpackage() { local file=$(strip_url "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s $netfile ${srclinks}/${pkgname} + ln -s $netfile "${srclinks}/${pkgname}" elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" @@ -971,13 +970,13 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" - cd ${srclinks} + cd "${srclinks}" if ! bsdtar -czLf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi - cd ${startdir} - rm -rf ${srclinks} + cd "${startdir}" + rm -rf "${srclinks}" } install_package() { -- 1.5.6

2 1

[pacman-dev] [PATCH] Add information on version comparison to manpages
by Dan McGee 20 Jun '08

20 Jun '08

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 3 ++- doc/pacman.8.txt | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index b90d67a..0b1ce64 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -214,7 +214,8 @@ similar to `$_basekernver`. Force the package to be upgraded by a pacman system upgrade operation, even if the version number would normally not trigger such an upgrade. This is useful when the version numbering scheme - of a package changes (or is alphanumeric). + of a package changes (or is alphanumeric). See linkman:pacman[8] for + more infomation on version comparisons. build() Function diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 5594ac6..08764de 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -61,7 +61,13 @@ provide the same functionality as foo will be searched for. If any package is found, it will be installed. + You can also use `pacman -Su` to upgrade all packages that are out of date. See -<<SO,Sync Options>> below. +<<SO,Sync Options>> below. When upgrading, pacman performs version comparison +to determine which packages need upgrading. This behavior operates as follows: + + Alphanumeric: + 1.0 < 1.0a < 1.0alpha < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc + Numeric: + 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 *-U, \--upgrade*:: Upgrade or add a package to the system. Either a URL or file path can be -- 1.5.6

5 10