- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Use colon instead of dot separator for chown
by Sebastian Nowicki 28 May '08

28 May '08

On BSD systems using a dot as a separator is not allowed. On Mac OSX it is deprecated. A colon should be used instead. BSD systems also use the "wheel" group instead of "root" to indicate the "super user" group. Both groups use the id of 0. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..1209bd0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -629,8 +629,8 @@ extract_sources() { done if [ $EUID -eq 0 ]; then - # chown all source files to root.root - chown -R root.root "$srcdir" + # chown all source files to root:0 + chown -R root:0 "$srcdir" fi } -- 1.5.5.1

4 6

[pacman-dev] [PATCH] Replace usage of "cp -s" with the more portable "ln -s"
by Sebastian Nowicki 28 May '08

28 May '08

The "-s" argument does not exist on BSD, and neither does "--remove-destination". This patch replaces the calls to "cp -s --remove-destination" with the equivalent "rm -f" and "ln -s" calls, in order to increase portability. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f56bcda..9da3687 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -435,11 +435,13 @@ download_sources() { local file=$(strip_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" - cp -s --remove-destination "$startdir/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$startdir/$file" "$srcdir/" continue elif [ -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Using cached copy of %s")" "$file" - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" continue fi @@ -464,7 +466,8 @@ download_sources() { if echo "$dlclient" | grep -q "%o" ; then mv -f "$SRCDEST/$file.part" "$SRCDEST/$file" fi - cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" + rm -f "$srcdir/$file" + ln -s "$SRCDEST/$file" "$srcdir/" done popd &>/dev/null -- 1.5.4.5

4 15

[pacman-dev] [PATCH] Tidy up of the handle struct in libalpm
by Allan McRae 27 May '08

27 May '08

Removed unused handle->uid from pmhandle_t. The need to check permissions should be determined by the frontend (and is in pacman). Fixed comment on noextract in pmhandle_t. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/handle.c | 3 --- lib/libalpm/handle.h | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5f209d4..c01dd55 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <limits.h> #include <sys/types.h> #include <syslog.h> @@ -53,8 +52,6 @@ pmhandle_t *_alpm_handle_new() handle->lckfd = -1; handle->logstream = NULL; - /* see if we're root or not */ - handle->uid = geteuid(); handle->root = NULL; handle->dbpath = NULL; handle->cachedirs = NULL; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5051917..9c537b1 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -30,7 +30,6 @@ typedef struct _pmhandle_t { /* internal usage */ - uid_t uid; /* current UID */ /* TODO is this used? */ pmdb_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (pmdb_t *) */ FILE *logstream; /* log file stream pointer */ @@ -50,7 +49,7 @@ typedef struct _pmhandle_t { /* package lists */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ - alpm_list_t *noextract; /* List of packages NOT to extract */ /*TODO is this used?*/ + alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ alpm_list_t *ignoregrp; /* List of groups to ignore */ -- 1.5.5.1

3 2

[pacman-dev] pacman-contrib package
by Allan McRae 27 May '08

27 May '08

Hi everyone, With the release of pacman 3.1.2 I was reminded to get around to putting a pacman-contrib package into AUR/community like I said I would [1]. I have categorized the files in the contrib directory below. Utilities: pacdiff pacsearch re-pacman (needs some updates? [2]) wget-xdelta.sh vim: PKGBUILD.vim vimproject (needs updated - developer use only) Included in pacman package: bash_completion zsh_completion Old: gensync updatesync I think the pacman-contib package should only include pacdiff, pacserach, re-pacman, PKGBUILD.vim. I did a very quick review of the files to check if they still work with the current pacman. As far as I can tell pacdiff and pacsearch don't need updated. I will look into updating re-pacman as I don't see any commits to this file since [2]. No idea about the status with PKGBUILD.vim - I don't use vim for PKGBUILDs so can someone else comment here. Any comments on the status of these scripts or list of scripts to be included? Thanks, Allan [1] http://www.archlinux.org/pipermail/pacman-dev/2008-February/011076.html [2] http://www.archlinux.org/pipermail/pacman-dev/2008-January/010788.html

6 15

[pacman-dev] [PATCHES] Refreshed PKGBUILDs
by Geoffroy Carrier 26 May '08

26 May '08

Hi! See patches as attachments. Globally cosmetic changes. Assumptions: - $startdir should be used as $srcdir and $pkgdir parent, as it could be useful, for example, to have $pkgdir in a tmpfs => Removed any reference to "$startdir/pkg" or "$startdir/src" => Relative paths to switch between $srcdir and $pkgdir should be avoided. E.g.: cd $srcdir/A patch [...] < ../../pkg/ is non-sense - $pkgdir and $srcdir could contain namespaces, etc. and we shouldn't try to guess about $IFS => "$srcdir/A" instead of $srcdir/A (use of "") - Still, lightweight means smater => Don't use "$_svntrunk" ${something} instead of $_svntrunk $something - "folder" is prefered to "folder/" in our scripts, but we should not suppose a makefile doesn't use something like "${DESTDIR}usr/bin" => DESTDIR="$pkgdir/", "$pkgdir" otherwise Have a nice day ;) -- Geoffroy Carrier http://gcarrier.koon.fr/

4 3

[pacman-dev] memleak around -Qu
by Nagy Gabor 26 May '08

26 May '08

Hi! This is not a big issue, but memleaks are just ugly. I mentioned this in the 2. point of my http://bugs.archlinux.org/task/7884#comment25485 comment. See pacman/query.c/query_upgrades(): The result of alpm_sync_sysupgrade just printed but not freed (as I see, the front-end couldn't do it anyway) Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 1

[pacman-dev] [PATCH] Stop reinstalling message when using print-uris
by Allan McRae 26 May '08

26 May '08

The stops the "pkg is up to date -- reinstalling" message when only asking for uris to be printed. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 0d6a6ee..02d64ea 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -339,7 +339,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy alpm_pkg_get_name(local), alpm_pkg_get_version(local)); return(0); } else { - if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), alpm_pkg_get_name(local), alpm_pkg_get_version(local)); } -- 1.5.5.1

2 1

[pacman-dev] PM_TRANS_EVT_EXTRACT_START missing?
by Sebastian Nowicki 24 May '08

24 May '08

It seems every action has a START and DONE event, apart from package extraction. I was wondering if the extract action was supposed to have a PM_TRANS_EVT_EXTRACT_START event as well? -- Sebastian Nowicki

2 2

[pacman-dev] [PATCH] be_files : stores REPLACES and FORCE in desc.
by Xavier Chantry 23 May '08

23 May '08

repo-add and db_read both assume that REPLACES and FORCE fields are in the desc file, so do that for db_write as well (instead of depends file). Note that db_write is currently only used on the local database. And the only purpose of replaces and force in local database is for information purpose (available on -Qi operations). So this is not a big problem. Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-May/011859.html Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/be_files.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7b3d824..2302374 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -672,6 +672,16 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + if(info->replaces) { + fputs("%REPLACES%\n", fp); + for(lp = info->replaces; lp; lp = lp->next) { + fprintf(fp, "%s\n", (char *)lp->data); + } + fprintf(fp, "\n"); + } + if(info->force) { + fprintf(fp, "%%FORCE%%\n\n"); + } if(local) { if(info->url) { fprintf(fp, "%%URL%%\n" @@ -795,17 +805,6 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } - if(info->replaces) { - fputs("%REPLACES%\n", fp); - for(lp = info->replaces; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - } - if(info->force) { - /* note the extra newline character, which is necessary! */ - fprintf(fp, "%%FORCE%%\n\n"); - } fclose(fp); fp = NULL; } -- 1.5.5.1

2 1

[pacman-dev] REPLACES and FORCE in depends or desc files
by Xavier 22 May '08

22 May '08

While inspecting the freshly rebuilt databases, I noticed the following problem : * repo-add adds these two entries in desc file * pacman reads them from desc file (for both local or sync db) * pacman writes them to depends file (only possible with local db) after the following commit : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=26f4993e1d67a7da… By the way, the above commit actually enabled previously unused code, as Nagy noticed : http://www.archlinux.org/pipermail/pacman-dev/2008-January/010662.html This code was only run when local == 0. But when we use db_write, it is always on local db, so we always have local == 1. The fact that this code was previously unused probably explains why this problem hasn't been detected until now. But actually I just found the real reason by going deeper in the history. The replaces and force fields were originally moved from desc to depends during pacman 3 development, but then it was reverted before the release : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=13e21110459aaf99… But only db_read was reverted, not db_write. This was impossible to detect back then because this code was unused. This code was later enabled, leading to the inconsistency. I guess the quickest / easiest fix is to fix db_write to also put force / replaces in the desc file, and then have a new 3.1.x release. The local database will be slightly messed up but it will go away eventually, as upgrade goes. Note that this is totally harmless, because the force / replaces in local db are totally unused. They were just added for consistency / completeness, and to have all informations on -Qi operations. So harmless but still worth fixing imo.

3 3