- Pacman-dev - lists.archlinux.org

[pacman-dev] bug in pacman 3.3.2 retrieving of repos?
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 13 Oct '09

13 Oct '09

Hello List, pacman 3.3.2 libfetch backend doesn't retrieve an updated repo via http (tested with "touch repo.db.tar.gz" on the http server) here. I checked the http headers with curl just to be sure that my setup isn't f***ed up in some way and they are updated just fine after every touch on the file, so i has to be a problem with libfetch or pacman itself. A local revert to pacman 3.3.0 (no build-changes or libfetch changes and the exact same build-environment) fixes this problem here so it looks like a messed up usage of libfetch in pacman 3.3.2 release. Can someone else reproduce this behaviour? Because i have no clue on how to use libfetch the right way without reading the documentation and analyse the code in pacman afterwards, i hope someone else wants to hound it down. Marc

3 11

[pacman-dev] [PATCH] Only extract new db entries
by Xavier Chantry 12 Oct '09

12 Oct '09

This implements FS#15198. The idea apparently came from Csaba Henk <csaba-ml <at> creo.hu> which submitted a patch to frugalware, so thanks to him, even though I did not look at the code :) The idea is to only extract folders for new packages into the package database and clean up the old directories. This is essentially implementing Xyne's "rebase" script within pacman. If using -Syy, just remove and extract everything. If using -Sy : 1. Generate list of directories in db 2. Generate list of directories in archive 3. Compare both 4. Clean up old directories 5. Extract new directories Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/be_files.c | 168 ++++++++++++++++++++++++++++++++++++++++++++---- lib/libalpm/util.c | 3 +- 2 files changed, 156 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 53bbda1..ef045c5 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -33,6 +33,10 @@ #include <limits.h> /* PATH_MAX */ #include <locale.h> /* setlocale */ +/* libarchive */ +#include <archive.h> +#include <archive_entry.h> + /* libalpm */ #include "db.h" #include "alpm_list.h" @@ -137,6 +141,103 @@ static int checkdbdir(pmdb_t *db) return(0); } +/* create list of directories in db */ +static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist) +{ + struct archive *_archive; + struct archive_entry *entry; + + if((_archive = archive_read_new()) == NULL) + RET_ERR(PM_ERR_LIBARCHIVE, -1); + + archive_read_support_compression_all(_archive); + archive_read_support_format_all(_archive); + + if(archive_read_open_filename(_archive, archive, + 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); + } + + while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) { + const struct stat *st; + const char *entryname; /* the name of the file in the archive */ + + st = archive_entry_stat(entry); + entryname = archive_entry_pathname(entry); + + if(S_ISDIR(st->st_mode)) { + char *name = strdup(entryname); + *dirlist = alpm_list_add(*dirlist, name); + } + } + archive_read_finish(_archive); + + *dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp); + return(0); +} + +/* create list of directories in db */ +static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist) +{ + DIR *dbdir; + struct dirent *ent = NULL; + struct stat sbuf; + char path[PATH_MAX]; + + dbdir = opendir(syncdbpath); + if (dbdir != NULL) { + while((ent = readdir(dbdir)) != NULL) { + char *name = ent->d_name; + int len; + char *entry; + + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { + continue; + } + + /* stat the entry, make sure it's a directory */ + snprintf(path, PATH_MAX, "%s%s", syncdbpath, name); + if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { + continue; + } + + len = strlen(name); + MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1)); + strcpy(entry, name); + entry[len] = '/'; + entry[len+1] = '\0'; + *dirlist = alpm_list_add(*dirlist, entry); + } + } + closedir(dbdir); + + *dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp); + return(0); +} + +/* remove old directories from dbdir */ +static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) +{ + alpm_list_t *i; + for (i = dirlist; i; i = i->next) { + const char *name = i->data; + char *dbdir; + int len = strlen(syncdbpath) + strlen(name) + 2; + MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(dbdir, len, "%s%s", syncdbpath, name); + _alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir); + if(_alpm_rmrf(dbdir) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir); + free(dbdir); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } + free(dbdir); + } + return(0); +} + /** Update a package database * * An update of the package database \a db will be attempted. Unless @@ -229,27 +330,63 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) return(-1); } else { const char *syncdbpath = _alpm_db_path(db); - /* remove the old dir */ - if(_alpm_rmrf(syncdbpath) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); - RET_ERR(PM_ERR_DB_REMOVE, -1); - } - - /* Cache needs to be rebuilt */ - _alpm_db_free_pkgcache(db); /* form the path to the db location */ len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); - /* uncompress the sync database */ - checkdbdir(db); - ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); - if(ret) { - free(dbfilepath); - RET_ERR(PM_ERR_SYSTEM, -1); + if(force) { + /* if forcing update, remove the old dir and extract the db */ + if(_alpm_rmrf(syncdbpath) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); + RET_ERR(PM_ERR_DB_REMOVE, -1); + } + + checkdbdir(db); + + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); + if(ret) { + free(dbfilepath); + RET_ERR(PM_ERR_SYSTEM, -1); + } + } else { + /* if not forcing, only remove and extract what is necessary */ + alpm_list_t *onlyold = NULL; + alpm_list_t *onlynew = NULL; + alpm_list_t *olddirlist = NULL; + alpm_list_t *newdirlist = NULL; + + ret = dirlist_from_tar(dbfilepath, &newdirlist); + if(ret) { + goto cleanup; + } + ret = dirlist_from_fs(syncdbpath, &olddirlist); + if(ret) { + goto cleanup; + } + + alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew); + + ret = remove_olddir(syncdbpath, onlyold); + if(ret) { + goto cleanup; + } + checkdbdir(db); + ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0); + +cleanup: + alpm_list_free(onlyold); + alpm_list_free(onlynew); + FREELIST(olddirlist); + FREELIST(newdirlist); + + if(ret) { + free(dbfilepath); + RET_ERR(PM_ERR_SYSTEM, -1); + } } + unlink(dbfilepath); free(dbfilepath); @@ -259,6 +396,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) db->treename, (uintmax_t)newmtime); setlastupdate(db, newmtime); } + + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); } return(0); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..814a28a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -332,12 +332,13 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int char *found = alpm_list_find_str(list, prefix); free(prefix); if(!found) { - _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); if (archive_read_data_skip(_archive) != ARCHIVE_OK) { ret = 1; goto cleanup; } continue; + } else { + _alpm_log(PM_LOG_DEBUG, "extracting: %s\n", entryname); } } -- 1.6.4.4

1 0

Re: [pacman-dev] [PATCH 3/3] Only extract new db entries
by Xavier 12 Oct '09

12 Oct '09

On Mon, Oct 12, 2009 at 3:03 PM, Henning Garus <henning.garus(a)googlemail.com> wrote: > On Sun, Oct 11, 2009 at 03:42:50PM +0200, Xavier Chantry wrote: >> +/* create list of directories in db */ >> +static alpm_list_t *dirlist_from_fs(const char *syncdbpath) >> +{ >> + DIR *dbdir; >> + struct dirent *ent = NULL; >> + alpm_list_t *dirlist = NULL; >> + struct stat sbuf; >> + char path[PATH_MAX]; >> + >> + dbdir = opendir(syncdbpath); >> + if (dbdir != NULL) { >> + while((ent = readdir(dbdir)) != NULL) { >> + char *name = ent->d_name; >> + if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { >> + continue; >> + } >> + >> + /* stat the entry, make sure it's a directory */ >> + snprintf(path, PATH_MAX, "%s%s", syncdbpath, name); >> + if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { >> + continue; >> + } >> + >> + int len = strlen(name); >> + char *entry = malloc(len + 2); > > Isn't MALLOC more appropriate here? > Probably :) >> + strcpy(entry, name); >> + entry[len] = '/'; >> + entry[len+1] = '\0'; >> + dirlist = alpm_list_add(dirlist, entry); >> + } >> + } >> + closedir(dbdir); >> + >> + dirlist = alpm_list_msort(dirlist, alpm_list_count(dirlist), _alpm_str_cmp); >> + return(dirlist); >> +} >> + >> +/* remove old directories from dbdir */ >> +static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist) >> +{ >> + alpm_list_t *i; >> + for (i = dirlist; i; i = i->next) { >> + const char *name = i->data; >> + char *dbdir; >> + int len = strlen(syncdbpath) + strlen(name) + 2; >> + MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1)); >> + snprintf(dbdir, len, "%s%s", syncdbpath, name); >> + _alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir); >> + if(_alpm_rmrf(dbdir) != 0) { >> + _alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir); >> + free(dbdir); >> + RET_ERR(PM_ERR_DB_REMOVE, -1); >> + } >> + free(dbdir); >> + } >> + return(0); >> +} >> + >> /** Update a package database >> * >> * An update of the package database \a db will be attempted. Unless >> @@ -229,27 +329,54 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) >> return(-1); >> } else { >> const char *syncdbpath = _alpm_db_path(db); >> - /* remove the old dir */ >> - if(_alpm_rmrf(syncdbpath) != 0) { >> - _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); >> - RET_ERR(PM_ERR_DB_REMOVE, -1); >> - } >> - >> - /* Cache needs to be rebuilt */ >> - _alpm_db_free_pkgcache(db); >> >> /* form the path to the db location */ >> len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; >> MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); >> sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); >> >> - /* uncompress the sync database */ >> - checkdbdir(db); >> - ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); >> - if(ret) { >> - free(dbfilepath); >> - RET_ERR(PM_ERR_SYSTEM, -1); >> + /* remove the old dir if forcing update */ >> + if(force) { >> + if(_alpm_rmrf(syncdbpath) != 0) { >> + _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); >> + RET_ERR(PM_ERR_DB_REMOVE, -1); >> + } >> + >> + checkdbdir(db); >> + >> + ret = _alpm_unpack(dbfilepath, syncdbpath, NULL, 0); >> + if(ret) { >> + free(dbfilepath); >> + RET_ERR(PM_ERR_SYSTEM, -1); >> + } >> + } else { >> + alpm_list_t *onlyold = NULL; >> + alpm_list_t *onlynew = NULL; >> + alpm_list_t *olddirlist = NULL; >> + alpm_list_t *newdirlist = NULL; >> + >> + newdirlist = dirlist_from_tar(dbfilepath); >> + olddirlist = dirlist_from_fs(syncdbpath); > > dirlist_from_tar could return NULL. dirlist_from_fs could as well if you > error out on failing malloc (see above). > I assume just moving on after failing to read the archive isn't really > intended, since onlyold will contain all entries from olddirlist and > onlynew will be empty, this would lead to an empty db. > Hmm. I think that these two functions can return NULL also in a non-error case. The sync database in the filesystem could be empty. And the new sync database tarball could be empty too (actually we just patched repo-add to support that). But yeah I will probably change the signature of these functions to distinguish error and empty case. >> + >> + alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew); >> + >> + ret = remove_olddir(syncdbpath, onlyold); >> + if(ret == 0) { >> + checkdbdir(db); >> + ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0); >> + } >> + >> + alpm_list_free(olddirlist); >> + alpm_list_free(newdirlist); >> + FREELIST(onlyold); >> + FREELIST(onlynew); > > Shouldn't this be the other way round? onlyold and onlynew contain a > subset of the entries in olddirlist and newdirlist. > Yeah, that seems right too :P Thanks for your review ! I will send a new patch ... when I can :)

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-4-gda5fb3e
by dan＠archlinux.org 12 Oct '09

12 Oct '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 da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 (commit) from 5e03941ee5fbd0cc69ac83e2dd6ad6d3e6d940cd (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 da5fb3ee4f66dbdf0620bbb087fd759ddc9ae6e0 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 20:11:03 2009 +1000 Fix Greek short Y/N translation Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: po/el.po | 8 ++++---- 1 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.3.2-67-g2cabe33
by dan＠archlinux.org 12 Oct '09

12 Oct '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 2cabe336eb33e443819a1d9d46b0c5bcceaa7e87 (commit) via e3ac8062626877b8cf87df5ce94f61394bf10c0f (commit) from c7d8601e125de432f185c146c84333ca7d920d9a (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 2cabe336eb33e443819a1d9d46b0c5bcceaa7e87 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Oct 8 16:10:05 2009 +0200 Introduce new PKGBUILD variable `changelog` Currently, a changelog is added to a package if a specific file with a hardcoded name exists in the PKGBUILD's directory. This approach is not pretty and also inconsistent with the handling of install files, but it works. With the introduction of split PKGBUILDs, however, a drawback in this old behavior has arisen: you only have the possibility to include one specific changelog file in either every package defined in the PKGBUILD or in none. The use of an additional variable, `changelog`, works around this issue and makes it possible to include a changelog in only some of the packages, and besides, each package of the PKGBUILD can have its own changelog file. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3ac8062626877b8cf87df5ce94f61394bf10c0f Author: solsTiCe d'Hiver <solstice.dhiver(a)gmail.com> Date: Sat Sep 26 19:30:32 2009 +0200 use bitwise shift operator in enum "bit field" This offers a cleaner way to deal with constant in enum and allow easy maintainance Signed-off-by: solsTiCe d'Hiver <solstice.dhiver(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 + PKGBUILD.proto | 1 + contrib/PKGBUILD.vim | 9 +++++++ doc/PKGBUILD.5.txt | 8 ++++++- lib/libalpm/alpm.h | 56 ++++++++++++++++++++++++------------------------ lib/libalpm/db.h | 12 +++++----- scripts/makepkg.sh.in | 25 ++++++++++++++------- 7 files changed, 70 insertions(+), 43 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-65-gc7d8601
by dan＠archlinux.org 12 Oct '09

12 Oct '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 c7d8601e125de432f185c146c84333ca7d920d9a (commit) via ab3c6f01f5c884233f718e7f7d5c32b2fdf4ff73 (commit) from 72bc947cbb8ba752f021f28ec9e9a85c354918e3 (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 c7d8601e125de432f185c146c84333ca7d920d9a Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 10:59:34 2009 +0200 Fix stderr redirection When redirecting both stderr and stdout and using the 2>&1 construct, you have to redirect stdout first. Otherwise stderr will be redirected to the 'old' stdout and not to the new resource. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab3c6f01f5c884233f718e7f7d5c32b2fdf4ff73 Author: Laszlo Papp <djszapi(a)archlinux.us> Date: Sun Oct 11 15:52:12 2009 -0500 Remove makepath function from frontend Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/repo-add.sh.in | 2 +- src/pacman/util.c | 36 ------------------------------------ src/pacman/util.h | 1 - 3 files changed, 1 insertions(+), 38 deletions(-) hooks/post-receive -- The official pacman repository

3 2

[pacman-dev] [PATCH] Introduce new PKGBUILD variable `changelog`
by Cedric Staniewski 11 Oct '09

11 Oct '09

Hi, This patch adds a new PKGBUILD variable, changelog, which replaces the old, hardcoded ChangeLog file. The old behavior is completely removed, which means that existing ChangeLog files will be ignored if there is no appropriate line in the PKGBUILD. For a more detailed description, please see the patch below. I hope I also caught all the necessary documentation updates. Cedric >From d8e1bb73705a665bc03f14f4eb3ec0d8b9e6d259 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed, 16 Sep 2009 14:38:18 +0200 Subject: [PATCH] Introduce new PKGBUILD variable `changelog` Currently, a changelog is added to a package if a specific file with a hardcoded name exists in the PKGBUILD's directory. This approach is not pretty and also inconsistent with the handling of install files, but it works. With the introduction of split PKGBUILDs, however, a drawback in this old behavior has arisen: you only have the possibility to include one specific changelog file in either every package defined in the PKGBUILD or in none. The use of an additional variable, `changelog`, works around this issue and makes it possible to include a changelog in only some of the packages, and besides, each package of the PKGBUILD can have its own changelog file. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- PKGBUILD-split.proto | 2 ++ PKGBUILD.proto | 1 + contrib/PKGBUILD.vim | 9 +++++++++ doc/PKGBUILD.5.txt | 8 +++++++- scripts/makepkg.sh.in | 23 ++++++++++++++++------- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 08f98d6..11ceff2 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -21,6 +21,7 @@ replaces=() backup=() options=() install= +changelog= source=($pkgbase-$pkgver.tar.gz) noextract=() md5sums=() #generate with 'makepkg -g' @@ -44,6 +45,7 @@ package_pkg1() { backup=() options=() install= + changelog= cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg1 diff --git a/PKGBUILD.proto b/PKGBUILD.proto index eddcf75..93da0fc 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -21,6 +21,7 @@ replaces=() backup=() options=() install= +changelog= source=($pkgname-$pkgver.tar.gz) noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 994eacc..af0f981 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -115,6 +115,12 @@ syn match pbValidInstall /$[[:alnum:]]\|\$\|+\|-\|_$*\.install/ contained syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote +" changelog +syn keyword pb_k_changelog changelog contained +syn match pbValidChangelog /$[[:alnum:]]\|\$\|+\|-\|_$*/ contained +syn match pbIllegalChangelog /[^=]/ contained contains=pbValidChangelog +syn match pbChangelogGroup /^changelog=.*/ contains=pb_k_changelog,pbValidChangelog,pbIllegalChangelog,shDeref,shDoubleQuote,shSingleQuote + " source: " XXX remove source from shStatement, fix strange bug syn clear shStatement @@ -212,6 +218,9 @@ hi def link pb_k_provides pbKeywords hi def link pbIllegalInstall Error hi def link pb_k_install pbKeywords +hi def link pbIllegalChangelog Error +hi def link pb_k_changelog pbKeywords + hi def link pb_k_source pbKeywords hi def link pbIllegalSource Error diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e6f6edf..435a148 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -79,6 +79,12 @@ similar to `$_basekernver`. be copied into the package by makepkg. It does not need to be included in the source array (e.g. `install=pkgname.install`). +*changelog*:: + Specifies a changelog file which is supposed to be included in the package. + It is required that this file is placed into the same directory as the + PKGBUILD, and makepkg will copy it into the package. The file must not be + included in the source array (e.g. `changelog=$pkgname.changelog`). + *source (array)*:: An array of source files required to build the package. Source files must either reside in the same directory as the PKGBUILD file, or be a @@ -271,7 +277,7 @@ All options and directives for the split packages default to the global values g within the PKGBUILD. However, some of these can be overridden within each split package's packaging function. The following variables can be overridden: `pkgdesc`, `license`, `groups`, `depends`, `optdepends`, `provides`, `conflicts`, `replaces`, -`backup`, `options` and `install`. +`backup`, `options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2941a5d..88487da 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -47,7 +47,7 @@ pkgdir="$startdir/pkg" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgdesc' 'license' 'groups' 'depends' 'optdepends' 'provides' \ - 'conflicts' 'replaces' 'backup' 'options' 'install') + 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides # Options @@ -991,9 +991,9 @@ create_package() { fi # do we have a changelog? - if [ -f "$startdir/ChangeLog" ]; then + if [ -n "$changelog" ]; then msg2 "$(gettext "Adding package changelog...")" - cp "$startdir/ChangeLog" .CHANGELOG + cp "$startdir/$changelog" .CHANGELOG comp_files="$comp_files .CHANGELOG" fi @@ -1059,9 +1059,13 @@ create_srcpackage() { fi fi - if [ -f ChangeLog ]; then - msg2 "$(gettext "Adding %s...")" "ChangeLog" - ln -s "${startdir}/ChangeLog" "${srclinks}/${pkgbase}" + if [ -n "$changelog" ]; then + if [ -f "$changelog" ]; then + msg2 "$(gettext "Adding package changelog...")" + ln -s "${startdir}/$changelog" "${srclinks}/${pkgbase}/" + else + error "$(gettext "Changelog file %s not found.")" "$changelog" + fi fi local netfile @@ -1193,6 +1197,11 @@ check_sanity() { return 1 fi + if [ -n "$changelog" -a ! -f "$changelog" ]; then + error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" + return 1 + fi + local valid_options=1 local opt known kopt for opt in ${options[@]}; do @@ -1646,7 +1655,7 @@ if [ "$ASROOT" -eq 0 \ fi unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides -unset md5sums replaces depends conflicts backup source install build +unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} -- 1.6.4.4

6 11

[pacman-dev] Fwd: Feature Request
by Dan McGee 11 Oct '09

11 Oct '09

Something really old that I found today while cleaning email...not sure if you can pull anything useful out of this, Allan. The from address bounces which is why I'm forwarding this here rather than asking him to write directly. -Dan ---------- Forwarded message ---------- From: Archaic <archaic(a)kconline.com> Date: Sat, Feb 7, 2009 at 8:49 PM Subject: Re: Feature Request To: dan(a)archlinux.org Okay, I think I've managed to integrate this feature request with the minimal fuss and full backwards compatability. To give a run down, the new features will allow for a build(), check(), and inst() section in the PKGBUILD, however, if either check() or inst() are missing, they will be skipped over. Also, check() will never even be attempted unless the 'check' option appears in the PKGBUILD or makepkg.conf. There are 2 other changes that *can* be made to any give PKGBUILD merely as a result of making the above changes: 1) You no longer need to cd "$srcdir/pkgname-pkgver" in the PKGBUILD. The non-standard paths are still viable like ${srcdir}/tcl${pkgver}/unix if so needed. 2) You don't need excess || return 1 statements as in: ./configure make || return 1 make install Provided you use a separate build(), check(), and inst() function, the makepkg code itself will handle the errors. Let me know what you think of these changes. -- Archaic My other computer is an abacus.

1 0

[pacman-dev] [PATCH] FS#8798 - Allow -Qo to perform a functional 'which'
by Jatheendra 11 Oct '09

11 Oct '09

Hi all, This is a simple patch to add a "which" like functionality to pacman -Qo[Bug FS#8798]. This is my first patch ,so any constructive criticism is most welcome. Thanks, Shankar --- src/pacman/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..fb3bb92 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -55,6 +55,43 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip trailing '/' */ + while (path[len-1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname,bufptr) == 0) { + strncpy(filename,fullname,PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -66,21 +103,35 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename,alpm_list_getdata(t),PATH_MAX+1); + char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename,'/') == NULL) { + if((search_path(filename,&buf)) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } + if(S_ISDIR(buf.st_mode)) { pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine ownership of a directory\n")); @@ -140,6 +191,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.0.2

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-63-g72bc947
by dan＠archlinux.org 11 Oct '09

11 Oct '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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 (commit) via 3dc87851cc5990d358cf985d8e79dffeb2d91a21 (commit) via 14ab02e289668e30d33c473e00fc43e5dc457644 (commit) via 471b1fa54395f7f16939e213f50aaf76f390553b (commit) via caea098c2191a2d94a28e90bfef958c34473a5a4 (commit) via 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d (commit) via 302310c5aad5ae25a1e712ca6f9de6bef73e17de (commit) via 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f (commit) via 6e312220ec6668d6fc9ef37dbf581ca155511697 (commit) via 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 (commit) via 145103aacc57d35579315bfbf7c5607c590af194 (commit) via 35dc9b03149dc2f42022fe5fea80a3aed3207489 (commit) from cf0d619670a4d0c67ad67e22bacbb69c203714f5 (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 72bc947cbb8ba752f021f28ec9e9a85c354918e3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Sep 12 20:50:03 2009 +0200 Fix "-Sd conflict_pkg" bug If the -d switch was invoked with -S (or -U), the removes list was simply lost, because trans->remove was computed in an "if(!(trans->flags & PM_TRANS_FLAG_NODEPS))" block. I've added a new pactest file, sync045.py (derived from sync043.py) to test this. Additionally, I did some other minor cleanups in sync_prepare: * preferred list is not needed anymore * I removed a needless alpm_list_remove_dupes line (the target list should not contain dupes at all) * I moved alpm_list_free(remove); to cleanup part to eliminate a possible memleak Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3dc87851cc5990d358cf985d8e79dffeb2d91a21 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Oct 11 02:38:33 2009 +0200 alpm_list : add new alpm_list_diff_sorted function This is more efficient than alpm_list_diff since it assumes the two lists are sorted. And also we get the two sides of the diff. Even sorting should more efficient than the current list_diff. Sorting the two lists should be O(n*log(n)+m*log(m)) while the current list_diff is O(n*m). So I also reimplemented list_diff using list_diff_sorted. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14ab02e289668e30d33c473e00fc43e5dc457644 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 22:49:24 2009 +0200 Rework the alpm_unpack functions Add support to extract a list of entries Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 471b1fa54395f7f16939e213f50aaf76f390553b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 23:56:15 2009 +0200 update sync200 pactest update download -> fetch This just meant that we used XferCommand even if internal download was available, no big deal. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit caea098c2191a2d94a28e90bfef958c34473a5a4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Sep 26 00:58:42 2009 +0200 cygwin fix : use unsigned char for ctype function See http://www.nabble.com/-PATCH-RFA--Distinguish-between-EOF-and-character-wit… cygwin 1.7 actually displays a warning when using signed char with the ctype function, so that compilation fails when using -Wall -Werror. So we just cast all arguments to unsigned char. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35bbc96b99a8f9c8534b20d0ff7a30526b7d957d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 9 20:27:40 2009 +0200 replace rankmirrors by bash clone This removes python optdepends in pacman package This bash clone is a courtesy of Matthew Bruenig <matthewbruenig(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 302310c5aad5ae25a1e712ca6f9de6bef73e17de Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:19:55 2009 -0500 Minor scope/typing cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4828d9ef7c7dc04eb4ad909f9204e909fbaae48f Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:15:27 2009 -0500 libalpm: clean up lock function We were doing a lot of manual work; leverage the standard library a bit to do more for us. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e312220ec6668d6fc9ef37dbf581ca155511697 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:09:39 2009 -0500 Reduce calls to list_count() in removing package We don't need to count the number of packages left once per file when removing; we only need to do it once per package. Also move a variable into the correct scope. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3bc8c28ce3b7f06203842abbf8a8c5e0d21886e9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:04:28 2009 -0500 Add missing get_usedelta() method Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 145103aacc57d35579315bfbf7c5607c590af194 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 14:02:20 2009 -0500 typing: a few more fixes for special int types Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35dc9b03149dc2f42022fe5fea80a3aed3207489 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 11 13:51:47 2009 -0500 int typing: s/unsigned short/int/ in libalpm After our recent screwup with size_t and ssize_t in the download code, I found the `-Wsign-conversion` flag to GCC to see if we were doing anything else boneheaded. I didn't find anything quite as bad, but we did have some goofups- most of our public unsigned methods would return -1 on error, which is a bit odd in an unsigned context. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 15 ++- lib/libalpm/alpm_list.c | 85 ++++++++++--- lib/libalpm/alpm_list.h | 2 + lib/libalpm/backup.c | 8 +- lib/libalpm/be_files.c | 6 +- lib/libalpm/be_package.c | 7 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 6 +- lib/libalpm/dload.c | 8 +- lib/libalpm/handle.c | 15 ++- lib/libalpm/handle.h | 4 +- lib/libalpm/package.c | 4 +- lib/libalpm/package.h | 4 +- lib/libalpm/remove.c | 8 +- lib/libalpm/sync.c | 27 ++--- lib/libalpm/trans.c | 6 +- lib/libalpm/util.c | 75 ++++++++---- lib/libalpm/util.h | 7 +- pactest/tests/{sync043.py => sync045.py} | 4 +- pactest/tests/sync200.py.in | 2 +- scripts/Makefile.am | 4 +- scripts/rankmirrors.py.in | 191 ---------------------------- scripts/rankmirrors.sh.in | 202 ++++++++++++++++++++++++++++++ src/pacman/pacman.c | 4 +- src/pacman/util.c | 10 +- 26 files changed, 404 insertions(+), 304 deletions(-) copy pactest/tests/{sync043.py => sync045.py} (87%) delete mode 100644 scripts/rankmirrors.py.in create mode 100644 scripts/rankmirrors.sh.in hooks/post-receive -- The official pacman repository

1 0