- Pacman-dev - lists.archlinux.org

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