- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] New _alpm_find_dep_satisfier function
by Nagy Gabor 04 Jul '08

04 Jul '08

From d199269813180d4a034fea54d025280aef3e4853 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 4 Jul 2008 15:39:26 +0200 Subject: [PATCH] New _alpm_find_dep_satisfier function This function finds the first satisfier package in a pkglist. Using it instead of _alpm_find_dep_satisfiers eliminates some memleaks and it is faster. (_alpm_find_dep_satisfiers and _alpm_find_pkg_satisfiers will be removed soon.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 25 +++++++++++++++++++------ lib/libalpm/deps.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 410e22d..e67b008 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -189,6 +189,19 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) return(newtargs); } +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep) +{ + alpm_list_t *i; + + for(i = pkgs; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = i->data; + if(alpm_depcmp(pkg, dep)) { + return(pkg); + } + } + return(NULL); +} + alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep) { alpm_list_t *i, *ret = NULL; @@ -232,7 +245,7 @@ alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets) target = alpm_list_getdata(i); dep = _alpm_splitdep(target); - if(!_alpm_find_dep_satisfiers(_alpm_db_get_pkgcache(db), dep)) { + if(!_alpm_find_dep_satisfier(_alpm_db_get_pkgcache(db), dep)) { ret = alpm_list_add(ret, target); } _alpm_dep_free(dep); @@ -283,8 +296,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmdepend_t *depend = j->data; /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ - if(!_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + if(!_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { /* Unsatisfied dependency in the upgrade list */ char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: missing dependency '%s' for package '%s'\n", @@ -303,13 +316,13 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps, pmpkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { pmdepend_t *depend = j->data; - pmpkg_t *causingpkg = alpm_list_getdata(_alpm_find_dep_satisfiers(modified, depend)); + pmpkg_t *causingpkg = _alpm_find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ /* 2. check dblist for satisfiers */ if(causingpkg && - !_alpm_find_dep_satisfiers(upgrade, depend) && - !_alpm_find_dep_satisfiers(dblist, depend)) { + !_alpm_find_dep_satisfier(upgrade, depend) && + !_alpm_find_dep_satisfier(dblist, depend)) { char *missdepstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n", missdepstring, alpm_pkg_get_name(lp)); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 7bf178d..1e539b7 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -52,6 +52,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); +pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); alpm_list_t *_alpm_find_dep_satisfiers(alpm_list_t *pkgs, pmdepend_t *dep); #endif /* _ALPM_DEPS_H */ -- 1.5.6.1

1 0

[pacman-dev] [PATCH] Fix a bogus message in Hungarian translation (maint)
by Nagy Gabor 04 Jul '08

04 Jul '08

From 4d8c96d44b70ed4e89449d72641239ffaf2226c0 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 4 Jul 2008 19:34:55 +0200 Subject: [PATCH] Fix a bogus message in Hungarian translation (maint) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/po/hu.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index c9fd870..9039146 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -139,7 +139,7 @@ msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n" #, c-format msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" -msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n" +msgstr "nem sikerült a(z) \"%2$s\" csomag \"%1$s\" függőségét feloldani\n" #, c-format msgid "out of memory!" -- 1.5.6.1

1 0

[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

[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

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-20-gdeec3c8
by Dan McGee 19 Jun '08

19 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 (commit) via d88524ea0ee533ed8f4f3029fa08c446ec2d58db (commit) via 2158b8e29839e99b4f5a3420d9896dd9da223b0b (commit) via fff746052cd224bd8c6db44c8fdc8ff7f4d08510 (commit) from 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 8 +- doc/PKGBUILD.5.txt | 44 +++++- doc/pacman.8.txt | 10 ++ lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{zh_CN.po => tr.po} | 303 ++++++++++++++++++------------------ 5 files changed, 209 insertions(+), 157 deletions(-) copy lib/libalpm/po/{zh_CN.po => tr.po} (53%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-218-gd594b6e
by Dan McGee 19 Jun '08

19 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via d594b6e7978d14b5ca4cd9c295fa9b829c5565bd (commit) via 5c6809987e235fea760c6feb6deaceaada09b53f (commit) via deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 (commit) via d88524ea0ee533ed8f4f3029fa08c446ec2d58db (commit) via 29bf6814f74096e5d8ea22058e638eb362717b8a (commit) via 7ff5a917fd0a91cd03ba61419a57053e4ae17e92 (commit) via b9445c12cf9e958d8e62f9f9ecb5c1352010cdf4 (commit) via b8a66d68593d1f267c3bb8cd8943724711626903 (commit) via 2158b8e29839e99b4f5a3420d9896dd9da223b0b (commit) via fff746052cd224bd8c6db44c8fdc8ff7f4d08510 (commit) via a1dfa8e61f385a6b388b66f4860e96a62f3edae6 (commit) via 89819b3f9268062ee54c35a16876474414d94bf5 (commit) via c11bdf19b1b8ab40468561dc592b9c6bd7f86acf (commit) from 7313c8546ae0a2c38768d665b3f314ee0cf959c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d594b6e7978d14b5ca4cd9c295fa9b829c5565bd Merge: 5c6809987e235fea760c6feb6deaceaada09b53f deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 19 08:51:36 2008 -0500 Merge branch 'maint' commit 5c6809987e235fea760c6feb6deaceaada09b53f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 15 23:10:04 2008 -0500 makepkg.conf: make keeping docs the default Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 29bf6814f74096e5d8ea22058e638eb362717b8a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 15 19:15:36 2008 -0500 Use access() instead of stat() when possible We were using the stat() system call in quite a few places when we didn't actually need anything the stat struct returned- we were simply checking for file existence. access() will be more efficient in those cases. Before (strace pacman -Ss pacman): % time seconds usecs/call calls errors syscall ------ ----------- ----------- --------- --------- ---------------- 33.16 0.005987 0 19016 stat64 After: % time seconds usecs/call calls errors syscall ------ ----------- ----------- --------- --------- ---------------- 34.85 0.003863 0 12633 1 access 7.95 0.000881 0 6391 7 stat64 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ff5a917fd0a91cd03ba61419a57053e4ae17e92 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jun 15 12:56:40 2008 +0200 makepkg: add several quotes needed after nullglob. After the "shopt -s nullglob" change, all regular expressions should be properly quoted. This commit only fixes the ones I found, there are probably others left, so this should be kept in mind for easier future fixing. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9445c12cf9e958d8e62f9f9ecb5c1352010cdf4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jun 15 12:10:31 2008 +0200 makepkg: Add missing quotes for the source array. Now makepkg can handle filenames with whitespaces in the source array. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8a66d68593d1f267c3bb8cd8943724711626903 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Sat May 31 14:35:16 2008 +0800 Use openssl for checksum verification instead of *sum utilities md5sum, sha1sum, etc, do not exist on BSD systems by default. Openssl is a good portable alternative. This also brings in a dependency for openssl. Closes FS#10530. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a1dfa8e61f385a6b388b66f4860e96a62f3edae6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 14 11:29:29 2008 -0500 Combine repo-add and repo-remove into one script They shared about 75% of their code, so there is no real reason we should maintain them separately. Merge the differences accordingly and add a check based on the basename of the command used to decide what behavior to follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89819b3f9268062ee54c35a16876474414d94bf5 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 14 10:48:28 2008 -0500 repo-*: allow use of readlink or realpath Linux coreutils provides readlink, and BSD systems tend to have realpath available. Both commands provide similar functionality but of course have different names. Add a check for either and use what is available. While doing this, also unify some of the differences that have cropped up between repo-add and repo-remove. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c11bdf19b1b8ab40468561dc592b9c6bd7f86acf Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon May 26 16:27:22 2008 +1000 Move geninteg block in makepkg before error checking This patch moves the generating of integrity checks to before any error checking takes place in the PKGBUILD file. This allows integrity generation to complete when unrelated errors exist in a PKGBUILD file and allows the removal of multiple checks of the GENINTEG variable that would otherwise be needed. In addition a minor fix is made to a comment. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: autoclean.sh | 8 +- doc/PKGBUILD.5.txt | 44 +++++- doc/makepkg.conf.5.txt | 2 +- doc/pacman.8.txt | 10 ++ etc/makepkg.conf.in | 4 +- lib/libalpm/be_files.c | 5 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{zh_CN.po => tr.po} | 303 ++++++++++++++++++------------------ lib/libalpm/trans.c | 8 +- lib/libalpm/util.c | 12 +- po/POTFILES.in | 1 - scripts/Makefile.am | 16 +- scripts/makepkg.sh.in | 57 ++++---- scripts/repo-add.sh.in | 116 ++++++++++---- scripts/repo-remove.sh.in | 199 ----------------------- src/pacman/package.c | 5 +- src/pacman/util.c | 6 +- src/util/testdb.c | 8 +- 18 files changed, 351 insertions(+), 454 deletions(-) copy lib/libalpm/po/{zh_CN.po => tr.po} (53%) delete mode 100644 scripts/repo-remove.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add Keyring/--keyring option in alpm/pacman
by geoffroy.carrier＠koon.fr 19 Jun '08

19 Jun '08

From: Geoffroy Carrier <geoffroy.carrier(a)koon.fr> Keyring in pacman.conf, --keyring in pacman, support for this option in libalpm and pacman. Documentation in: . pacman.conf(5) . pacman(8) . README --- It is very similar to LogFile... README | 1 + doc/pacman.8.txt | 3 +++ doc/pacman.conf.5.txt | 6 +++++- etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 33 +++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/Makefile.am | 2 ++ src/pacman/conf.c | 2 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 5 +++++ 11 files changed, 57 insertions(+), 1 deletions(-) diff --git a/README b/README index 46b5bb2..251862c 100644 --- a/README +++ b/README @@ -58,6 +58,7 @@ library is initialized. * dbpath: The base path to pacman's databases (Default: var/lib/pacman) * cachedir: The base path to pacman's download cache (Default: var/cache/pacman) * logfile: The base path to pacman's log file (Default: var/log/pacman.log) +* keyring: The base path to pacman's GnuPG keyring (Default: etc/pacman.d/keyring.gpg) * usesyslog: Log to syslog instead of `logfile` for file-base logging. * xfercommand: The command to use for downloading instead of pacman's internal downloading functionality. diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a6bc3d9..33ac7b5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -129,6 +129,9 @@ Options *\--config* <'file'>:: Specify an alternate configuration file. +*\--keyring* <'file'>:: + Specify an alternate GnuPG keyring. + *\--logfile* <'file'>:: Specify an alternate log file. This is an absolute path, regardless of the installation root setting. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index eb9285c..44417be 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -49,7 +49,7 @@ Options Set the default root directory for pacman to install to. This option is used if you want to install a package on a temporary mounted partition which is "owned" by another system, or for a chroot install. - *NOTE*: If database path or logfile are not specified on either the + *NOTE*: If database path, logfile or keyring are not specified on either the command line or in linkman:pacman.conf[5], their default location will be inside this root path. @@ -68,6 +68,10 @@ Options path, the root path is not automatically prepended. This behavior changed in pacman 3.1.0. +*Keyring =* '/path/to/file':: + Overrides the default location of the GnuPG keyring file. A typical default + is ``/etc/pacman.d/keyring.gpg''. If this file does not exist, packages + signatures will not be checked. *LogFile =* '/path/to/file':: Log actions directly to a file. A typical default is diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 582fe94..9d20a6e 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -13,6 +13,7 @@ #DBPath = @localstatedir@/lib/pacman/ #CacheDir = @localstatedir@/cache/pacman/pkg/ #LogFile = @localstatedir@/log/pacman.log +#Keyring = @sysconfdir@/pacman.d/keyring.gpg HoldPkg = pacman glibc #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 62a517b..ab60a4b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -110,6 +110,9 @@ int alpm_option_set_logfile(const char *logfile); const char *alpm_option_get_lockfile(); /* no set_lockfile, path is determined from dbpath */ +const char *alpm_option_get_keyring(); +int alpm_option_set_keyring(const char *keyring); + unsigned short alpm_option_get_usesyslog(); void alpm_option_set_usesyslog(unsigned short usesyslog); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index c01dd55..c7f2329 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -57,6 +57,7 @@ pmhandle_t *_alpm_handle_new() handle->cachedirs = NULL; handle->lockfile = NULL; handle->logfile = NULL; + handle->keyring = NULL; handle->usedelta = 0; return(handle); @@ -86,6 +87,7 @@ void _alpm_handle_free(pmhandle_t *handle) FREE(handle->dbpath); FREELIST(handle->cachedirs); FREE(handle->logfile); + FREE(handle->keyring); FREE(handle->lockfile); FREE(handle->xfercommand); FREELIST(handle->dbs_sync); @@ -151,6 +153,15 @@ const char SYMEXPORT *alpm_option_get_logfile() return handle->logfile; } +const char SYMEXPORT *alpm_option_get_keyring() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->keyring; +} + const char SYMEXPORT *alpm_option_get_lockfile() { if (handle == NULL) { @@ -427,6 +438,28 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) return(0); } +int SYMEXPORT alpm_option_set_keyring(const char *keyring) +{ + char *oldkeyring = handle->keyring; + + ALPM_LOG_FUNC; + + if(!keyring) { + pm_errno = PM_ERR_WRONG_ARGS; + return(-1); + } + + handle->keyring = strdup(keyring); + + /* free the old keyring path string, and close the stream so logaction + * will reopen a new stream on the new logfile */ + if(oldkeyring) { + FREE(oldkeyring); + } + _alpm_log(PM_LOG_DEBUG, "option 'keyring' = %s\n", handle->keyring); + return(0); +} + void SYMEXPORT alpm_option_set_usesyslog(unsigned short usesyslog) { handle->usesyslog = usesyslog; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 9c537b1..2255f43 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -45,6 +45,7 @@ typedef struct _pmhandle_t { char *dbpath; /* Base path to pacman's DBs */ char *logfile; /* Name of the log file */ char *lockfile; /* Name of the lock file */ + char *keyring; /* Name of the GnuPG keyring */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ /* package lists */ diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5d6fef3..16c0332 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -3,6 +3,7 @@ conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ cachedir = ${localstatedir}/cache/pacman/pkg/ logfile = ${localstatedir}/log/pacman.log +keyring = ${sysconfdir}/pacman.d/keyring.gpg bin_PROGRAMS = pacman @@ -16,6 +17,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" \ -DDBPATH=\"$(dbpath)\" \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" \ + -DKEYRING=\"$(keyring)\" \ @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 48c927b..ec9a370 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -47,6 +47,7 @@ config_t *config_new(void) newconfig->rootdir = NULL; newconfig->dbpath = NULL; newconfig->logfile = NULL; + newconfig->keyring = NULL; newconfig->syncfirst = NULL; return(newconfig); @@ -63,6 +64,7 @@ int config_free(config_t *oldconfig) free(oldconfig->rootdir); free(oldconfig->dbpath); free(oldconfig->logfile); + free(oldconfig->keyring); free(oldconfig); oldconfig = NULL; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 874ce70..8be6414 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -37,6 +37,7 @@ typedef struct __config_t { char *rootdir; char *dbpath; char *logfile; + char *keyring; /* TODO how to handle cachedirs? */ unsigned short op_q_isfile; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 66fafa1..98bfa5f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -131,6 +131,7 @@ static void usage(int op, const char * const myname) } printf(_(" --config <path> set an alternate configuration file\n")); printf(_(" --logfile <path> set an alternate log file\n")); + printf(_(" --keyring <path> set an alternate keyring\n")); printf(_(" --noconfirm do not ask for any confirmation\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); @@ -262,6 +263,10 @@ static void setlibpaths(void) snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE); config->logfile = strdup(path); } + if(!config->keyring) { + snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), KEYRING); + config->keyring = strdup(path); + } } /* Set other paths if they were configured. Note that unless rootdir * was left undefined, these two paths (dbpath and logfile) will have -- 1.5.5.3

5 10

[pacman-dev] pacman Turkish translation
by Alper KANAT 19 Jun '08

19 Jun '08

It's 15K now.. :) -- Alper KANAT http://raptiye.org

3 3

[pacman-dev] [PATCH] Remove --asroot switch from makepkg.
by Loui 18 Jun '08

18 Jun '08

I've found --asroot to be kind of a hand holding hindrance so I decided to remove it. Here's the patch if anyone is interested. Cheers.

7 15

Re: [pacman-dev] Splitting packages in makepkg
by Miklos Vajna 17 Jun '08

17 Jun '08

On Tue, Jun 17, 2008 at 10:20:59PM +1000, Allan McRae <mcrae_allan(a)hotmail.com> wrote: > Just another thought. Why do we even need the subpkg array. Why not: > "pkgname=foo" for single packages and "pkgname=('foo' 'foo-bar' > 'foo-doc')" for split packages? I would have to check that you can do > that in bash... pkgname=("foo") is equivalent to pkgname="foo" in bash, at least ${pkgname[0]} will work for both, ${#pkgname[@]} will report 1 for both, etc.

1 0

[pacman-dev] FS#7982 - patch to makepkg to allow PKGBUILDs building more than one package
by Marc - A. Dahlhaus 17 Jun '08

17 Jun '08

Hello List, a few comments on the posted patch... @@ -1389,7 +1391,57 @@ if [ "$INFAKEROOT" = "1" ]; then tidy_install fi - create_package + if [ "$splitinstall" != "" ] ; then + backup_o=$backup + conflicts_o=$conflicts + depends_o=$depends + groups_o=$groups + install_o=$install + license_o=$license + pkgdesc_o=$pkgdesc + pkgname_o=$pkgname + pkgver_o=$pkgver + provides_o=$provides + replaces_o=$replaces + url_o=$url This is the right place to do this in my opinion, that way you have the global defined defaults for every slpit-package. To move this inside of the loop would kill the posibility to get the fuits from my next comment. + create_package I think this is wrong from the view to build sub-packages out of one compiled tree. build should be used to only build the sources and prepare everything which would be usefull for all subpackages. That way we could add a new param to makepkg to bould only a subset of the splitpackages by overriding the contents of the defined var splitinstall. + for it in "${splitinstall[@]}" ; do + if [ -d "$pkgdir" ]; then + msg "Removing existing pkg/ directory..." + rm -rf "$pkgdir" + fi + mkdir -p "$pkgdir" I like it that way and we can fix the issue spotted by *Allan McRae* (non working repackage param) if we take the way of my prevous comment and allow to rebuild only a subset of the splitpackages. I think we should add the splitpackage-name to repackage as additional param to makepkg's command line and use that to override the splitinstall value in case we want repackage. --8<-- thanks, Marc

7 8

[pacman-dev] Splitting packages in makepkg
by Allan McRae 17 Jun '08

17 Jun '08

NOTE: This is a discussion about the technical implementation of the ability to build split packages in makepkg. DO NOT reply if all you want to say is splitting packages is a bad thing. Just because makepkg can split packages does not mean Arch will start splitting everything up into binary/header packages. I can say with great certainty that that will never happen. I was going to wait until 3.2 was out the door to start implementing the ability to split packages but there has been enough activity on the bug tracker lately that I thought this discussion would be timely. There have been several proposals for building split packages with makepkg. See: http://bugs.archlinux.org/task/7144 http://bugs.archlinux.org/task/7982 http://bugs.archlinux.org/task/8187 The question is how best to implement this. I can not see any other way than having a "split" array listing the names of the split components, so the need for this is almost a given. With input from the bug reports, I see two possible ways to implement this (in the PKGBUILD): 1) The KDEMod style (FS#7982), where each package has its own install function. e.g. base_install() { # do install stuff } gui_install() { # override pkgname etc # do install stuff } 2) A "package" function with a case statement. e.g. package() { case "$1" in "base" ) # do install stuff ;; "gui" ) # override pkgname etc # do install stuff ;; esac } I am kind of torn here... I like the idea of having a single function but the syntax is slightly more complex. Although the multi function version is already in use, that should not be a limiting factor - we should be striving for technical elegance rather than accepting the current situation. The second point I would like to bring up is based on the suggestion in FS#8187. In it I suggested having separate subdirectories where each sub-package is installed into. This would be a benefit because it would not require the clearing of the pkg directory after each sub-package install as in the current KDEmod implementation. I see this would be a definite help when bugfixing a PKGBUILD as you can easily browse the installed files. It would also mean that we could keep the repackage option working. This could be implemented with either method by setting the pkgdir variable before calling whichever package function is chosen. But it would require the forcing of the use of $pkgdir rather than $startdir/pkg as that would fail. So people, what are you opinions on the ideas above? These are just the choices I can currently see so don't feel limited to only commenting on them. At this stage I would not worry about the actual naming scheme of functions etc, just the implementation. So please discuss (after going back and reading the top paragraph...). Allan

12 23