- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC][PATCH] Introduce Include key globing for pacman.conf
by Marc - A. Dahlhaus 24 Mar '10

24 Mar '10

This patch adds the ability to use Include filenames containing wildcards and also expands the tilde to the homedirectory of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) { This patch addes the ability to use Include filenames containing wildcards and also expands the tilde to the homedir of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) {

4 15

[pacman-dev] [PATCH] alpm_list_diff_sorted - make some arguements const
by Allan McRae 24 Mar '10

24 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80aa558..80ba1ee 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -657,12 +657,12 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack, * @param onlyright pointer to the second result list * */ -void SYMEXPORT alpm_list_diff_sorted(alpm_list_t *left, - alpm_list_t *right, alpm_list_fn_cmp fn, +void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left, + const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright) { - alpm_list_t *l = left; - alpm_list_t *r = right; + const alpm_list_t *l = left; + const alpm_list_t *r = right; if(!onlyleft && !onlyright) { return; diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index fcab301..bd639f7 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -78,7 +78,7 @@ void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_ void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); -void alpm_list_diff_sorted(alpm_list_t *left, alpm_list_t *right, +void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright); #ifdef __cplusplus -- 1.7.0.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-146-gcdbb90a
by dan＠archlinux.org 24 Mar '10

24 Mar '10

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 cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 (commit) via ad4efa539de1e8e9e51baee82efeafde9fb24380 (commit) from f6c7de77edee89650e8dabf728f296d48cd4b3e0 (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 cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 7 21:52:09 2009 -0500 Show 'Required By' in -Sii output Just as we do in -Qi, we can compute required by information for sync database packages. The behavior seems sane; for a given package, the -Sii required by will show all packages in *any* sync database that require it. Implements FS#16244. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad4efa539de1e8e9e51baee82efeafde9fb24380 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 18 21:46:03 2010 -0500 Strip extension off all package compression types Since we were searching for '.pkg.tar.gz' before, we now have started to show extensions during the download when we have a '.pkg.tar.xz' package. Just look for '.pkg.tar.' (or '.db.tar.') instead and suppress anything found from that point on. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 42 ++++++++++++++++++++++++++++++++---------- src/pacman/callback.c | 2 +- src/pacman/package.c | 16 +++++++++------- src/pacman/package.h | 2 +- src/pacman/sync.c | 6 +++--- 5 files changed, 46 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] makepkg: Add -q/--question output
by Allan McRae 22 Mar '10

22 Mar '10

Hi all, This is a request for comments on FS#18709. It requests adding a -q/--question option similar to make which does nothing but returns 0 if all packages are already built and 1 if not. It might be useful in scripts. Any opinions on this? I see no reason why not. The name is a bit weird but given that is what make uses, I see no reason not to be consistent. There is a patch (http://bugs.archlinux.org/task/18709?getfile=5006) which is fairly minor, but needs reviewing and documentation. Allan

2 1

Re: [pacman-dev] [arch-general] rankmirrors with arch-games
by Dan McGee 20 Mar '10

20 Mar '10

On Thu, Mar 18, 2010 at 9:42 PM, Daenyth Blank <daenyth+arch(a)gmail.com> wrote: > For some reason rankmirrors seems to really hate the arch-games > mirrorlist. I don't know whether it's a bug or whether there's some > sort of server misconfiguration. > > [root@Muspelheimr pacman.d]# rankmirrors -t archgames-mirrorlist > Querying servers, this may take some time... > * * * * > Servers sorted by time (seconds): > http://pseudoform.org/arch-games/games/i686 #(Nürnberg, Germany. > Maintainer: svenstaro) : 1.01 > http://repo.exigen.org/arch/games/i686 #(Düsseldorf, Germany. > Maintainer: s4msung) : unreachable > http://repo.archlinux-gaming.org/i686 #(Toronto, Canada. Primary > mirror) : unreachable > ftp://mirror.selfnet.de/arch-games/i686 #(Stuttgart, Germany. > Maintainer: hrist) : unreachable > > All of the above servers respond to ping and their repos can be > browsed manually and synced with using pacman. So let's compare a "normal" mirror location with those from arch-games and what we know works. normal: ftp://ftp.archlinux.org/core/os/i686 works: http://pseudoform.org/arch-games/games/i686 not work: http://repo.exigen.org/arch/games/i686 rankmirrors assumes the repository name is the third component from the end; the normal URL would thus produce "core" and look for "core.db.tar.gz" and the working arch-games URL would see "arch-games" and look for "arch-games.db.tar.gz". The non-working URLs thus are guessing the db name incorrectly; the one I listed above would look for "arch.db.tar.gz" and fail to find it, thus the unreachable in the output. I cross-posted this to pacman-dev, but we have a bit of a oddity here as the rankmirrors python script was recently replaced by a bash version, and it does an absolutely abominable job on this mirrorlist due to the inline comments: $ rankmirrors test-mirrorlist # Server list generated by rankmirrors on 2010-03-20 # # Arch Games repository mirrorlist # url `' is malformed. I'm not super thrilled about this regression. Either way, I think we should probably add an option to the scripts to use a designated file as the target for rankmirrors testing; this way you could specify a DB filename or any other file as the target to test against. -Dan

1 0

[pacman-dev] [PATCH] configure.ac : disable doc by default and check for asciidoc
by Xavier Chantry 18 Mar '10

18 Mar '10

This is a complaint that has been reported many many times. By default, docs are enabled and there is no check for asciidoc, so anyone building from git will see their build fail. We cannot do a strict check for asciidoc because released source tarballs have man pages already built, and it should be possible to install them without having asciidoc. This patch attempts to improve the situation in two ways : 1) disable doc by default 2) print a warning if docs are enabled but asciidoc is not installed Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- configure.ac | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index faf774f..aab0e4b 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download, # Help line for documentation AC_ARG_ENABLE(doc, - AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), - [wantdoc=$enableval], [wantdoc=yes]) + AS_HELP_STRING([--enable-doc], [run make in doc/ dir]), + [wantdoc=$enableval], [wantdoc=no]) # Help line for doxygen AC_ARG_ENABLE(doxygen, @@ -261,12 +261,18 @@ AC_SUBST(CARCHFLAGS) AC_SUBST(CHOST) # Check for documentation support and status +AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) AC_MSG_CHECKING([for building documentation]) if test "x$wantdoc" = "xyes" ; then - AC_MSG_RESULT([yes]) + if test $ASCIIDOC ; then + AC_MSG_RESULT([yes, enabled by configure]) + else + asciidoc="(warning : asciidoc not installed)" + AC_MSG_RESULT([yes $asciidoc]) + fi wantdoc=yes else - AC_MSG_RESULT([no, disabled by configure]) + AC_MSG_RESULT([no]) wantdoc=no fi AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes") @@ -389,7 +395,7 @@ ${PACKAGE_NAME}: build script name : ${BUILDSCRIPT} Compilation options: - Run make in doc/ dir : ${wantdoc} + Run make in doc/ dir : ${wantdoc} ${asciidoc} Use download library : ${internaldownload} Doxygen support : ${usedoxygen} debug support : ${debug} -- 1.7.0.2

3 11

[pacman-dev] Rif: Re: pacman problems
by antonio.grande＠uniroma1.it 18 Mar '10

18 Mar '10

1 0

[pacman-dev] pacman problems
by antonio.grande＠uniroma1.it 18 Mar '10

18 Mar '10

I'am a newbie so please thank you for your patience. Executing pacman -S samba I've this error: failed retriving file 'tdb-1.2.0-1-i686.pkg.tar.gz' But both two mirrors I've in my etc/pacman.d/mirrorlist contain the filename "tdb-1.2.1-1-i686.pkg.tar.xz" where there is a difference about the version 1.2.1 and also in the extension .xz instead of .gz My pacman version is 3.3.3-1 which is the latest. Someone can help me? Thank you. Antonio Grande

4 3

[pacman-dev] [PATCH] Remove unused 'z' option from getopt_long's optstring
by Nagy Gabor 16 Mar '10

16 Mar '10

In addition, I permuted shortopts to make it more readable. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 750afca..7fe8514 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -416,7 +416,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "RUDQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "DQRSTUVb:cdefghiklmnopqr:stuvwy", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { -- 1.7.0.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-144-gf6c7de7
by dan＠archlinux.org 16 Mar '10

16 Mar '10

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 f6c7de77edee89650e8dabf728f296d48cd4b3e0 (commit) from a36ff9404b59b249b436282f5b69d8ed136a7c8d (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 f6c7de77edee89650e8dabf728f296d48cd4b3e0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 15 23:03:29 2010 -0500 Unbreak the database partial extraction code Basically I'm the idiot that thought I could make it better and completely forgot how freeing the contents of the original lists would screw up our nice little diff extraction lists. This caused segfaults among other problems. Last time I try to do that... Program received signal SIGSEGV, Segmentation fault. 0x00007ffff627ce26 in strcmp () from /lib/libc.so.6 (gdb) bt Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0