- Pacman-dev - lists.archlinux.org

[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

Re: [pacman-dev] [PATCH] Modify bacman to use .pkg.tar.gz suffix
by Carlo Bersani 02 Jul '08

02 Jul '08

We take the extension of the target package from makepkg.conf Hope this works, thank you all for the git cheat sheet Signed-off-by: Carlo Bersani <carlocci(a)gmail.com> --- contrib/bacman | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index 410482f..063fdd7 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -88,6 +88,7 @@ fi pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} +pkg_ext=${PKGEXT:-'.pkg.tar.gz'} pkg_name="$1" pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" @@ -265,7 +266,7 @@ chmod 644 $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null echo "Generating the package..." ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$? if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" @@ -279,4 +280,4 @@ echo Done exit 0 -# vim: set ts=2 sw=2 noet: \ No newline at end of file +# vim: set ts=2 sw=2 noet: -- 1.5.6.1

1 0

[pacman-dev] Status of _alpm_find_first_satisfier?
by Nagy Gabor 02 Jul '08

02 Jul '08

Hi! I would like to ask you about this patch: http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commit;h=aae0… * I'd like to refactor resolvedeps, and this function would be useful there. (I think *list param can be input/output list of resolvedeps like in recursedeps (and kill syncpkg param), and "find_literal" "find_othersatisfier" parts can be moved to its own function and used by front-end too...) * Xavier says that this patch "Address two concerns". One of them is the memleak caused by current _alpm_find_dep_satisfiers usage (which returns with a list, but we don't free it), which needs to be fixed even if this patch will be rejected. I think that _alpm_find_first_satisfier implementation is a bit complicated... I would prefer just ~reimplement _alpm_find_dep_satisfiers instead of calling it (and introducing a new "wrapper"). Bye

2 5

[pacman-dev] [PATCH] Modify bacman to use .pkg.tar.gz suffix
by Nagy Gabor 02 Jul '08

02 Jul '08

From a566684aeab88d9e983c5a57ee7c7ecbf775e478 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 1 Jul 2008 18:39:04 +0200 Subject: [PATCH] Modify bacman to use .pkg.tar.gz suffix The old one created foo-1.0-1.tar.gz named package file. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- contrib/bacman | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/bacman b/contrib/bacman index 410482f..a973823 100755 --- a/contrib/bacman +++ b/contrib/bacman @@ -265,7 +265,7 @@ chmod 644 $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null echo "Generating the package..." ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.pkg.tar.gz" $(ls -A) || ret=$? if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access" -- 1.5.6.1

3 3

[pacman-dev] New _alpm_dep_edge function
by Nagy Gabor 01 Jul '08

01 Jul '08

From cfe1de25873cf7d3d51a33682286f70e53733c4d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 1 Jul 2008 22:53:13 +0200 Subject: [PATCH] New _alpm_dep_edge function The function is introduced to kill some code duplication. The funcion name uses the 'dependency graph' terminology. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 54 +++++++++++++++++++++++------------------------- lib/libalpm/deps.h | 1 + lib/libalpm/package.c | 16 +++---------- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 37e9916..bad2587 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -74,7 +74,7 @@ void _alpm_depmiss_free(pmdepmissing_t *miss) */ static alpm_list_t *dep_graph_init(alpm_list_t *targets) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j; alpm_list_t *vertices = NULL; /* We create the vertices */ for(i = targets; i; i = i->next) { @@ -91,12 +91,7 @@ static alpm_list_t *dep_graph_init(alpm_list_t *targets) for(j = vertices; j; j = j->next) { pmgraph_t *vertex_j = j->data; pmpkg_t *p_j = vertex_j->data; - int child = 0; - for(k = alpm_pkg_get_depends(p_i); k && !child; k = k->next) { - pmdepend_t *depend = k->data; - child = alpm_depcmp(p_j, depend); - } - if(child) { + if(_alpm_dep_edge(p_i, p_j)) { vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); } @@ -458,7 +453,7 @@ pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep) static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, int include_explicit) { - alpm_list_t *i, *j; + alpm_list_t *i; if(_alpm_pkg_find(targets, alpm_pkg_get_name(pkg))) { return(0); @@ -482,13 +477,8 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, /* see if other packages need it */ for(i = _alpm_db_get_pkgcache(db); i; i = i->next) { pmpkg_t *lpkg = i->data; - for(j = alpm_pkg_get_depends(lpkg); j; j = j->next) { - if(alpm_depcmp(pkg, j->data)) { - if(!_alpm_pkg_find(targets, lpkg->name)) { - return(0); - } - break; - } + if(_alpm_dep_edge(lpkg, pkg) && !_alpm_pkg_find(targets, lpkg->name)) { + return(0); } } @@ -508,7 +498,7 @@ static int can_remove_package(pmdb_t *db, pmpkg_t *pkg, alpm_list_t *targets, */ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j; ALPM_LOG_FUNC; @@ -518,18 +508,14 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) for(i = targs; i; i = i->next) { pmpkg_t *pkg = i->data; - for(j = alpm_pkg_get_depends(pkg); j; j = j->next) { - pmdepend_t *depend = j->data; - - for(k = _alpm_db_get_pkgcache(db); k; k = k->next) { - pmpkg_t *deppkg = k->data; - if(alpm_depcmp(deppkg,depend) - && can_remove_package(db, deppkg, targs, include_explicit)) { - _alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n", - alpm_pkg_get_name(deppkg)); - /* add it to the target list */ - targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); - } + for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { + pmpkg_t *deppkg = j->data; + if(_alpm_dep_edge(pkg, deppkg) + && can_remove_package(db, deppkg, targs, include_explicit)) { + _alpm_log(PM_LOG_DEBUG, "adding '%s' to the targets\n", + alpm_pkg_get_name(deppkg)); + /* add it to the target list */ + targs = alpm_list_add(targs, _alpm_pkg_dup(deppkg)); } } } @@ -668,6 +654,18 @@ error: return(-1); } +/* Does pkg1 depend on pkg2, ie. does pkg2 satisfy a dependency of pkg1? */ +int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2) +{ + alpm_list_t *i; + for(i = alpm_pkg_get_depends(pkg1); i; i = i->next) { + if(alpm_depcmp(pkg2, i->data)) { + return(1); + } + } + return(0); +} + const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 70badfd..7bf178d 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -50,6 +50,7 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, alpm_list_t **list, alpm_list_t *remove, pmtrans_t *trans, alpm_list_t **data); +int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 79cc64e..56bd328 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -540,7 +540,7 @@ unsigned short SYMEXPORT alpm_pkg_has_scriptlet(pmpkg_t *pkg) */ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) { - const alpm_list_t *i, *j; + const alpm_list_t *i; alpm_list_t *reqs = NULL; pmdb_t *localdb = alpm_option_get_localdb(); @@ -549,17 +549,9 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) continue; } pmpkg_t *cachepkg = i->data; - const char *cachepkgname = alpm_pkg_get_name(cachepkg); - - for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { - pmdepend_t *dep = j->data; - - if(alpm_depcmp(pkg, dep)) { - _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n", - cachepkgname, pkg->name); - reqs = alpm_list_add(reqs, strdup(cachepkgname)); - break; - } + if(_alpm_dep_edge(cachepkg, pkg)) { + const char *cachepkgname = alpm_pkg_get_name(cachepkg); + reqs = alpm_list_add(reqs, strdup(cachepkgname)); } } return(reqs); -- 1.5.6.1

1 0

[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