November 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] The time has come- pacman 3.1 testing releases
by Dan McGee 07 Nov '07

07 Nov '07

The time has come. I really want to get pacman 3.1 out the door, and to do that, we need to test this thing a lot. I am currently ONLY supporting i686, and you will need libarchive 2.4.0 installed from testing. However, if anyone on this list would like to step forward and volunteer to build the package for x86_64, I will gladly host the built package. I've provided the PKGBUILD and accompanying files. You can use versionpkg to build this package on your own, or once you have pacman 3.1 installed makepkg has versionpkg functionality built right in so you can just use that to rebuild a new version. Notable changes and things to know: 1. The sync DBs are now in a sync/ subdir in your pacman DB directory. Thus, the old top-level dbs are obsolete. This should hopefully clearly separate the local and sync dbs and keep people from wiping that important local one. 2. I WOULD NOT recommend using the --root option at this point. I still need to make some fixes, and its behavior wrt other path options is a lot different than pacman 3.0.X. 3. Consolidated mirrorlists- you don't need 5 of them anymore. See below for a bit more info on this, and take a look at the installed /etc/pacman.conf and /etc/pacman.d/mirrorlist files. So without further ado, instructions for upgrading/testing (PLEASE read all instructions before actually doing the upgrade!): 1. Because this package will replace your stock pacman, you either need to put the package in your own local repo, or add my [pacman] repo to your pacman.conf. The second is probably a safer bet and will allow you to get updates I make to the package anyway. Once you add the repo, the package name is pacman-git. 2. Once installed, you will see that you get a whole bunch of pacsave files. A lot of these are related to the mirrorlists being consolidated into one "mirrorlist" file instead of having 5 separate but basically identical lists. I kept these on my system just so I can use the pacman2.static binary if something goes horribly wrong. (Of course, you would have to remove the pacsave extension from all of these files to use them). 3. A pacman2.static binary has been included in the package, just in case. Hopefully no one needs to use it. 4. One issue is kind of weird, and may be a bug in the way we do replaces handling. Your original pacman.conf will be moved to pacman.conf.pacsave, and the new one installed as pacman.conf. Of course, you will need to do some merging of the config files, but unfortunately they end up backwards from the norm. 5. Point 4 also applies for makepkg.conf, but the contents of this file have changed enough that you should probably just start a new one anyway. A note to testers- please let me know if anything in your upgrade path is different from above. This will really help us later when it comes to finalizing the real upgrade path. And if you hit a problem, please submit a full report to the mailling list and/or Flyspray (this means a descriptive title, steps to reproduce, and --debug output). I have this installed, so don't worry too much about it killing your system. :P And now the links and stuff: Package/DB: http://www.archlinux.org/~dan/pacman-git/ PKGBUILD/files: http://www.archlinux.org/~dan/pacman-git/pacman-git/ pacman.conf entry: [pacman-git] Server = http://www.archlinux.org/~dan/pacman-git/ -Dan

6 13

[pacman-dev] [PATCH] New -Ru option
by Nagy Gabor 06 Nov '07

06 Nov '07

Hi! The most difficult thing was: to find out good names for the option and the newly introduced stuffs. So feel free to rename them. And if you like and apply the patch, please update pacman's manual and bash-completion. Note: If user wants to remove pkg1 and pkg2 with the same "prov" provision, then only one of them should be removed from the list. That's why inducer is not checked by depmiss_isin. But if there is many multiple provision in the original target list, human may be able to compute fewer package to remove from the target list, but I don't care (pathological case):-P Enjoy it, ngaba ---------------------- From d8a7ab05ba50197386b25e7fd879f342384370d4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 26 Oct 2007 18:33:20 +0200 Subject: [PATCH] New -Ru option With --unneeded option 'pacman -R' doesn't stop in case of dependency error; it removes the needed-dependency targets from the target-list instead. See also: http://archlinux.org/pipermail/pacman-dev/2007-October/009653.html The patch also adds a new inducer field to pmdepmissing_t which indicates the to-be-removed package which would cause a dependency break. This is needed, because miss->depend.name may be a provision. miss->depend will be useful in -R dependency error messages too. A new _alpm_pkgname_pkg_cmp(pkgname, pkg) function is also added, which retruns true iff pkg's name is pkgname. This is useful if you want to remove a package from pmpkg_t* list, and you want to search for package name. remove049.py tests -Ru. --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/conflict.c | 2 +- lib/libalpm/deps.c | 41 ++++++++++++++++++++++++++++------------- lib/libalpm/deps.h | 3 ++- lib/libalpm/package.c | 5 +++++ lib/libalpm/package.h | 1 + lib/libalpm/remove.c | 15 +++++++++++++++ src/pacman/pacman.c | 3 +++ 8 files changed, 58 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2000db4..99dcd24 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -275,7 +275,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_UNNEEDED = 0x2000, } pmtransflag_t; /* Transaction Events */ @@ -375,6 +376,7 @@ alpm_list_t *alpm_checkdeps(pmdb_t *db, pmtranstype_t op, const char *alpm_miss_get_target(pmdepmissing_t *miss); pmdeptype_t alpm_miss_get_type(pmdepmissing_t *miss); pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); +const char *alpm_miss_get_inducer(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); const char *alpm_dep_get_name(pmdepend_t *dep); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d09c996..bf8aa80 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -76,7 +76,7 @@ static void add_conflict(alpm_list_t **baddeps, const char *pkg1, const char *pkg2) { pmdepmissing_t *miss = _alpm_depmiss_new(pkg1, PM_DEP_TYPE_CONFLICT, - PM_DEP_MOD_ANY, pkg2, NULL); + PM_DEP_MOD_ANY, pkg2, NULL, ""); if(miss && !_alpm_depmiss_isin(miss, *baddeps)) { *baddeps = alpm_list_add(*baddeps, miss); } else { diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7f4fb0b..f8109d8 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -65,7 +65,7 @@ static void _alpm_graph_free(void *data) pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion) + const char *depversion, const char *inducer) { pmdepmissing_t *miss; @@ -86,6 +86,7 @@ pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, } else { miss->depend.version[0] = 0; } + strncpy(miss->inducer, inducer, PKG_NAME_LEN); return(miss); } @@ -333,7 +335,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "checkdeps: updated '%s' won't satisfy a dependency of '%s'\n", alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -382,7 +384,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", depend->name, alpm_pkg_get_name(tp)); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -437,7 +439,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, alpm_pkg_get_name(p), alpm_pkg_get_name(rmpkg)); miss = _alpm_depmiss_new(alpm_pkg_get_name(p), PM_DEP_TYPE_DEPEND, depend->mod, depend->name, - depend->version); + depend->version, alpm_pkg_get_name(rmpkg)); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -772,7 +774,19 @@ error: return(-1); } -const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) + +pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(-1)); + ASSERT(miss != NULL, return(-1)); + + return miss->type; +} + +pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -780,21 +794,21 @@ const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return miss->target; + return &miss->depend; } -pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_inducer(pmdepmissing_t *miss) { ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(handle != NULL, return(-1)); - ASSERT(miss != NULL, return(-1)); + ASSERT(handle != NULL, return(NULL)); + ASSERT(miss != NULL, return(NULL)); - return miss->type; + return miss->inducer; } -pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -802,9 +816,10 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return &miss->depend; + return miss->target; } + pmdepmod_t SYMEXPORT alpm_dep_get_mod(pmdepend_t *dep) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 59b2630..6f01593 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -40,6 +40,7 @@ struct __pmdepmissing_t { char target[PKG_NAME_LEN]; pmdeptype_t type; pmdepend_t depend; + char inducer[PKG_NAME_LEN]; /* this is used in case of remove dependency error only */ }; /* Graphs */ @@ -53,7 +54,7 @@ struct __pmgraph_t { pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion); + const char *depversion, const char *inducer); int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f6f5a9..00e8332 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -803,6 +803,11 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2))); } +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package) +{ + return(strcmp(alpm_pkg_get_name((pmpkg_t *) package), (char *) pkgname)); +} + /* Parses the package description file for the current package * TODO: this should ALL be in a backend interface (be_files), we should * be dealing with the abstracted concepts only in this file diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index daaeb36..d7032e6 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -94,6 +94,7 @@ pmpkg_t* _alpm_pkg_new(const char *name, const char *version); pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(pmpkg_t *pkg); int _alpm_pkg_cmp(const void *p1, const void *p2); +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package); int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full); pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0ed4dd0..3904a36 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -126,6 +126,21 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) FREELIST(lp); lp = _alpm_checkdeps(db, trans->type, trans->packages); } + } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { + while(lp != NULL) { + alpm_list_t *i; + for(i = lp; i; i = i->next) { + pmdepmissing_t *miss = (pmdepmissing_t *)i->data; + pmpkg_t *unneeded; + trans->packages = alpm_list_remove(trans->packages, miss->inducer, _alpm_pkgname_pkg_cmp, &unneeded); + if(unneeded) { + _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", alpm_pkg_get_name(unneeded)); + alpm_pkg_free(unneeded); + } + } + FREELIST(lp); + lp = _alpm_checkdeps(db, trans->type, trans->packages); + } } else { if(data) { *data = lp; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 705edaf..199878f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -95,6 +95,7 @@ static void usage(int op, char *myname) printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); + printf(_(" -u, --unneeded remove only unneeded packages (that won't break packages)\n")); } else if(op == PM_OP_UPGRADE) { if(config->flags & PM_TRANS_FLAG_FRESHEN) { printf("%s: %s {-F --freshen} [%s] <%s>\n", str_usg, myname, str_opt, str_file); @@ -277,6 +278,7 @@ static int parseargs(int argc, char *argv[]) {"orphans", no_argument, 0, 't'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, + {"unneeded", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, @@ -413,6 +415,7 @@ static int parseargs(int argc, char *argv[]) case 'u': config->op_s_upgrade = 1; config->op_q_upgrade = 1; + config->flags |= PM_TRANS_FLAG_UNNEEDED; break; case 'v': (config->verbose)++; break; case 'w': diff --git a/pactest/tests/remove049.py b/pactest/tests/remove049.py new file mode 100644 index 0000000..724f8da --- /dev/null +++ b/pactest/tests/remove049.py @@ -0,0 +1,19 @@ +self.description = "-Ru test" + +lp1 = pmpkg("pkg1") +lp1.requiredby = [ "pkg3" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.depends = [ "pkg1" ] +self.addpkg2db("local", lp3) + +self.args = "-Ru pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") \ No newline at end of file -- 1.5.3.4

4 13

[pacman-dev] en_GB translation update
by Jeff Bailes 06 Nov '07

06 Nov '07

Hi, I thought I should update the en_GB translation since pacman 3.1 testing releases have started. So here's a patch against the latest git. Jeff

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-529-gbdab234
by Dan McGee 06 Nov '07

06 Nov '07

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 bdab234d977dd2e9417a39f5191e495d5c460ee7 (commit) from 52b7fd81f55c3f27823c824da4d70c6edabefb52 (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 bdab234d977dd2e9417a39f5191e495d5c460ee7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 5 21:20:16 2007 -0600 Comment out paths by default in pacman.conf Now that all paths are defined to reasonable defaults at compile time by pacman, we shouldn't force users to have RootDir, DBPath, etc. in their default pacman.conf although these options are always available. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-528-g52b7fd8
by Dan McGee 06 Nov '07

06 Nov '07

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 52b7fd81f55c3f27823c824da4d70c6edabefb52 (commit) via cb04b3a5f3694a1598cf9c368cce30d661730640 (commit) via 11f99e06850a7d1242d3dc6427f52eee32256e63 (commit) via 0686fec8399e01adacd1633d6ad624ee2d5b6d9c (commit) via b55abdce7aebb142ce79da3aa3645afe7693a3c4 (commit) via 99f42d6bd2116b0bd8f75394fe92255ca1f4c80b (commit) via 86ca39d15e02dff47b5b0f5bcd0494cf101ce0c1 (commit) from 006387828cbdd11e6307879ad27e9bb9409ca193 (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 52b7fd81f55c3f27823c824da4d70c6edabefb52 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 5 20:57:43 2007 -0600 libalpm/db.c: change two warnings to errors These two warnings really indicate failure, so the message they print should do so as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb04b3a5f3694a1598cf9c368cce30d661730640 Author: Sebastian Nowicki <xilonmu(a)gmail.com> Date: Mon Nov 5 16:37:37 2007 +0900 Fix mercurial complaining about directory already existing Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11f99e06850a7d1242d3dc6427f52eee32256e63 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 22:05:44 2007 -0600 Add LOGFILE as a define at compile time for pacman It has always been a bit odd that logfile had to be specified in the config file, but no other paths did. Add LOGFILE as a preprocessor definition, and make a call to alpm_option_set_logfile() to set the default location so no logfile parameter is necessary in pacman.conf. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0686fec8399e01adacd1633d6ad624ee2d5b6d9c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Nov 4 20:53:34 2007 +0100 Remove the newline automatically added by alpm_logaction. This way, _alpm_logaction behaves like _alpm_log, and gives more control. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit b55abdce7aebb142ce79da3aa3645afe7693a3c4 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 18:02:25 2007 -0600 libalpm: use an lstat wrapper so we never dereference dir symlinks Linux lstat follows POSIX standards and dereferences a symlink pointing to a directory if there is a trailing slash. For purposes of libalpm, we don't want this so make a lstat wrapper that suppresses this behavior. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 99f42d6bd2116b0bd8f75394fe92255ca1f4c80b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 16:38:59 2007 -0600 libalpm: open the logstream on demand Don't open a stream to the logfile until necessary. This will allow us to catch any errors in opening the logfile instead of ignorning them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86ca39d15e02dff47b5b0f5bcd0494cf101ce0c1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 12:05:22 2007 -0600 Clean up usage of extern variables Instead of declaring the extern variable in every *.c file, include it in the header file that makes sense. This means handle.h for the handle, and conf.h for the pacman side config object. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 30 +++++++++++++++--------------- lib/libalpm/alpm.c | 1 - lib/libalpm/conflict.c | 4 ++-- lib/libalpm/db.c | 4 ++-- lib/libalpm/deps.c | 2 -- lib/libalpm/handle.c | 32 +++++++++----------------------- lib/libalpm/handle.h | 1 + lib/libalpm/log.c | 19 +++++++++++++++++++ lib/libalpm/remove.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 31 +++++++++++++++++++++++++++---- lib/libalpm/util.h | 2 ++ scripts/makepkg.sh.in | 3 +-- src/pacman/Makefile.am | 2 ++ src/pacman/add.c | 2 -- src/pacman/callback.c | 8 +++----- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 3 +++ src/pacman/deptest.c | 2 -- src/pacman/pacman.c | 5 ++--- src/pacman/query.c | 1 - src/pacman/remove.c | 2 -- src/pacman/sync.c | 5 ++--- src/pacman/util.c | 2 -- 24 files changed, 95 insertions(+), 73 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] scritplet output logging removed?
by Xavier 05 Nov '07

05 Nov '07

I just saw this was removed by commit ad691001e : "Remove scriptlet START and DONE commands that we don't use" Since the comment doesn't mention the logging, I just want to make sure this was intended and not overlooked.

5 14

[pacman-dev] [PATCH] Integrate versionpkg into makepkg
by Scott Horowitz 05 Nov '07

05 Nov '07

I personally found it silly to have separate scripts for makepkg and versionpkg. I've seen countless messages on AUR where people ask for -svn PKGBUILDS to be updated because their pkgver is out of date, etc. Many people don't know about versionpkg and, even if you do, it makes sense to have a single script that handles both. Please look at the patch carefully because I am by no means a shell scripting expert. I tested it with mpd-svn and mpd PKGBUILDS; both worked fine but that hardly means everything is perfect. Also, this removes the --check-only and --modify-only arguments that the standalone versionpkg script accepted. I guess there's no reason these can't be added back in, but they seem a little useless to me (and their short arguments, -c and -m, are already used by makepkg for other purposes). Scott --- /usr/bin/makepkg 2007-09-16 16:33:23.000000000 -0600 +++ /usr/bin/makepkg2 2007-10-26 13:07:52.000000000 -0600 @@ -34,6 +34,8 @@ source "/etc/abs/abs.conf" SRCROOT="$ABSROOT" +FORCE_VER="" + # Options CLEANUP=0 CLEANCACHE=0 @@ -106,6 +108,10 @@ echo "$1" | sed 's|^.*://.*/||g' } +update_pb() { + sed -i "1,11 s/pkgver=[^ ]*/pkgver=$1/" ./$BUILDSCRIPT +} + # checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence check_option() { @@ -457,7 +463,7 @@ exit 1 ;; -*) - while getopts "bcCdefghiLmop:rRsS-" opt; do + while getopts "bcCdefghiLmopz:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; c) CLEANUP=1 ;; @@ -479,6 +485,7 @@ R) REPKG=1 ;; s) DEP_BIN=1 ;; S) SUDO=1 ;; + z) FORCE_VER=$OPTARG ;; -) OPTIND=0 break @@ -592,6 +599,67 @@ fi fi +newpkgver="" +if [ "$FORCE_VER" = "" ]; then + # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. + # This will only be used on the first call to makepkg; subsequent + # calls to makepkg via fakeroot will explicitly pass the version + # number to avoid having to determine the version number twice. + oldpkgver=$pkgver + if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then + msg "determining latest darcs revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then + msg "determining latest cvs revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then + msg "determining latest git revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then + msg "retrieving latest revision number from svn... \c" + newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r$[^ ]*$ .*$/\1/p') + echo "$newpkgver" + elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then + msg "retrieving latest revision number from bzr... \c" + newpkgver=$(bzr revno ${_bzrtrunk}) + echo "$newpkgver" + elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then + if [ -d ./src/$_hgrepo ] ; then + msg "retrieving latest revision number from hg... \c" + cd ./src/$_hgrepo + make clean + hg pull + hg update + else + msg "determining latest hg revision... \c" + [[ ! -d ./src/$_hgrepo ]] && mkdir -p ./src/$_hgrepo + hg clone $_hgroot/$_hgrepo ./src/$_hgrepo + cd ./src/$_hgrepo + fi + newpkgver=$(hg tip | sed -n '1s/[^0-9]*$[^:]*$:.*$/\1/p') + echo "$newpkgver" + cd ../../ + fi + + if [ "$newpkgver" != "$oldpkgver" ]; then + msg "newer revision detected: $newpkgver" + elif [ "$newpkgver" != "" ]; then + warning "PKGBUILD pkgver is $oldpkgver, no newer revision available" + if [ "$FORCE" = "1" ]; then + msg "forcing pkgver to $newpkgver... " + else + error "exiting now, use makepkg -f to force update" + exit 1 + fi + fi +else + # Version number retrieved from fakeroot->makepkg argument + newpkgver=$FORCE_VER +fi + # Enter the fakeroot environment if necessary. This will call the makepkg # script again as the fake root user. We detect this by passing a sentinel # option (-F) to makepkg. @@ -599,7 +667,11 @@ if [ "$(check_buildenv fakeroot)" = "y" ]; then if [ $(type -p fakeroot) ]; then msg "Entering fakeroot environment" - fakeroot -- $0 -F $ARGLIST + if [ "$newpkgver" != "" ]; then + fakeroot -- $0 -F $ARGLIST -z $newpkgver + else + fakeroot -- $0 -F $ARGLIST + fi exit $? else warning "Fakeroot is not installed. Building as an unprivileged user" @@ -617,6 +689,18 @@ fi fi +# This is lame, but if we're wanting to use an updated pkgver for +# retrieving svn/cvs/etc sources, we'll update the PKGBUILD, re-source +# it, and then revert it +if [ "$newpkgver" != "" ]; then + if [ "newpkgver" != "$pkgver" ]; then + oldpkgver=$pkgver + update_pb $newpkgver + source $BUILDSCRIPT + update_pb $oldpkgver + fi +fi + msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" # fix flyspray bug #5973

7 23

[pacman-dev] Option Depency Ideas
by Jeff 'codemac' Mickey 05 Nov '07

05 Nov '07

Hello all. I figure I should start flexing my "zomg coding" muscles a little more for the benefit of arch. What interests me the most right now is optional dependencies. In my local git tree I have added pactest support for testing option dependencies, but I only have one joke of a pactest that checks. Thanks to Dan, a lot of the work that I really would have a harder time getting right has all ready been done, in adding the right lines to makepkg, libalpm, and pacman so that the optional dependencies are recorded in the db. Right now they are only recognized as simple strings, not as packages with dependency resolution or any of that fun stuff (correct me if I'm wrong here Dan). The next steps appear to be the following: * makepkg should recognize the 'pkg:reason for package being option' format I've seen thrown around. * When a package is installed with optional dependencies, we can do a couple different things. o Ask the user right there with the "Install package foo for xyz support?" o Ask the user to explicitly install the optional deps themselves (I don't think this is good at all. This wouldn't keep them listed as "installed as a dependency" and we could just have echo statements in the .install then.) o Check for some kind of /etc/pacman.conf var that lists what packages users don't mind having as optional dependencies, otherwise ask them to install them. o Something else I haven't thought of. * When an optional dependency is installed through one of the 3 ways listed above, we need to install it as a dependency, and add it to %DEPENDS%, leave it in %OPTDEPENDS%, and not put it in %REQUIREDBY% * When an optional dependency is uninstalled that was only ever installed as a dependency, we can do several things. o We warn the user that they are losing functionality, and remove it from the %DEPENDS% array in the parent. o We let pacman handle it like it does dependcies, this is what we get when we add the optional dependency to just %DEPENDS% and not %REQUIREDBY% o Something else I haven't thought of. * When a package with optional dependencies is removed, it should also remove all other packages that have been moved into %DEPENDS% haven't been explicitly installed. I believe this is funcitonality that we get by adding it to the %DEPENDS% array anyways. I just wanted to get these thoughts out there. I thought I was just going to implement basic -Qi functionality and then address these.. but Dan is a beast and jumped the gun on me. I would like to hear all of your thoughts on the above ideas, and let's flesh out what action we'd like to see pacman take based on these difference scenarios. // jeff -- .: [ + carpe diem totus tuus + ] :.

4 3

[pacman-dev] Script to validate ABS/PKGBUILDs
by Scott Horowitz 05 Nov '07

05 Nov '07

After reading Xavier's email[1] that mentioned the possibility of an external script to check for circular dependencies, I set out to do just that. Along the way, I found a number of other issues in the ABS tree and decided to report those out as well. The script is written in python because dicts make it all so much easier. It takes a little over a minute to run on my 1.5ghz machine. >From the script itself: # This script currently checks for a number of issues in your ABS # tree: # 1. Directories with missing PKGBUILDS # 2. Duplicate PKGBUILDs # 3. Referenced dependencies (and make-dependencies) that cannot # be found. This correctly takes into account any 'provides'. # 4. Circular dependencies # # Todo: # 1. Account for versioned deps, e.g., foo=1.2.3 # 2. Accommodate testing repo? Hopefully people find it useful. I'm open to suggestions and improvements. ------------- $ ./check_pkgbuilds.py WARNING: Please make sure you have a clean $ABSROOT when running this script; custom PKGBUILDs, etc. can cause false positives. Ignoring the following paths: /var/abs/local /var/abs/testing /var/abs/.sup Duplicate PKGBUILD found for junit --> /var/abs/community/devel/junit/PKGBUILD --> /var/abs/extra/devel/junit/PKGBUILD PKGBUILD not found in dir /var/abs/community/gnome/tomboy PKGBUILD not found in dir /var/abs/community/kernels/kernel26archck PKGBUILD not found in dir /var/abs/community/kernels/kernel26suspend2 Duplicate PKGBUILD found for bcprov --> /var/abs/community/lib/bcprov/PKGBUILD --> /var/abs/extra/lib/bcprov/PKGBUILD PKGBUILD not found in dir /var/abs/community/lib/cegui PKGBUILD not found in dir /var/abs/community/lib/libixp PKGBUILD not found in dir /var/abs/community/lib/libsmbios Duplicate PKGBUILD found for perl-mime-types --> /var/abs/community/lib/perl-mime-types/PKGBUILD --> /var/abs/extra/lib/perl-mime-types/PKGBUILD Duplicate PKGBUILD found for perl-module-pluggable --> /var/abs/community/lib/perl-module-pluggable/PKGBUILD --> /var/abs/extra/lib/perl-module-pluggable/PKGBUILD PKGBUILD not found in dir /var/abs/community/modules/ati-drivers PKGBUILD not found in dir /var/abs/community/modules/ati-drivers-arch PKGBUILD not found in dir /var/abs/community/multimedia/flite PKGBUILD not found in dir /var/abs/community/multimedia/gcfilms PKGBUILD not found in dir /var/abs/community/multimedia/polypaudio Duplicate PKGBUILD found for pptpclient --> /var/abs/community/network/pptpclient/PKGBUILD --> /var/abs/core/support/pptpclient/PKGBUILD Duplicate PKGBUILD found for webalizer --> /var/abs/community/network/webalizer/PKGBUILD --> /var/abs/extra/network/webalizer/PKGBUILD PKGBUILD not found in dir /var/abs/community/x11/ttf-dejavu PKGBUILD not found in dir /var/abs/community/x11/wmii PKGBUILD not found in dir /var/abs/community/x11/xarchiver Duplicate PKGBUILD found for aufs-utils --> /var/abs/community/system/aufs-utils/PKGBUILD --> /var/abs/extra/system/aufs-utils/PKGBUILD PKGBUILD not found in dir /var/abs/community/system/mkinitramfs PKGBUILD not found in dir /var/abs/community/system/qemu PKGBUILD not found in dir /var/abs/community/system/reiser4progs PKGBUILD not found in dir /var/abs/community/system/userui Cannot find dependency in package: shfs-ck>kernel26ck Cannot find dependency in package: rafkill>dumb Cannot find dependency in package: shfs-beyond>kernel26beyond Cannot find dependency in package: em8300-beyond>kernel26beyond Cannot find dependency in package: icomplete>vim-devel Cannot find dependency in package: syslog-ng>eventlog Cannot find dependency in package: em8300-ck>kernel26ck Cannot find dependency in package: em8300-suspend2>kernel26suspend2 Cannot find dependency in package: ltmodem>ltmodem-utils Cannot find dependency in package: shfs-suspend2>kernel26suspend2 Cannot find dependency in package: klibc-beyond>kernel26beyond Circular dependency found for gcc-libs --> gcc-libs>gcc>gcc-libs Circular dependency found for libxcb --> libxcb>libxslt>python>tk>libx11>libxcb Circular dependency found for gutenprint --> gutenprint>gimp>gutenprint Circular dependency found for libxslt --> libxslt>python>tk>libx11>libxcb>libxslt Circular dependency found for shadow --> shadow>pam>db>coreutils>shadow Circular dependency found for flightgear-data --> flightgear-data>flightgear>flightgear-data Circular dependency found for flightgear --> flightgear>flightgear-data>flightgear Circular dependency found for eclipse-ecj --> eclipse-ecj>gcc-gcj>eclipse-ecj Circular dependency found for libx11 --> libx11>libxcb>libxslt>python>tk>libx11 Circular dependency found for gcc-gcj --> gcc-gcj>eclipse-ecj>gcc-gcj Circular dependency found for texinfo --> texinfo>ncurses>glibc>gcc>binutils>texinfo Circular dependency found for pam --> pam>db>coreutils>pam Circular dependency found for tk --> tk>libx11>libxcb>libxslt>python>tk Circular dependency found for tzdata --> tzdata>glibc>tzdata Circular dependency found for bash --> bash>readline>glibc>bash Circular dependency found for binutils --> binutils>glibc>gcc>binutils Circular dependency found for ncurses --> ncurses>glibc>bash>readline>ncurses Circular dependency found for gimp --> gimp>gutenprint>gimp Circular dependency found for coreutils --> coreutils>pam>db>coreutils Circular dependency found for glibc --> glibc>tzdata>glibc Circular dependency found for gcc --> gcc>gcc-libs>gcc Circular dependency found for db --> db>coreutils>pam>db Circular dependency found for python --> python>tk>libx11>libxcb>libxslt>python Circular dependency found for libxml2 --> libxml2>python>tk>libx11>libxcb>libxslt>libxml2 Circular dependency found for readline --> readline>glibc>bash>readline Scott [1] http://archlinux.org/pipermail/pacman-dev/2007-November/009800.html

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-521-g0063878
by Dan McGee 04 Nov '07

04 Nov '07

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 006387828cbdd11e6307879ad27e9bb9409ca193 (commit) via 2e51e28442e5af84d6e121acf3445f7d34c098be (commit) via 8dc84344444d29a85d70285ddbd64e00c2a27dbc (commit) via 6d42439a3e22a395592b0ad88a5f77a3bf92fa78 (commit) via c32f00f77c1bfabd3a21db649fe5f622024ea850 (commit) via e5be26fb233e0d29148846db21a70870ebe0d0bb (commit) via c26fe63ee5d84492bcfb36664af8a90619e6ded5 (commit) via 8feccaed7861010caefa4f7b9824a612a78e3043 (commit) via 288dd54982b85f6feae7d41faf91a531d9f71085 (commit) via 7ee62ca216211ef3d46413bdcf6585b035c8a614 (commit) from 381690f9b3c38f51835bf4d48835d9fc830d66b1 (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 006387828cbdd11e6307879ad27e9bb9409ca193 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 09:47:21 2007 -0600 Readd scriptlet logging that got lost in an earlier commit I broke scriptlet logging with ad691001e20272b794d2ed574b556f520e3555c0. Readd more or less what was there before, although it still needs a lot of work including hopefully rewriting it to a new event subsystem and having it log to a seperate file. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2e51e28442e5af84d6e121acf3445f7d34c098be Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 11:43:32 2007 -0500 vercmp: add some usage instructions Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8dc84344444d29a85d70285ddbd64e00c2a27dbc Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 11:13:24 2007 -0600 Remove unneeded CXX macros from acinclude.m4 This follows the removal patch previously used for GCC & F77 macros. If we don't use it, dump it so we can speed up configure time. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d42439a3e22a395592b0ad88a5f77a3bf92fa78 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 10:45:55 2007 -0600 Add some text at the top of acinclude.m4 so people know what is going on Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c32f00f77c1bfabd3a21db649fe5f622024ea850 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 13:10:31 2007 -0500 Remove unneeded F77 and GCJ libtool macros from acinclude.m4 We don't use Fortran or Java code in our project, so no need to waste time looking for this stuff. This gives a noticeable speedup to running the ./configure program as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e5be26fb233e0d29148846db21a70870ebe0d0bb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 1 19:36:50 2007 -0500 Make building of pacman.static optional Because building of pacman.static fails on some platforms, we should make it optional. It is enabled by default but can be disabled with the use of the --disable-pacman-static flag. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c26fe63ee5d84492bcfb36664af8a90619e6ded5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 22:19:03 2007 -0500 Add some more autoconf macros to filter our CFLAGS usage Hopefully these new autoconf macros, with a little magic, will allow us to compile with any compiler and still choose the options we have available to us. Tested locally with gcc 4.2.2 and gcc 3.4.6; the latter doesn't support two of the items we previously had hardcoded in our CFLAGS. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8feccaed7861010caefa4f7b9824a612a78e3043 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 21:30:09 2007 -0500 Use an autoconf macro to see if -fstack-protector is available Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 288dd54982b85f6feae7d41faf91a531d9f71085 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 13:13:28 2007 -0500 Revise configure.ac Do a little cleanup of our configure script. Highlights: * Remove macros deemed unnecessary to call [1] * Change check for compiler to look for one that is C99 capable- this automatically adds the -std=gnu99 flag [1] Noted in the autoconf NEWS file, notably entries for 2.59d Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ee62ca216211ef3d46413bdcf6585b035c8a614 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 10:41:44 2007 -0600 Update libtool files and macros to newest versions It looks like some of the newer libtool m4 files offer improved support for the Darwin platform and possibly BSD, so bump our files to these new versions. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: acinclude.m4 | 2123 ++++++++--------------------------------------- config.guess | 4 +- config.sub | 6 +- configure.ac | 54 +- lib/libalpm/Makefile.am | 9 +- lib/libalpm/add.c | 8 +- lib/libalpm/alpm.h | 1 + lib/libalpm/remove.c | 4 +- lib/libalpm/trans.c | 19 +- lib/libalpm/trans.h | 2 +- ltmain.sh | 233 ++++-- src/pacman/Makefile.am | 6 +- src/pacman/callback.c | 3 + src/util/vercmp.c | 21 + 14 files changed, 589 insertions(+), 1904 deletions(-) hooks/post-receive -- The official pacman repository

1 0