- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-5-gea84819
by dan＠archlinux.org 08 Feb '09

08 Feb '09

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 ea84819bbbdba90f950339790d482f2348c2e9ef (commit) from 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (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: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-78-g04c2b9d
by dan＠archlinux.org 08 Feb '09

08 Feb '09

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 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 (commit) via ea84819bbbdba90f950339790d482f2348c2e9ef (commit) via 34e1413d756269dcd71a32dd5d2dbb263a943051 (commit) via 14230869e6a37526f8a1bdb1fb88f23309b10aef (commit) via eab96848376db6f54f05773a7e924faf0355137f (commit) from c794661f1ea8c819d479948e92e5648de62787c5 (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 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 Merge: 34e1413d756269dcd71a32dd5d2dbb263a943051 ea84819bbbdba90f950339790d482f2348c2e9ef Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 8 11:43:08 2009 -0600 Merge branch 'maint' commit 34e1413d756269dcd71a32dd5d2dbb263a943051 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jan 19 22:54:00 2009 +0100 Delay the creation of local and sync db dir. We don't need to create the directories when local or sync dbs are registered. For example, if a sync db does not exist, we cannot even do "pacman -Q" as an user. Instead, we can create the local db if needed during the db_prepare operation, and sync dbs on db_update. Also remove some more useless abstractions in db_update and switch to a much more efficient way to remove a sync db : rm -rf. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 14230869e6a37526f8a1bdb1fb88f23309b10aef Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jan 19 20:45:12 2009 +0100 Remove some db abstraction crap. These db_open and db_close looked quite useless. And they caused the db directory to be opened on a simple registering of a database. This is totally unneeded, this opening can be delayed to when we actually need it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit eab96848376db6f54f05773a7e924faf0355137f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jan 18 14:01:24 2009 +0100 alpm_unpack : change prefix handling to workaround FS#12148. Instead of appending the prefix to each entry name, we can chdir to the prefix before extracting, and restoring when it is done. This seems to work better with the strange and special case of FS#12148 where an archive contained the "./" entry. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 81 ++++++++++++++++++++++------------------------- lib/libalpm/db.c | 41 ------------------------ lib/libalpm/db.h | 3 -- lib/libalpm/util.c | 32 ++++++++++++++----- scripts/makepkg.sh.in | 4 +- 5 files changed, 64 insertions(+), 97 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Any progress on my patches?
by Bryan Ischo 08 Feb '09

08 Feb '09

Hi all. It's been almost two weeks since I submitted my most recent patches, after much discussion, much back-and-forth, many changes, and many hours of work on my part. But I've heard nothing about the acceptance of my patches except "someone is reviewing them". To be quite blunt, I don't think my patches are being actively reviewed. If they were, I'd expect someone to have some questions for me about the code, something to indicate why the patches have not yet been applied. But I'm not hearing anything so I conclude that in reality my patches simply aren't getting any attention. I think that what I really need to do is just remind the pacman source maintainers that my patches are out there and I'm waiting for them to be accepted. I realize that everyone is busy with lots of stuff, and that the particular issue that my patches address may not be high on anyone's list of pacman priorities (although there is a bug open about it in flyspray, so it's at least important enough that it's being tracked as an issue). But I think I've been very patient - it's been weeks since I submitted my patches - and I really hope that someone can just accept my patches so that I can put this issue to rest. I'm really worried that as time goes on and other changes go into the pacman sources, my patches have a greater and greater chance of needing to be re-worked to be accepted. And I've already spent a great deal more time than I anticipated on this, I really don't want to spend any more if I don't have to. So somebody, *please*, accept my patches, or let me know what I need to do to get them accepted. By the way, please note that my most recent version of these patches, of almost two weeks ago, address the issues that Dan McGee had raised that I hadn't responded to. There are no outstanding issues that these patches have not addressed. Thanks, Bryan ------------------------------------------------------------------------ Bryan Ischo bryan(a)ischo.com 2001 Mazda 626 GLX Hamilton, New Zealand http://www.ischo.com RedHat Fedora Core 5 ------------------------------------------------------------------------

1 0

[pacman-dev] [PATCH] makepkg: Make stripping debug symbols cross-platform
by Sebastian Nowicki 08 Feb '09

08 Feb '09

The Linux and BSD versions of strip have the --strip-debug option (as well as the -S option), however Mac OS X only has -S. --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1b2f042..e10c345 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -834,9 +834,9 @@ tidy_install() { find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip -S "$binary";; *application/x-archive*) # Libraries (.a) - /usr/bin/strip --strip-debug "$binary";; + /usr/bin/strip -S "$binary";; *application/x-executable*) # Binaries /usr/bin/strip "$binary";; esac -- 1.6.0.1

2 1

Re: [pacman-dev] Hooks for pacman, more ideas
by Mårten Olsson 03 Feb '09

03 Feb '09

----- "Mårten Olsson" <marten.olsson(a)purplescout.se> wrote: > ----- "Allan McRae" <allan(a)archlinux.org> skrev: <snip> > > >> I'm sure it would be possible to have a package set off a hook > such > > as > > >> you are suggesting, although I think most packages would have a > > file > > >> that would be the obvious choice to use (e.g. /boot/vmlinuz26 for > > >> kernel26). Please add a comment to the wiki page about this. > > >> > > >> > > > Yep, I don't see that as a major problem. > > > From what I have seen of the code it might however be easier to > > start > > > with Package matching (I might be wrong about this but it is my > > personal > > > opinion). In the end both options would be good, we have > > > at least seen that between us that both variants are desirable. > > > > > > > > > > From my understanding, there should be a list of files involved in > a > > transaction created during conflict checking. So we can hopefully > use > > that to test which hooks need to be run. However, I am not very > > familiar with that part of the pacman code... > > > > Ah that seems resonable. > I have done some looking around and the as far as I understand it it would be possible to use "alpm_pkg_get_files" whenever a package is installed/ upgraded/removed to find files to match. Do you know if that is possible? Also it seems like good places to check the hooks would be around the same places where it is currently checked if a package has a scriptlet (where "alpm_pkg_has_scriptlet" is called in the "commit_single_pkg" and "_alpm_remove_commit" functions). The hooks should probably be run after the package scriptlets, rigth? Your ideas? I also have tried to find good places for the "Transaction" hooks but have really found a really good place, maybe in "_alpm_trans_free" but I don't understand enought about the transation part of the code to determine if that is a good place... I also have one question about the config syntax: Currently the syntax is something like: [<script to run>] Files = <file to match> (or Package = <packagename> if that idea is added) Run = <time to run the script> [<script to run2>] Files = <file to match2> (or Package = <packagename2> if that idea is added) Run = <time to run the script> What about lay it out like this instead: [time to run the script] File = <file to match> (or package) Run = <script> File = <file to match2> (or package2) Run = <script2> [time to run the script2] File = <file to match3> (or package) Run = <script3> My personal opinion is that it gives a cleaner seperation as the "section header" determines at which point "in time" to run the hook and it would be more static thing to search/compare with when parsing the config. What do you think? > > Allan > > //Mårten

3 2

Re: [pacman-dev] [PATCH] Add support for user defined per package post install actions
by Mårten Olsson 01 Feb '09

01 Feb '09

Hi! Oh, that was a neat idea... Which I have unfortunetly missed when searching in the archives. :-) I think it should be possible to have it triggered by packages as well, something like this: [kernel-install] Package = kernel26 Run = rebuildoutofkerneltreedrivers (I recognice the ridiculous name of the Run-argument and that this probably wouldn't work as a reboot probably is necessery first but just something as an example. (and it was this need that triggered my own idea).) Of course it is possible to have it triggered by file in this case as well, just list files in this package and choose one of them, but it is still an unecessery extra step (even if it is a small one). BR, Mårten ----- Original Message ----- From: "Allan McRae" <allan(a)archlinux.org> To: "Discussion list for pacman development" <pacman-dev(a)archlinux.org> Sent: Sunday, February 1, 2009 2:59:10 AM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna Subject: Re: [pacman-dev] [PATCH] Add support for user defined per package post install actions Hi, This seems similar to the hooks mechanism the we have been discussing but less general. Have a look at http://wiki.archlinux.org/index.php/User:Allan/Pacman_Hooks for more information. So in short, I like the idea but would want a more general approach taken. Allan Mårten Olsson wrote: > Hi all! > > Wasn't sure if I could include additonal text in "patch-mail". > So I hope it is ok to send an additonal mail with extra info: > > At some places the code needs cleanup which I will do if the concept shown > is accepted (didn't want to take to much time on that if the concept is disliked > and never will be accpeted for that reason). > I want to fix the code-duplication issue (one function) and make the parsign so one > can have arguments with spaces inside " ". > > I wasn't sure if this functionality can be considered dangerous because it will run a script > with full access to the system, but I guess the same problem could show up if you make "bad" > packages with an install script. > > BR, > Mårten > > ----- Original Message ----- > From: "Mårten Olsson" <marten.olsson(a)purplescout.se> > To: pacman-dev(a)archlinux.org > Sent: Sunday, February 1, 2009 2:36:46 AM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna > Subject: [pacman-dev] [PATCH] Add support for user defined per package post install actions > > This adds suport for user to add per package post install > actions, somewhat similar to post-install scripts in packages > but controlled by local user and not part of package/not done > by package maintainer. > The actions is performed by "system" call and can't contain > spaces (not even when inside "). > Syntax in logfile is > PostInstallAction = <packagename>:<action> > Functionality added inside libalpm, add support for configuring > in pacman. > > Signed-off-by: Mårten Olsson <marten.olsson_at_purplescout.se> > --- > lib/libalpm/add.c | 43 +++++++++++++++++++++++++++++++++ > lib/libalpm/alpm.h | 3 ++ > lib/libalpm/handle.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ > lib/libalpm/handle.h | 6 ++++ > src/pacman/pacman.c | 20 +++++++++++++++ > 5 files changed, 137 insertions(+), 0 deletions(-) > > diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c > index 6eb2085..1cd6e28 100644 > --- a/lib/libalpm/add.c > +++ b/lib/libalpm/add.c > @@ -632,6 +632,46 @@ static int extract_single_file(struct archive *archive, > return(errors); > } > > +static int postinstallcompare(const void *postinstalldata, const void *pkgname) > +{ > + const postinstallaction_t *postinstallaction=postinstalldata; > + > + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { > + return(0); > + } > + > + return(1); > +} > + > +/** Test if a package has a postinstallaction associated with it and executes the action. > + * > + * Checks if the package has a postinstallaction associated with it > + * and if so executes the action by the system call > + * > + * @param pkg the package to test > + * > + * @return 0 if no action found or if the associated action completed succesfully, 1 otherwise > + */ > +static int check_run_postinstallaction(pmpkg_t *pkg) > +{ > + postinstallaction_t *postinstallaction = NULL; > + > + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: finding PostInstallAction for package: %s\n", alpm_pkg_get_name(pkg)); > + > + postinstallaction=alpm_list_find(handle->postinstallactions, alpm_pkg_get_name(pkg), postinstallcompare); > + > + if( postinstallaction != NULL) { > + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: package: %s action: %s \n", postinstallaction->pkgname, postinstallaction->action); > + > + /* should this be more like the install-scriptlet code */ > + if( system(postinstallaction->action) != 0) { > + return(1); > + } > + } > + > + return(0); > +} > + > static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, > pmtrans_t *trans, pmdb_t *db) > { > @@ -847,6 +887,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, > } > } > > + /* check and run postinstall action */ > + check_run_postinstallaction(newpkg); > + > if(is_upgrade) { > EVENT(trans, PM_TRANS_EVT_UPGRADE_DONE, newpkg, oldpkg); > } else { > diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h > index 7b7ca4e..04ff886 100644 > --- a/lib/libalpm/alpm.h > +++ b/lib/libalpm/alpm.h > @@ -122,6 +122,9 @@ void alpm_option_add_noupgrade(const char *pkg); > void alpm_option_set_noupgrades(alpm_list_t *noupgrade); > int alpm_option_remove_noupgrade(const char *pkg); > > +int alpm_option_add_postinstallaction(const char *pkg, const char *action); > +int alpm_option_remove_postinstallaction(const char *pkg); > + > alpm_list_t *alpm_option_get_noextracts(); > void alpm_option_add_noextract(const char *pkg); > void alpm_option_set_noextracts(alpm_list_t *noextract); > diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c > index 813f439..504157d 100644 > --- a/lib/libalpm/handle.c > +++ b/lib/libalpm/handle.c > @@ -53,6 +53,23 @@ pmhandle_t *_alpm_handle_new() > return(handle); > } > > +void postinstallactionfree(void *data) > +{ > + postinstallaction_t *postinstallaction=data; > + > + if(postinstallaction->pkgname != NULL) > + { > + free(postinstallaction->pkgname); > + } > + > + if(postinstallaction->action != NULL) > + { > + free(postinstallaction->action); > + } > + > + free(postinstallaction); > +} > + > void _alpm_handle_free(pmhandle_t *handle) > { > ALPM_LOG_FUNC; > @@ -84,6 +101,8 @@ void _alpm_handle_free(pmhandle_t *handle) > FREELIST(handle->noextract); > FREELIST(handle->ignorepkg); > FREELIST(handle->ignoregrp); > + alpm_list_free_inner(handle->postinstallactions, postinstallactionfree); > + alpm_list_free(handle->postinstallactions); > FREE(handle); > } > > @@ -453,6 +472,52 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) > return(0); > } > > +int SYMEXPORT alpm_option_add_postinstallaction(const char *pkg, const char *action) > +{ > + postinstallaction_t *postinstallaction=0; > + > + postinstallaction=malloc(sizeof(postinstallaction_t)); > + > + if(postinstallaction == NULL) { > + return(1); > + } > + > + postinstallaction->pkgname = strdup(pkg); > + postinstallaction->action= strdup(action); > + > + handle->postinstallactions = alpm_list_add(handle->postinstallactions, postinstallaction); > + > + return(0); > +} > + > +/* Duplicated here for now, cleanup needed */ > +static int postinstallcompare(const void *postinstalldata, const void *pkgname) > +{ > + const postinstallaction_t *postinstallaction=postinstalldata; > + > + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { > + return(0); > + } > + > + return(1); > +} > + > +int SYMEXPORT alpm_option_remove_postinstallaction(const char *pkg) > +{ > + postinstallaction_t *postinstallaction=0; > + > + handle->postinstallactions=alpm_list_remove(handle->postinstallactions, pkg, postinstallcompare, (void *)&postinstallaction ); > + > + if( postinstallaction != NULL) { > + free(postinstallaction->pkgname); > + free(postinstallaction->action); > + free(postinstallaction); > + return(1); > + } > + > + return(0); > +} > + > void SYMEXPORT alpm_option_add_noextract(const char *pkg) > { > handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); > diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h > index ad7666d..c53e7f6 100644 > --- a/lib/libalpm/handle.h > +++ b/lib/libalpm/handle.h > @@ -28,6 +28,11 @@ > #include "alpm.h" > #include "trans.h" > > +typedef struct _postinstallaction_t { > + char *pkgname; > + char *action; > +} postinstallaction_t; > + > typedef struct _pmhandle_t { > /* internal usage */ > pmdb_t *db_local; /* local db pointer */ > @@ -53,6 +58,7 @@ typedef struct _pmhandle_t { > alpm_list_t *noextract; /* List of files NOT to extract */ > alpm_list_t *ignorepkg; /* List of packages to ignore */ > alpm_list_t *ignoregrp; /* List of groups to ignore */ > + alpm_list_t *postinstallactions; /* List of packages to perform actions postinstall */ > > /* options */ > unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ > diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c > index 59916d6..1f1371d 100644 > --- a/src/pacman/pacman.c > +++ b/src/pacman/pacman.c > @@ -549,6 +549,24 @@ static void option_add_syncfirst(const char *name) { > config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); > } > > +/* helper for being used with setrepeatingoption, additional parsing done here*/ > +static void option_add_postinstallaction(const char *string) { > + char *name = (char *)string; > + char *action = 0; > + > + action=strchr(string,':'); > + > + if( action != NULL) { > + *action = '\0'; > + action++; > + > + pm_printf(PM_LOG_DEBUG, "config: Postinstallaction package %s action: %s\n", name, action); > + > + alpm_option_add_postinstallaction(name, action); > + } > + > +} > + > /** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm > * settings. Refactored out of the parseconfig code since all of them did > * the exact same thing and duplicated code. > @@ -710,6 +728,8 @@ static int _parseconfig(const char *file, const char *givensection, > setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); > } else if(strcmp(key, "SyncFirst") == 0) { > setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); > + } else if(strcmp(key, "PostInstallAction") == 0) { > + setrepeatingoption(ptr, "PostInstallAction", option_add_postinstallaction); > } else if(strcmp(key, "DBPath") == 0) { > /* don't overwrite a path specified on the command line */ > if(!config->dbpath) { > _______________________________________________ pacman-dev mailing list pacman-dev(a)archlinux.org http://www.archlinux.org/mailman/listinfo/pacman-dev

2 4

Re: [pacman-dev] [PATCH] Add support for user defined per package post install actions
by Mårten Olsson 01 Feb '09

01 Feb '09

Hi all! Wasn't sure if I could include additonal text in "patch-mail". So I hope it is ok to send an additonal mail with extra info: At some places the code needs cleanup which I will do if the concept shown is accepted (didn't want to take to much time on that if the concept is disliked and never will be accpeted for that reason). I want to fix the code-duplication issue (one function) and make the parsign so one can have arguments with spaces inside " ". I wasn't sure if this functionality can be considered dangerous because it will run a script with full access to the system, but I guess the same problem could show up if you make "bad" packages with an install script. BR, Mårten ----- Original Message ----- From: "Mårten Olsson" <marten.olsson(a)purplescout.se> To: pacman-dev(a)archlinux.org Sent: Sunday, February 1, 2009 2:36:46 AM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna Subject: [pacman-dev] [PATCH] Add support for user defined per package post install actions This adds suport for user to add per package post install actions, somewhat similar to post-install scripts in packages but controlled by local user and not part of package/not done by package maintainer. The actions is performed by "system" call and can't contain spaces (not even when inside "). Syntax in logfile is PostInstallAction = <packagename>:<action> Functionality added inside libalpm, add support for configuring in pacman. Signed-off-by: Mårten Olsson <marten.olsson_at_purplescout.se> --- lib/libalpm/add.c | 43 +++++++++++++++++++++++++++++++++ lib/libalpm/alpm.h | 3 ++ lib/libalpm/handle.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 6 ++++ src/pacman/pacman.c | 20 +++++++++++++++ 5 files changed, 137 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6eb2085..1cd6e28 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -632,6 +632,46 @@ static int extract_single_file(struct archive *archive, return(errors); } +static int postinstallcompare(const void *postinstalldata, const void *pkgname) +{ + const postinstallaction_t *postinstallaction=postinstalldata; + + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { + return(0); + } + + return(1); +} + +/** Test if a package has a postinstallaction associated with it and executes the action. + * + * Checks if the package has a postinstallaction associated with it + * and if so executes the action by the system call + * + * @param pkg the package to test + * + * @return 0 if no action found or if the associated action completed succesfully, 1 otherwise + */ +static int check_run_postinstallaction(pmpkg_t *pkg) +{ + postinstallaction_t *postinstallaction = NULL; + + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: finding PostInstallAction for package: %s\n", alpm_pkg_get_name(pkg)); + + postinstallaction=alpm_list_find(handle->postinstallactions, alpm_pkg_get_name(pkg), postinstallcompare); + + if( postinstallaction != NULL) { + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: package: %s action: %s \n", postinstallaction->pkgname, postinstallaction->action); + + /* should this be more like the install-scriptlet code */ + if( system(postinstallaction->action) != 0) { + return(1); + } + } + + return(0); +} + static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, pmtrans_t *trans, pmdb_t *db) { @@ -847,6 +887,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } } + /* check and run postinstall action */ + check_run_postinstallaction(newpkg); + if(is_upgrade) { EVENT(trans, PM_TRANS_EVT_UPGRADE_DONE, newpkg, oldpkg); } else { diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7b7ca4e..04ff886 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -122,6 +122,9 @@ void alpm_option_add_noupgrade(const char *pkg); void alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); +int alpm_option_add_postinstallaction(const char *pkg, const char *action); +int alpm_option_remove_postinstallaction(const char *pkg); + alpm_list_t *alpm_option_get_noextracts(); void alpm_option_add_noextract(const char *pkg); void alpm_option_set_noextracts(alpm_list_t *noextract); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 813f439..504157d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -53,6 +53,23 @@ pmhandle_t *_alpm_handle_new() return(handle); } +void postinstallactionfree(void *data) +{ + postinstallaction_t *postinstallaction=data; + + if(postinstallaction->pkgname != NULL) + { + free(postinstallaction->pkgname); + } + + if(postinstallaction->action != NULL) + { + free(postinstallaction->action); + } + + free(postinstallaction); +} + void _alpm_handle_free(pmhandle_t *handle) { ALPM_LOG_FUNC; @@ -84,6 +101,8 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noextract); FREELIST(handle->ignorepkg); FREELIST(handle->ignoregrp); + alpm_list_free_inner(handle->postinstallactions, postinstallactionfree); + alpm_list_free(handle->postinstallactions); FREE(handle); } @@ -453,6 +472,52 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) return(0); } +int SYMEXPORT alpm_option_add_postinstallaction(const char *pkg, const char *action) +{ + postinstallaction_t *postinstallaction=0; + + postinstallaction=malloc(sizeof(postinstallaction_t)); + + if(postinstallaction == NULL) { + return(1); + } + + postinstallaction->pkgname = strdup(pkg); + postinstallaction->action= strdup(action); + + handle->postinstallactions = alpm_list_add(handle->postinstallactions, postinstallaction); + + return(0); +} + +/* Duplicated here for now, cleanup needed */ +static int postinstallcompare(const void *postinstalldata, const void *pkgname) +{ + const postinstallaction_t *postinstallaction=postinstalldata; + + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { + return(0); + } + + return(1); +} + +int SYMEXPORT alpm_option_remove_postinstallaction(const char *pkg) +{ + postinstallaction_t *postinstallaction=0; + + handle->postinstallactions=alpm_list_remove(handle->postinstallactions, pkg, postinstallcompare, (void *)&postinstallaction ); + + if( postinstallaction != NULL) { + free(postinstallaction->pkgname); + free(postinstallaction->action); + free(postinstallaction); + return(1); + } + + return(0); +} + void SYMEXPORT alpm_option_add_noextract(const char *pkg) { handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index ad7666d..c53e7f6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -28,6 +28,11 @@ #include "alpm.h" #include "trans.h" +typedef struct _postinstallaction_t { + char *pkgname; + char *action; +} postinstallaction_t; + typedef struct _pmhandle_t { /* internal usage */ pmdb_t *db_local; /* local db pointer */ @@ -53,6 +58,7 @@ typedef struct _pmhandle_t { alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *ignoregrp; /* List of groups to ignore */ + alpm_list_t *postinstallactions; /* List of packages to perform actions postinstall */ /* options */ unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..1f1371d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -549,6 +549,24 @@ static void option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); } +/* helper for being used with setrepeatingoption, additional parsing done here*/ +static void option_add_postinstallaction(const char *string) { + char *name = (char *)string; + char *action = 0; + + action=strchr(string,':'); + + if( action != NULL) { + *action = '\0'; + action++; + + pm_printf(PM_LOG_DEBUG, "config: Postinstallaction package %s action: %s\n", name, action); + + alpm_option_add_postinstallaction(name, action); + } + +} + /** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm * settings. Refactored out of the parseconfig code since all of them did * the exact same thing and duplicated code. @@ -710,6 +728,8 @@ static int _parseconfig(const char *file, const char *givensection, setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); + } else if(strcmp(key, "PostInstallAction") == 0) { + setrepeatingoption(ptr, "PostInstallAction", option_add_postinstallaction); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { -- 1.6.1.2 _______________________________________________ pacman-dev mailing list pacman-dev(a)archlinux.org http://www.archlinux.org/mailman/listinfo/pacman-dev

2 1

[pacman-dev] [PATCH] Add support for user defined per package post install actions
by Mårten Olsson 01 Feb '09

01 Feb '09

This adds suport for user to add per package post install actions, somewhat similar to post-install scripts in packages but controlled by local user and not part of package/not done by package maintainer. The actions is performed by "system" call and can't contain spaces (not even when inside "). Syntax in logfile is PostInstallAction = <packagename>:<action> Functionality added inside libalpm, add support for configuring in pacman. Signed-off-by: Mårten Olsson <marten.olsson_at_purplescout.se> --- lib/libalpm/add.c | 43 +++++++++++++++++++++++++++++++++ lib/libalpm/alpm.h | 3 ++ lib/libalpm/handle.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 6 ++++ src/pacman/pacman.c | 20 +++++++++++++++ 5 files changed, 137 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6eb2085..1cd6e28 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -632,6 +632,46 @@ static int extract_single_file(struct archive *archive, return(errors); } +static int postinstallcompare(const void *postinstalldata, const void *pkgname) +{ + const postinstallaction_t *postinstallaction=postinstalldata; + + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { + return(0); + } + + return(1); +} + +/** Test if a package has a postinstallaction associated with it and executes the action. + * + * Checks if the package has a postinstallaction associated with it + * and if so executes the action by the system call + * + * @param pkg the package to test + * + * @return 0 if no action found or if the associated action completed succesfully, 1 otherwise + */ +static int check_run_postinstallaction(pmpkg_t *pkg) +{ + postinstallaction_t *postinstallaction = NULL; + + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: finding PostInstallAction for package: %s\n", alpm_pkg_get_name(pkg)); + + postinstallaction=alpm_list_find(handle->postinstallactions, alpm_pkg_get_name(pkg), postinstallcompare); + + if( postinstallaction != NULL) { + _alpm_log(PM_LOG_DEBUG, "PostInstallAction: package: %s action: %s \n", postinstallaction->pkgname, postinstallaction->action); + + /* should this be more like the install-scriptlet code */ + if( system(postinstallaction->action) != 0) { + return(1); + } + } + + return(0); +} + static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, pmtrans_t *trans, pmdb_t *db) { @@ -847,6 +887,9 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } } + /* check and run postinstall action */ + check_run_postinstallaction(newpkg); + if(is_upgrade) { EVENT(trans, PM_TRANS_EVT_UPGRADE_DONE, newpkg, oldpkg); } else { diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7b7ca4e..04ff886 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -122,6 +122,9 @@ void alpm_option_add_noupgrade(const char *pkg); void alpm_option_set_noupgrades(alpm_list_t *noupgrade); int alpm_option_remove_noupgrade(const char *pkg); +int alpm_option_add_postinstallaction(const char *pkg, const char *action); +int alpm_option_remove_postinstallaction(const char *pkg); + alpm_list_t *alpm_option_get_noextracts(); void alpm_option_add_noextract(const char *pkg); void alpm_option_set_noextracts(alpm_list_t *noextract); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 813f439..504157d 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -53,6 +53,23 @@ pmhandle_t *_alpm_handle_new() return(handle); } +void postinstallactionfree(void *data) +{ + postinstallaction_t *postinstallaction=data; + + if(postinstallaction->pkgname != NULL) + { + free(postinstallaction->pkgname); + } + + if(postinstallaction->action != NULL) + { + free(postinstallaction->action); + } + + free(postinstallaction); +} + void _alpm_handle_free(pmhandle_t *handle) { ALPM_LOG_FUNC; @@ -84,6 +101,8 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noextract); FREELIST(handle->ignorepkg); FREELIST(handle->ignoregrp); + alpm_list_free_inner(handle->postinstallactions, postinstallactionfree); + alpm_list_free(handle->postinstallactions); FREE(handle); } @@ -453,6 +472,52 @@ int SYMEXPORT alpm_option_remove_noupgrade(const char *pkg) return(0); } +int SYMEXPORT alpm_option_add_postinstallaction(const char *pkg, const char *action) +{ + postinstallaction_t *postinstallaction=0; + + postinstallaction=malloc(sizeof(postinstallaction_t)); + + if(postinstallaction == NULL) { + return(1); + } + + postinstallaction->pkgname = strdup(pkg); + postinstallaction->action= strdup(action); + + handle->postinstallactions = alpm_list_add(handle->postinstallactions, postinstallaction); + + return(0); +} + +/* Duplicated here for now, cleanup needed */ +static int postinstallcompare(const void *postinstalldata, const void *pkgname) +{ + const postinstallaction_t *postinstallaction=postinstalldata; + + if( (pkgname != NULL) && (postinstallaction->pkgname != NULL) && (strcmp(postinstallaction->pkgname, pkgname) == 0)) { + return(0); + } + + return(1); +} + +int SYMEXPORT alpm_option_remove_postinstallaction(const char *pkg) +{ + postinstallaction_t *postinstallaction=0; + + handle->postinstallactions=alpm_list_remove(handle->postinstallactions, pkg, postinstallcompare, (void *)&postinstallaction ); + + if( postinstallaction != NULL) { + free(postinstallaction->pkgname); + free(postinstallaction->action); + free(postinstallaction); + return(1); + } + + return(0); +} + void SYMEXPORT alpm_option_add_noextract(const char *pkg) { handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index ad7666d..c53e7f6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -28,6 +28,11 @@ #include "alpm.h" #include "trans.h" +typedef struct _postinstallaction_t { + char *pkgname; + char *action; +} postinstallaction_t; + typedef struct _pmhandle_t { /* internal usage */ pmdb_t *db_local; /* local db pointer */ @@ -53,6 +58,7 @@ typedef struct _pmhandle_t { alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *ignoregrp; /* List of groups to ignore */ + alpm_list_t *postinstallactions; /* List of packages to perform actions postinstall */ /* options */ unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..1f1371d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -549,6 +549,24 @@ static void option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); } +/* helper for being used with setrepeatingoption, additional parsing done here*/ +static void option_add_postinstallaction(const char *string) { + char *name = (char *)string; + char *action = 0; + + action=strchr(string,':'); + + if( action != NULL) { + *action = '\0'; + action++; + + pm_printf(PM_LOG_DEBUG, "config: Postinstallaction package %s action: %s\n", name, action); + + alpm_option_add_postinstallaction(name, action); + } + +} + /** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm * settings. Refactored out of the parseconfig code since all of them did * the exact same thing and duplicated code. @@ -710,6 +728,8 @@ static int _parseconfig(const char *file, const char *givensection, setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); + } else if(strcmp(key, "PostInstallAction") == 0) { + setrepeatingoption(ptr, "PostInstallAction", option_add_postinstallaction); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { -- 1.6.1.2

1 0

[pacman-dev] makepkg with split support - success report
by Jan Mette 29 Jan '09

29 Jan '09

Hi guys, i have just finished a port of our KDEmod PKGBUILDs to makepkg with split support and want to tell you that everything works just dandy :) All 390 packages are building fine, no workarounds or crazy stuff needed. Greetings Jan

3 2

Re: [pacman-dev] Hooks for pacman
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 28 Jan '09

28 Jan '09

Am Samstag, den 24.01.2009, 00:52 +1000 schrieb Allan McRae: > Marc - A. Dahlhaus [ Administration | Westermann GmbH ] wrote: > > Hello, > > what about an approach that keeps all settings of a specific hook inside > > the hook script itself? This would just work after deployment of a hook > > script in /etc/pacman.d/hooks.d without any configuration file hassle. > > The Hooks would be self contained in files that pacman could source > > before doing anything. And if someone wants to know what a hook do and > > when it will be used there is only one place to look. > > > > Marc > > > The one problem I see with that is that the actual script needs to be > run. The post_install scripts etc, just source and run the script in a > shell. This becomes more difficult if we have to keep information what > files trigger the hooks to be run and when. > > Allan The point was that this way you can install new hooks with packages and they would just work without any configuration file fiddling. It would be cleaner for a packager in my opinion. Marc

4 6

[pacman-dev] My (hopefully) final patches
by Bryan Ischo 26 Jan '09

26 Jan '09

Hey all. These 3 patches take into consideration all feedback from Dan McGee. Please let me know if there is anything preventing them from being accepted. Thanks. Bryan

1 0

[pacman-dev] [PATCH 1/4] Internal code reorganization in preparation for changes to package resolution.
by Bryan Ischo 26 Jan '09

26 Jan '09

This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the tranasaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/deps.c | 64 +++++++++++++++++++++++++++++++++++++++++++--------- lib/libalpm/deps.h | 5 ++- lib/libalpm/sync.c | 52 +++++++++++++++++++++++++++++++++--------- 3 files changed, 97 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 940f12c..a5b57ad 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -546,17 +546,33 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud return(NULL); } -/* populates list with packages that need to be installed to satisfy all - * dependencies of packages in list - * - * @param remove contains packages elected for removal +/* Computes resolvable dependencies for a given package and adds that package + * and those resolvable dependencies to a list. + * + * @param local is the local database + * @param dbs_sync are the sync databases + * @param pkg is the package to resolve + * @param packages is a pointer to a list of packages which will be + * searched first for any dependency packages needed to complete the + * resolve, and to which will be added any [pkg] and all of its + * dependencies not already on the list + * @param remove is the set of packages which will be removed in this + * transaction + * @param data returns the dependency which could not be satisfied in the + * event of an error + * @return 0 on success, with [pkg] and all of its dependencies not already on + * the [*packages] list added to that list, or -1 on failure due to an + * unresolvable dependency, in which case the [*packages] list will be + * unmodified by this function */ -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data) +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, + alpm_list_t **packages, alpm_list_t *remove, + alpm_list_t **data) { alpm_list_t *i, *j; alpm_list_t *targ; alpm_list_t *deps = NULL; + alpm_list_t *working; ALPM_LOG_FUNC; @@ -564,8 +580,21 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, return(-1); } + if(_alpm_pkg_find(*packages, pkg->name) != NULL) { + /* It's already on the list, meaning it's already been resolved and + it and all of its dependencies have already been added */ + return(0); + } + + /* [pkg] has not already been resolved into the packages list, so put it + * on that list */ + *packages = alpm_list_add(*packages, pkg); + /* And keep track of the head of the newly-added elements, so that they + can be quickly cut from the list on error */ + working = alpm_list_last(*packages); + _alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n"); - for(i = list; i; i = i->next) { + for(i = working; i; i = i->next) { pmpkg_t *tpkg = i->data; targ = alpm_list_add(NULL, tpkg); deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); @@ -573,12 +602,12 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, for(j = deps; j; j = j->next) { pmdepmissing_t *miss = j->data; pmdepend_t *missdep = alpm_miss_get_dep(miss); - /* check if one of the packages in list already satisfies this dependency */ - if(_alpm_find_dep_satisfier(list, missdep)) { + /* check if one of the packages in the [*packages] list already satisfies this dependency */ + if(_alpm_find_dep_satisfier(*packages, missdep)) { continue; } /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, list, tpkg); + pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, tpkg); if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); @@ -592,13 +621,26 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, *data = alpm_list_add(*data, missd); } } + /* Remove all packages that were added to [*packages], so that + * we return from error cleanly without having affected the + * [*packages] list. Detach the tail of the list beginning at + * [working] from the packages list and free it. */ + if (working == *packages) { + *packages = NULL; + } + else { + (*packages)->prev = working->prev; + (*packages)->prev->next = NULL; + working->prev = NULL; + } + alpm_list_free(working); alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); return(-1); } else { _alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); - list = alpm_list_add(list, spkg); + *packages = alpm_list_add(*packages, spkg); } } alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 2f3c450..9dca91d 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -48,8 +48,9 @@ void _alpm_depmiss_free(pmdepmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, pmpkg_t *tpkg); -int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list, - alpm_list_t *remove, alpm_list_t **data); +int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, + alpm_list_t **packages, alpm_list_t *remove, + alpm_list_t **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); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index b458874..5daadbd 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -399,6 +399,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync { alpm_list_t *deps = NULL; alpm_list_t *list = NULL, *remove = NULL; /* allow checkdeps usage with trans->packages */ + alpm_list_t *unresolvable = NULL; alpm_list_t *i, *j; int ret = 0; @@ -411,15 +412,14 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync *data = NULL; } - for(i = trans->packages; i; i = i->next) { - pmsyncpkg_t *sync = i->data; - list = alpm_list_add(list, sync->pkg); - } - - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { - /* store a pointer to the last original target so we can tell what was - * pulled by resolvedeps */ - alpm_list_t *pulled = alpm_list_last(list); + if(trans->flags & PM_TRANS_FLAG_NODEPS) { + /* Simply build up [list] from all of the transaction packages */ + for(i = trans->packages; i; i = i->next) { + pmsyncpkg_t *sync = i->data; + list = alpm_list_add(list, sync->pkg); + } + } else { + /* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); @@ -432,14 +432,43 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } } - if(_alpm_resolvedeps(db_local, dbs_sync, list, remove, data) == -1) { + /* Resolve packages in the transaction one at a time, in addtion + building up a list of packages which could not be resolved. */ + for(i = trans->packages; i; i = i->next) { + pmpkg_t *pkg = ((pmsyncpkg_t *) i->data)->pkg; + if(_alpm_resolvedeps(db_local, dbs_sync, pkg, &list, remove, data) == -1) { + /* Failed to resolve a dependency of [pkg]. It goes on the + unresolvable list. [list] was not touched, so no + unnecessary dependency packages were added to it. */ + unresolvable = alpm_list_add(unresolvable, pkg); + } + /* Else, [list] now additionally contains [pkg] and all of its + dependencies not already on the list */ + } + + /* If there were unresolvable top-level packages, fail the + transaction. In a future checkin, the user will be asked if they'd + like to drop the unresolvable packages intead. */ + if(unresolvable != NULL) { /* pm_errno is set by resolvedeps */ ret = -1; goto cleanup; } - for(i = pulled->next; i; i = i->next) { + /* Add all packages which were "pulled" (i.e. weren't already in the + transaction) to the transaction in pmsyncpkg_t structures */ + for(i = list; i; i = i->next) { pmpkg_t *spkg = i->data; + for(j = trans->packages; j; j = j->next) { + if(_alpm_pkg_cmp(spkg, ((pmsyncpkg_t *) j->data)->pkg) == 0) { + spkg = NULL; + break; + } + } + if (spkg == NULL) { + continue; + } + pmsyncpkg_t *sync = _alpm_sync_new(PM_PKG_REASON_DEPEND, spkg, NULL); if(sync == NULL) { ret = -1; @@ -627,6 +656,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync cleanup: alpm_list_free(list); alpm_list_free(remove); + alpm_list_free(unresolvable); return(ret); }

2 5

[pacman-dev] Hooks for pacman
by Allan McRae 23 Jan '09

23 Jan '09

Hi all, A new feature I am ever so slightly obsessed about at the moment is the possibility of having hooks in pacman for doing common tasks in install files. e.g. adding info pages to directory, updating font/icon/.desktop cache, gconf stuff... So, how would this be implemented? Here is my outline: Two types of hooks would be needed for both install and remove. One type that is run for every matching file (e.g. info install) and one type that is run once per transaction (e.g. font cache update). These could be stored in /etc/pacman.d/hooks/ with an index of hooks in /etc/pacman.d/hooks.conf. The .conf file could look something like: [add] PerFile = infopage /usr/share/info/ PerTrans = fontcache /usr/share/fonts/ [remove] ... That needs improvement, but that covers the information that needs presented - whether the hook is run per file or per transaction, the name of the hook and the directory whose files set off this hook. Maybe the conditions that set the hook off should be in the actual hook file. I guess the actual hook would look look just like: hook() { do stuff here... } I figure we must already generate a list of all the files being added/removed during conflict checks, so we would "just" need to scan that list for what hooks need to be run and actually run them. Anyway, I thought I would post this idea here so I could get more feedback on the implementation and maybe convince someone to code it... Allan

4 7

[pacman-dev] patches needed for splitpkg work
by Allan McRae 21 Jan '09

21 Jan '09

Hi all, I am a bit busy with $DAYJOB at the moment so I thought I would post some of the things that need tidied up in makepkg (mainly for the splitpkg implementation) so others might fix them. These are all fairly trivial and probably just need a loop over ${pkgname[*]}: - check all packages in "exists" checks (package and source package) - fix cleanup of log files (note change in file name in build() & package() function) - fix delta creation - fix install packages This is a bit more in depth... (probably requires backup and restore) - value of "$pkgname" in build() & package() functions These require discussion on how best to fix. I thought of adding a grpname entry in the PKGBUILD for this and defaulting to $pkgname[0] if not present. Opinions? - pkgname used for source package (??? what to use...) - how to deal with $pkgname in messages - "is not available for the ? architecture" - "Making package" - "Finished making" Cheers, Allan

1 0

[pacman-dev] My patches (again)
by Bryan Ischo 21 Jan '09

21 Jan '09

Hi all. I've noticed that other commits have gone into the pacman master repository (what is the exact git terminology for the master repository?) but that the patches that I sent to the list have not. Are mine going in? Or is the team waiting on something from me? Or have my patches been rejected? My most recent emails should have patches which easily and cleanly apply to the tree. Thanks, Bryan

3 3

Re: [pacman-dev] icadyptes makepkg changes
by Teran McKinney 20 Jan '09

20 Jan '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I was subscribed to the pacman-dev list on my old email account, but just moved it over. I noticed the thread about Icadyptes' makepkg changes and got Allan's message. I would be happy to see some of Icadyptes' makepkg changes make it into the mainline makepkg, but I doubt all of them will (on top of that, some of my code is quite hackish). Some features are implemented nicely, though others are definitely a work in progress. Most changes were applied to the 3.2.1 makepkg, and I have not updated it for split package support and some of the other changes. I will list the changes I can remember by order of how useful I think they would be to the mainline makepkg. Most useful: runtimedeps=(): I added a runtimedeps=() option for dependencies that are needed at runtime and not for building. This would be useful for scripts that only need a `make install DESTDIR="$pkgdir"` on the building side. I've used it a few times already, but it is not the most common case. Not setting arch=() implies arch=('any'): After a couple months of development, some benchmarks, and finding that AMD K6-2s lack the CMOV instruction, I moved Icadyptes to i486/generic. It is frustrating (though scriptable) to change all buildscripts from arch=('i686' 'x86_64) to arch=('i486' 'x86_64), but I did not care for the setup from the begining. Rarely is a source tarball only buildable on one x86 subset, and I don't like having to write arch=('any') in each buildscript, so I made arch=('any') the default if no arch line was set. I think that this could be expanded a bit with negation flags for archs, ie arch=('!i486' 'i686'). Or perhaps arch=('i586+'), but that is getting a little complex and overdone in my opinion. Potentially useful: Replacing checksums inside the PKGBUILD with SHA256SUMs in a CHECKSUMS file: Originally, I kept the {md5,sha1}sums=() lines in buildscripts, but couldn't be bothered to update them if the source files were updated. This needs a lot of work, but I simplified the code gutting the PKGBUILD-internal checksums and replaced it with a seperate CHECKSUMS file containing SHA256SUMs of $source=() and $install. One can simply run `makepkg -g` to regenerate the checksums now, which is quite nice. Other scripts would have to be updated to copy CHECKSUMS over, but I have had no issues with it after some minor tweaking here. $SRCDEST using SHA256SUMs as the filenames: This needs work too, but if you are using a shared source directory makepkg will download the source files, verify them against CHECKSUMS, and move them to $SRCDEST. Using $SRCDEST with the normal filenames is problematic due to filename collision with other packages, so this is an (IMO) elegant and safe solution. I used SHA256 because MD5 is very insecure, SHA1 is potentially vulnerable, and it isn't as overkill (though some would say SHA256 is excessive) as SHA512. While an attacker could do a number of attacks to give the user faulty build scripts, at least this part of the system is secure. Of course, any checksum algorithim can be used. Doubt you would want these: Removal of OS X hacks: I can mostly understand using alternative utilities so that *BSDs can use makepkg, but I have no idea of why you care about Mac OS X enough to implement slower and more bloated workarounds to things like getopt. In my opinion, you have to draw the line somewhere. I personally think that makepkg and Pacman should be solely for Arch, but that is just my two cents. Removal of OpenSSL dependencies: I don't care for OpenSSL and try to replace it with GnuTLS where I can, so I reverted back to using the *sum utilities. GnuTLS is lighter, easier to build, and doesn't have the advertising license clause that OpenSSL does. Of course, the *sum utilities are from GNU coreutils, not GnuTLS. Moving to GNU tar from bsdtar so that libarchive can eventually be removed entirely as a package. Although libarchive looks fairly nice, so I should do some more research on this. Pacman changes: Pacman is currently pretty vanilla in Icadyptes, but I apply the reverted patch for internal file:// handling, statically link it against libarchive, use curl (you may want to look at my {pacman,makepkg}.conf as they pass a couple more flags), and generally have fairly light configure options (disabling NLS, etc.). I also use .ipkg for the package extension, but I don't think any of this is very usable by the mainstream Pacman :-). Thanks for the interest in my makepkg modifications. Let me know if you have any comments, ideas, or suggestions. Cheers, Teran (sega01) On Tue, 20 Jan 2009 14:58:50 +0000 "Teran McKinney" <sega01(a)gmail.com> wrote: > Forwarded conversation > Subject: [pacman-dev] icadyptes makepkg changes > ------------------------ > > From: Allan McRae <allan(a)archlinux.org> > Date: Tue, Jan 20, 2009 at 12:20 > To: Discussion list for pacman development <pacman-dev(a)archlinux.org> > > > Hi, > > This is a reminder for myself and a FYI for anyone else that is > interested. There is a new Arch fork called Icadyptes > (http://icadyptes.org/) which does some changes to makepkg and to a > lesser extend pacman (see http://icadyptes.org/index.php?q=node/2) > Their git repo is here: > http://gitweb.icadyptes.org/?p=icadyptes-core/.git;a=tree;f=base/pacman;hb=… > > Maybe there is something useful there that would worth merging. > Adding something like "runtimedeps" has been previously suggested but > from memory the patch never got updated for inclusion. Other makepkg > changes listed will probably never make it here... > Anyway, I will give the Icadyptes dev a ping to suggest that any > changes could/should be CCed here so we can decide whether to include > them. > > Allan > > > _______________________________________________ > pacman-dev mailing list > pacman-dev(a)archlinux.org > http://www.archlinux.org/mailman/listinfo/pacman-dev > > ---------- > From: Dan McGee <dpmcgee(a)gmail.com> > Date: Tue, Jan 20, 2009 at 13:48 > To: Discussion list for pacman development <pacman-dev(a)archlinux.org> > > > Their changes do sound interesting. Please do send them an email. > > -Dan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) iF4EAREIAAYFAkl2HbQACgkQPsLC06eiyfF1CwD/dl9UgD7VK+5NDnNzSJhFL+kZ u50RnWVRx1ZxikzBVXsBAK6vh2PpdWva05+0cZL563DtWP/q+SXMLiECQCl0WsnM =4/Q8 -----END PGP SIGNATURE-----

1 0

[pacman-dev] [PATCH 1/3] alpm_unpack : change prefix handling to workaround FS#12148.
by Xavier Chantry 20 Jan '09

20 Jan '09

Instead of appending the prefix to each entry name, we can chdir to the prefix before extracting, and restoring when it is done. This seems to work better with the strange and special case of FS#12148 where an archive contained the "./" entry. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/util.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 1bec634..2af2f1f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -291,16 +291,17 @@ int _alpm_lckrm() */ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) { - int ret = 1; + int ret = 0; mode_t oldmask; struct archive *_archive; struct archive_entry *entry; - char expath[PATH_MAX]; + char cwd[PATH_MAX]; + int restore_cwd = 0; ALPM_LOG_FUNC; if((_archive = archive_read_new()) == NULL) - RET_ERR(PM_ERR_LIBARCHIVE, -1); + RET_ERR(PM_ERR_LIBARCHIVE, 1); archive_read_support_compression_all(_archive); archive_read_support_format_all(_archive); @@ -309,10 +310,25 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive, archive_error_string(_archive)); - RET_ERR(PM_ERR_PKG_OPEN, -1); + RET_ERR(PM_ERR_PKG_OPEN, 1); } oldmask = umask(0022); + + /* save the cwd so we can restore it later */ + if(getcwd(cwd, PATH_MAX) == NULL) { + _alpm_log(PM_LOG_ERROR, _("could not get current working directory\n")); + } else { + restore_cwd = 1; + } + + /* just in case our cwd was removed in the upgrade operation */ + if(chdir(prefix) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"), prefix, strerror(errno)); + ret = 1; + goto cleanup; + } + while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { const struct stat *st; const char *entryname; /* the name of the file in the archive */ @@ -337,10 +353,6 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) } /* Extract the archive entry. */ - ret = 0; - snprintf(expath, PATH_MAX, "%s/%s", prefix, entryname); - archive_entry_set_pathname(entry, expath); - int readret = archive_read_extract(_archive, entry, 0); if(readret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ @@ -361,6 +373,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) cleanup: umask(oldmask); archive_read_finish(_archive); + if(restore_cwd) { + chdir(cwd); + } return(ret); } -- 1.6.1

3 4

[pacman-dev] icadyptes makepkg changes
by Allan McRae 20 Jan '09

20 Jan '09

Hi, This is a reminder for myself and a FYI for anyone else that is interested. There is a new Arch fork called Icadyptes (http://icadyptes.org/) which does some changes to makepkg and to a lesser extend pacman (see http://icadyptes.org/index.php?q=node/2) Their git repo is here: http://gitweb.icadyptes.org/?p=icadyptes-core/.git;a=tree;f=base/pacman;hb=… Maybe there is something useful there that would worth merging. Adding something like "runtimedeps" has been previously suggested but from memory the patch never got updated for inclusion. Other makepkg changes listed will probably never make it here... Anyway, I will give the Icadyptes dev a ping to suggest that any changes could/should be CCed here so we can decide whether to include them. Allan

2 1

[pacman-dev] [PATCH] db_register: Unlink DbPath/database, if it is not a directory
by Nagy Gabor 19 Jan '09

19 Jan '09

From 884155e03bf20f1cca880f39848423091729f6cd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 19 Jan 2009 00:35:45 +0100 Subject: [PATCH] db_register: Unlink DbPath/database, if it is not a directory We had a check for this case, but we didn't handle it at all (neither error, nor fix), we also had a TODO in the code. For example, if user has an "unstable" regular file instead of "unstable" directory (FS#12148), from now on pacman will remove that file (and print a warning message). Before this patch pacman just stopped with "could not register database" error. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/db.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9b91ce4..fe886ae 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -452,13 +452,18 @@ pmdb_t *_alpm_db_register_local(void) RET_ERR(PM_ERR_DB_OPEN, NULL); } snprintf(path, PATH_MAX, "%slocal", dbpath); - /* TODO this is rediculous, we try to do this even if we can't */ - if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { + + if(stat(path, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + if(unlink(path) != 0 || _alpm_makepath(path) != 0) { + RET_ERR(PM_ERR_SYSTEM, NULL); + } } db = _alpm_db_new(dbpath, "local"); @@ -504,13 +509,18 @@ pmdb_t *_alpm_db_register_sync(const char *treename) } /* all sync DBs now reside in the sync/ subdir of the dbpath */ snprintf(path, PATH_MAX, "%ssync/%s", dbpath, treename); - /* TODO this is rediculous, we try to do this even if we can't */ - if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { + + if(stat(path, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(PM_LOG_WARNING, "removing bogus database: %s\n", path); + if(unlink(path) != 0 || _alpm_makepath(path) != 0) { + RET_ERR(PM_ERR_SYSTEM, NULL); + } } /* Ensure the db gets the real path. */ -- 1.6.1

2 2

[pacman-dev] pacman mirrors
by Amanai 19 Jan '09

19 Jan '09

I don't know what to do, but I know with the last pacman update with a seperated mirror list, my download speed went down to 40-80 k/sec. Before it was around 1700-2000 k/sec, using cable with 30 Mbits. I try to find the fastest server, but can't. Is it possible that pacman can use "geo_ip", that automatically find the nearest and fastest server. This works perfect with my openSUSE box. Now it looks like, after running pacman -Syu I spend a day to get all updates. I was set up mirror after mirror from this list http://users.archlinux.de/~gerbra/mirrorcheck.html the fastest I get now are 200 k/sec. with a Server out of date. ~ 10 hours out of date. Where is the fast california server gone?

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-4-g472e51b
by dan＠archlinux.org 18 Jan '09

18 Jan '09

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 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (commit) from 1191303f8b9edc01ff969e2433f5c40c9a95474a (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: lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-73-gc794661
by dan＠archlinux.org 18 Jan '09

18 Jan '09

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 c794661f1ea8c819d479948e92e5648de62787c5 (commit) via 8929769902597f109fc6b49609fb64121becb197 (commit) via 350c3eb6ec25b91b0402fa86422a7312ba7330d6 (commit) via 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (commit) from fba5771fa4c774457531a4bbbcd66340c7c3fb6a (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 c794661f1ea8c819d479948e92e5648de62787c5 Merge: 8929769902597f109fc6b49609fb64121becb197 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 18 13:48:48 2009 -0600 Merge branch 'maint' commit 8929769902597f109fc6b49609fb64121becb197 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 17 09:51:48 2009 -0600 makepkg: test fixes, part 2 The goal of this fix was empty string comparisons: - if [ "$pkgname" != "" ]; then + if [ -n "$pkgname" ]; then Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 350c3eb6ec25b91b0402fa86422a7312ba7330d6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 17 09:42:23 2009 -0600 makepkg: clean up test usage In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 +- lib/libalpm/util.c | 4 +- scripts/makepkg.sh.in | 135 +++++++++++++++++++++++++------------------------ 3 files changed, 72 insertions(+), 71 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use archive_entry_set_perm instead of archive_entry_set_mode
by Nagy Gabor 18 Jan '09

18 Jan '09

From 2b1a58bda8318b7d0c70a4cfc161a82a156b199b Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 18 Jan 2009 20:03:56 +0100 Subject: [PATCH] Use archive_entry_set_perm instead of archive_entry_set_mode This patch fixes FS#12148 ('unstable' regular file). I also changed the other archive_entry_set_mode usage in add.c to archive_entry_set_perm. Since I cannot find any relevant info in libarchive manual, I quote Tim Kientzle (the author of libarchive) here, and I say thank you for his help. *** Tim Kientzle wrote ************************************* This is the problem in libalpm/util.c: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, 0755); 327 } Your example unstable.db.tar.gz is not empty. It has one entry in it, called "./". That entry is marked as a directory. But, when you call archive_entry_set_mode(), you are changing the file type! archive_read_extract() then creates the file /var/unstable as you requested. (archive_read_extract() will replace an empty directory with a file.) You should either set the mode value correctly: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, IFREG | 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, IFDIR | 0755); 327 } Or use archive_entry_set_perm(), which does not change the file type: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_perm(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_perm(entry, 0755); 327 } ************************************************************ Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 23659c9..3c0074f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -292,12 +292,12 @@ static int extract_single_file(struct archive *archive, /* the install script goes inside the db */ snprintf(filename, PATH_MAX, "%s%s-%s/install", db->path, newpkg->name, newpkg->version); - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(strcmp(entryname, ".CHANGELOG") == 0) { /* the changelog goes inside the db */ snprintf(filename, PATH_MAX, "%s%s-%s/changelog", db->path, newpkg->name, newpkg->version); - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(*entryname == '.') { /* for now, ignore all files starting with '.' that haven't * already been handled (for future possibilities) */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5e6ca0c..1bec634 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -321,9 +321,9 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) entryname = archive_entry_pathname(entry); if(S_ISREG(st->st_mode)) { - archive_entry_set_mode(entry, 0644); + archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { - archive_entry_set_mode(entry, 0755); + archive_entry_set_perm(entry, 0755); } /* If a specific file was requested skip entries that don't match. */ -- 1.6.1

3 2

[pacman-dev] [PATCH 1/2] makepkg: clean up test usage
by Dan McGee 18 Jan '09

18 Jan '09

In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 100 ++++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1721048..c25a8d8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -129,7 +129,7 @@ error() { # the fakeroot call, the error message will be printed by the main call. ## trap_exit() { - if [ "$INFAKEROOT" = "0" ]; then + if [ $INFAKEROOT -eq 0 ]; then echo error "$@" fi @@ -143,12 +143,12 @@ trap_exit() { clean_up() { local EXIT_CODE=$? - if [ "$INFAKEROOT" = "1" ]; then + if [ $INFAKEROOT -eq 1 ]; then # Don't clean up when leaving fakeroot, we're not done yet. return fi - if [ $EXIT_CODE -eq 0 -a "$CLEANUP" = "1" ]; then + if [ $EXIT_CODE -eq 0 -a $CLEANUP -eq 1 ]; then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" rm -rf "$pkgdir" "$srcdir" @@ -277,7 +277,7 @@ get_downloadclient() { local i for i in "${DLAGENTS[@]}"; do local handler=$(echo $i | sed 's|::.*||') - if [ "$proto" == "$handler" ]; then + if [ "$proto" = "$handler" ]; then agent=$(echo $i | sed 's|^.*::||') break fi @@ -353,16 +353,16 @@ handledeps() { local deplist="$*" - if [ "$DEP_BIN" = "0" ]; then + if [ $DEP_BIN -eq 0 ]; then return $R_DEPS_MISSING fi - if [ "$DEP_BIN" = "1" ]; then + if [ $DEP_BIN -eq 1 ]; then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" local ret=0 - if [ "$ASROOT" = 0 ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? else pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? @@ -398,7 +398,7 @@ resolve_deps() { # check deps again to make sure they were resolved deplist="$(check_deps $*)" [ "$deplist" = "" ] && return $R_DEPS_SATISFIED - elif [ "$DEP_BIN" = "1" ]; then + elif [ $DEP_BIN -eq 1 ]; then error "$(gettext "Failed to install all missing dependencies.")" fi @@ -414,7 +414,7 @@ resolve_deps() { # fix flyspray bug #5923 remove_deps() { # $pkgdeps is a GLOBAL variable, set by resolve_deps() - [ "$RMDEPS" = "0" ] && return + [ $RMDEPS -eq 0 ] && return [ "$pkgdeps" = "" ] && return local dep depstrip deplist @@ -426,7 +426,7 @@ remove_deps() { msg "Removing installed dependencies..." local ret=0 - if [ "$ASROOT" = "0" ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? else pacman $PACMAN_OPTS -Rns $deplist || ret=$? @@ -686,7 +686,7 @@ run_build() { local shellopts=$(shopt -p) local ret=0 - if [ "$LOGGING" = "1" ]; then + if [ $LOGGING -eq 1 ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-build.log" if [ -f "$BUILDLOG" ]; then local i=1 @@ -736,7 +736,7 @@ run_package() { export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST local ret=0 - if [ "$LOGGING" = "1" ]; then + if [ $LOGGING -eq 1 ]; then BUILDLOG="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}-package.log" if [ -f "$BUILDLOG" ]; then local i=1 @@ -785,7 +785,7 @@ tidy_install() { msg2 "$(gettext "Purging other files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do - if [ "${pt}" == "${pt//\/}" ]; then + if [ "${pt}" = "${pt//\/}" ]; then find . -type f -name "${pt}" -exec rm -f -- '{}' \; else rm -f ${pt} @@ -881,7 +881,7 @@ create_package() { # write the .PKGINFO file msg2 "$(gettext "Generating .PKGINFO file...")" echo "# Generated by makepkg $myver" >.PKGINFO - if [ "$INFAKEROOT" = "1" ]; then + if [ $INFAKEROOT -eq 1 ]; then echo "# using $(fakeroot -v)" >>.PKGINFO fi echo "# $(LC_ALL=C date -u)" >>.PKGINFO @@ -1048,7 +1048,7 @@ create_xdelta() { create_srcpackage() { cd "$startdir" - if [ "$SOURCEONLY" = "2" ]; then + if [ $SOURCEONLY -eq 2 ]; then # get back to our src directory so we can begin with sources mkdir -p "$srcdir" cd "$srcdir" @@ -1084,7 +1084,7 @@ create_srcpackage() { if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" - elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then + elif [ $SOURCEONLY -eq 2 -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" fi @@ -1112,9 +1112,9 @@ create_srcpackage() { } install_package() { - [ "$INSTALL" = "0" ] && return + [ $INSTALL -eq 0 ] && return msg "$(gettext "Installing package ${pkgname} with pacman -U...")" - if [ "$ASROOT" = "0" ]; then + if [ $ASROOT -eq 0 ]; then sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? else pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? @@ -1124,7 +1124,7 @@ install_package() { devel_check() { newpkgver="" # Only update pkgver if --holdver is not set - if [ "$HOLDVER" = "1" ]; then + if [ $HOLDVER -eq 1 ]; then return fi # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe @@ -1453,13 +1453,13 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined -if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then +if [ $HOLDVER -eq 1 -a "$FORCE_VER" != "" ]; then # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi -if [ "$CLEANCACHE" = "1" ]; then +if [ $CLEANCACHE -eq 1 ]; then #fix flyspray feature request #5223 if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" @@ -1495,14 +1495,14 @@ if [ -z "$BUILDSCRIPT" ]; then exit 1 fi -if [ "$INFAKEROOT" = "0" ]; then - if [ $EUID -eq 0 -a "$ASROOT" = "0" ]; then +if [ $INFAKEROOT -eq 0 ]; then + if [ $EUID -eq 0 -a $ASROOT -eq 0 ]; then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" plain "$(gettext "wish to run as root, please use the --asroot option.")" exit 1 # $E_USER_ABORT - elif [ $EUID -gt 0 -a "$ASROOT" = "1" ]; then + elif [ $EUID -gt 0 -a $ASROOT -eq 1 ]; then # Warn those who try to use the --asroot option when they are not root error "$(gettext "The --asroot option is meant for the root user only.")" plain "$(gettext "Please rerun makepkg without the --asroot flag.")" @@ -1527,8 +1527,8 @@ else fi # check for sudo if we will need it during makepkg execution -if [ "$ASROOT" = "0" \ - -a $ "$DEP_BIN" = "1" -o "$RMDEPS" = "1" -o "$INSTALL" = "1" $ ]; then +if [ $ASROOT -eq 0 \ + -a $ $DEP_BIN -eq 1 -o $RMDEPS -eq 1 -o $INSTALL -eq 1 $ ]; then if [ ! "$(type -p sudo)" ]; then error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" @@ -1559,7 +1559,7 @@ fi source "$BUILDSCRIPT" -if [ "$GENINTEG" = "1" ]; then +if [ $GENINTEG -eq 1 ]; then mkdir -p "$srcdir" cd "$srcdir" download_sources @@ -1567,7 +1567,7 @@ if [ "$GENINTEG" = "1" ]; then exit 0 # $E_OK fi -if [ "$(type -t package)" == "function" ]; then +if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 fi @@ -1602,7 +1602,7 @@ if [ "$arch" = 'any' ]; then fi if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" = "0" ]; then + if [ $IGNOREARCH -eq 0 ]; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" plain "$(gettext "such as arch=('%s').")" "$CARCH" @@ -1650,8 +1650,8 @@ devel_check devel_update if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then - if [ "$INSTALL" = "1" ]; then + -a $FORCE -eq 0 -a $SOURCEONLY -eq 0 -a $NOBUILD -eq 0 ]; then + if [ $INSTALL -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? @@ -1662,10 +1662,10 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ fi # Run the bare minimum in fakeroot -if [ "$INFAKEROOT" = "1" ]; then - if [ "$SPLITPKG" = "0" ]; then - if [ "$PKGFUNC" = "0" ]; then - if [ "$REPKG" = "0" ]; then +if [ $INFAKEROOT -eq 1 ]; then + if [ $SPLITPKG -eq 0 ]; then + if [ $PKGFUNC -eq 0 ]; then + if [ $REPKG -eq 0 ]; then run_build fi else @@ -1693,9 +1693,9 @@ fi msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" != "0" ]; then +if [ $SOURCEONLY -ne 0 ]; then if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ - -a "$FORCE" = "0" ]; then + -a $FORCE -eq 0 ]; then error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 fi @@ -1705,9 +1705,9 @@ if [ "$SOURCEONLY" != "0" ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then +if [ $NODEPS -eq 1 -o $NOBUILD -eq 1 -o $REPKG -eq 1 ]; then # no warning message needed for nobuild, repkg - if [ "$NODEPS" = "1" ]; then + if [ $NODEPS -eq 1 ]; then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p pacman) ]; then @@ -1735,18 +1735,18 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$NOEXTRACT" = "1" ]; then +if [ $NOEXTRACT -eq 1 ]; then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" warning "$(gettext "Skipping source extraction -- using existing src/ tree")" - if [ "$NOEXTRACT" = "1" -a "$(ls "$srcdir" 2>/dev/null)" = "" ]; then + if [ $NOEXTRACT -eq 1 -a "$(ls "$srcdir" 2>/dev/null)" = "" ]; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi -elif [ "$REPKG" = "1" ]; then - if [ "$PKGFUNC" = "0" -a "$SPLITPKG" = "0" \ +elif [ $REPKG -eq 1 ]; then + if [ $PKGFUNC -eq 0 -a $SPLITPKG -eq 0 \ -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" @@ -1758,12 +1758,12 @@ else extract_sources fi -if [ "$NOBUILD" = "1" ]; then +if [ $NOBUILD -eq 1 ]; then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [ -d "$pkgdir" -a $ "$REPKG" = "0" -o "$PKGFUNC" = "1" -o "$SPLITPKG" = "1" $ ]; then + if [ -d "$pkgdir" -a $ $REPKG -eq 0 -o $PKGFUNC -eq 1 -o $SPLITPKG -eq 1 $ ]; then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi @@ -1772,15 +1772,15 @@ else # if we are root or if fakeroot is not enabled, then we don't use it if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then - if [ "$REPKG" = "0" ]; then + if [ $REPKG -eq 0 ]; then devel_update run_build fi - if [ "$SPLITPKG" = "0" ]; then - if [ "$PKGFUNC" = "1" ]; then + if [ $SPLITPKG -eq 0 ]; then + if [ $PKGFUNC -eq 1 ]; then run_package tidy_install - elif [ "$REPKG" = "0" ]; then + elif [ $REPKG -eq 0 ]; then tidy_install fi create_package @@ -1797,7 +1797,7 @@ else done fi else - if [ "$REPKG" = "0" -a $ "$PKGFUNC" == "1" -o "$SPLITPKG" = "1" $ ]; then + if [ $REPKG -eq 0 -a $ $PKGFUNC -eq 1 -o $SPLITPKG -eq 1 $ ]; then devel_update run_build cd "$startdir" -- 1.6.1

4 5

[pacman-dev] My first splitted package
by Pierre Schmitz 18 Jan '09

18 Jan '09

Hi pacman-devs, I have just installed Allan's makepkg-git package and played with the splitting feature. I think its quite elegant and will make packaging a lot easier and cleaner. I have two general questions (so far) 1) Are dependencies and makedependencies of sub-packages are treated by makepkg in any way? If yes there might be a problem if the sub-packages depend on each other. 2) Is it possible to use build_pkg1 etc.? That's not very improtant as one could abuse the package functions for such a use case. So, let's have a look at a real world example. I have chosen phonon for this. Its quite small but its really useful to split it into three parts. Optdepends do not work here because phonon detects its backends at runtime; and if those are linked against something we have not installed we'll have a problem. The following PKGBUILD works fine and the resulting packages are valid and functional. I am not sure if this is the best way to use splitting; so comments are welcome. One problem is that phonon and its backends depend on each other. the backends are linked against phonon and if you use phonon you'll have to install at least one backend. Long story short; here it is: pkgname=('phonon' 'phonon-backend-xine' 'phonon-backend-gstreamer') pkgver=4.2.96 pkgrel=1 pkgdesc='The multimedia API for KDE 4' arch=('i686' 'x86_64') url='http://phonon.kde.org' license=('LGPL') makedepends=('pkgconfig' 'cmake' 'automoc4') source=("http://download.kde.org/unstable/4.1.96/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('35b64db6e850df7d492f812a85b16982') build() { cd $srcdir mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package_phonon() { depends=('qt' 'phonon-backend') cd $srcdir/build/phonon make DESTDIR=$pkgdir install cd $srcdir/build/includes make DESTDIR=$pkgdir install } package_phonon-backend-xine() { pkgdesc='Xine backend for Phonon' provides=('phonon-backend') depends=('phonon' 'xine-lib') cd $srcdir/build/xine make DESTDIR=$pkgdir install } package_phonon-backend-gstreamer() { pkgdesc='Gstreamer backend for Phonon' provides=('phonon-backend') depends=('phonon' 'gstreamer0.10-base') cd $srcdir/build/gstreamer make DESTDIR=$pkgdir install } -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

4 6