- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix compile error with clang-2.8
by Allan McRae 07 Oct '10

07 Oct '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- wint_t appears to be the same as size_t or unsigned long. It probably best if someone checks that is the right format specifier on x86_64 too... src/pacman/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5b4b2e8..8dc1571 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -261,7 +261,7 @@ void indentprint(const char *str, int indent) } continue; } - printf("%lc", (wint_t)*p); + printf("%u", (wint_t)*p); cidx += wcwidth(*p); p++; } -- 1.7.3.1

3 6

[pacman-dev] [PATCH] Drastically reduce the number of syscalls.
by Tim Nieradzik 06 Oct '10

06 Oct '10

--- lib/libalpm/be_files.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index adf41aa..ddef742 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -113,8 +113,6 @@ 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) { @@ -128,8 +126,7 @@ static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist) } /* 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)) { + if(ent->d_type != DT_DIR) { continue; } @@ -353,8 +350,6 @@ int _alpm_db_populate(pmdb_t *db) { int count = 0; struct dirent *ent = NULL; - struct stat sbuf; - char path[PATH_MAX]; const char *dbpath; DIR *dbdir; @@ -374,9 +369,7 @@ int _alpm_db_populate(pmdb_t *db) if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { continue; } - /* stat the entry, make sure it's a directory */ - snprintf(path, PATH_MAX, "%s%s", dbpath, name); - if(stat(path, &sbuf) != 0 || !S_ISDIR(sbuf.st_mode)) { + if(ent->d_type != DT_DIR) { continue; } @@ -475,13 +468,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) pkgpath = get_pkgpath(db, info); - if(access(pkgpath, F_OK)) { - /* directory doesn't exist or can't be opened */ - _alpm_log(PM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n", - info->name, info->version, db->treename); - goto error; - } - /* DESC */ if(inforeq & INFRQ_DESC) { snprintf(path, PATH_MAX, "%sdesc", pkgpath); -- 1.7.2

4 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-82-gbef19a2
by dan＠archlinux.org 05 Oct '10

05 Oct '10

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 bef19a266bf5d80b68cab02f6a3ccc3fcedbec6d (commit) via 283ef6519aa20b8c63c9b916573b5f243ff7be2e (commit) via 302188b1690e68333a3768f2a6d261559e81ca0a (commit) via c0f58ea9a22c64e42b6784663ceb7272565428f5 (commit) via 960c2cdcf7583251592b02c41161cea65eba28fd (commit) via f2296aab89b12fe49204fba8f62dc8dd2d9e05eb (commit) via 022ec3dbb76686337969cee6e14113b397987cfa (commit) via 821ff061b181d009e0633e5ab12aec7aa608884a (commit) from f7895cc188e221c064aac475908a09d2f50b8d38 (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 bef19a266bf5d80b68cab02f6a3ccc3fcedbec6d Merge: c0f58ea 283ef65 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 5 11:15:56 2010 -0500 Merge branch 'maint' commit c0f58ea9a22c64e42b6784663ceb7272565428f5 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 29 22:24:07 2010 +1000 makepkg: canonicalize paths from environmental variables This prevents circular symlinks and weird final package locations when using commands like 'PKGDEST="." makepkg'. Fixes FS#20922. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 960c2cdcf7583251592b02c41161cea65eba28fd Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 4 18:42:10 2010 +1000 makepkg: compare paths using bash test Compare paths using bash's "-ef" rather than by string tests as this takes symlinks into account. This will prevent issues similar to those in FS#20922 if (e.g.) $PKGDEST is a symlink to $startdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f2296aab89b12fe49204fba8f62dc8dd2d9e05eb Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 29 21:54:31 2010 +1000 makepkg: improve srcdir check and add pkgdir The checking of the package for $srcdir references was overly sensitive and gave a lot of what appear to be false positives with binary files (in particular with debugging symbols kept). Restrict the search for $srcdir to non-binary files as this should still catch the majority of configuration issues the check was initially designed to catch. Also, add a similar check for $pkgdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 022ec3dbb76686337969cee6e14113b397987cfa Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 29 21:22:30 2010 +1000 makepkg: remove STRIP_DIRS For binary packages, the majority of the time used in the debugs symbol stripping process is the actual stripping of the binaries/libraries and not the testing of which files to strip. This allows more complete stripping of packages that install to "non-standard" paths that would not be generally included in makepkg.conf. Any performance hit that may be apparent for (_large_) "arch=('any')" packages can readily be avoided by disabling stripping in the PKGBUILD options array. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 821ff061b181d009e0633e5ab12aec7aa608884a Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Sun Sep 12 22:01:14 2010 +0800 Set pm_errno on libarchive errors while reading Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/makepkg.conf.5.txt | 7 ------- etc/makepkg.conf.in | 4 +--- lib/libalpm/package.c | 16 +++++++++++++--- scripts/makepkg.sh.in | 40 +++++++++++++++++++++++++++++----------- test/pacman/pmpkg.py | 10 ++-------- 6 files changed, 46 insertions(+), 33 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-8-g283ef65
by dan＠archlinux.org 05 Oct '10

05 Oct '10

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 283ef6519aa20b8c63c9b916573b5f243ff7be2e (commit) via 302188b1690e68333a3768f2a6d261559e81ca0a (commit) via fd38319106789e2239d2d31208e463aad8e11a8e (commit) from c2993197ea383aaeb4b0585bfe46235e8c14939d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/bacman | 44 +++++++++++++++++++++++++++++++++++--------- test/pacman/pmpkg.py | 10 ++-------- 3 files changed, 38 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Source archive with development sources
by Christopher Rogers 05 Oct '10

05 Oct '10

I have a very early patch for backup development sources with --allsource option. The idea is to be able to backup all source code even when its svn/git/bzr/hg etc to .src.tar.gz files. This way we can have backup source in case the something goes down or if we mail dvd to place with spotty internet there will get full source code of all of archlinux. No need to download stuff when building. Like i said this is very early patch. I release it now cause i don't really do pacman coding. The source will be download to $startdir then tar.bz2 to $srcdir/$pkgname-$pkgver.tar.bz2. The source is still not added into the .src.tar.gz files yet. I think source array and md5sum array will have to be added for all of it to be all package up. I hope this helps.

3 2

[pacman-dev] [PATCH] makepkg: compare paths using bash test
by Allan McRae 05 Oct '10

05 Oct '10

Compare paths using bash's "-ef" rather than by string tests as this takes symlinks into account. This will prevent issues similar to those in FS#20922 if (e.g.) $PKGDEST is a symlink to $startdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ccf4213..e9a82a9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1061,7 +1061,7 @@ create_package() { exit 1 # TODO: error code fi - if (( ! ret )) && [[ "$PKGDEST" != "${startdir}" ]]; then + if (( ! ret )) && [[ "$PKGDEST" -ef "${startdir}" ]]; then ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" ret=$? fi @@ -1142,7 +1142,7 @@ create_srcpackage() { exit 1 # TODO: error code fi - if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then + if (( ! ret )) && [[ "$SRCPKGDEST" -ef "${startdir}" ]]; then ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" ret=$? fi @@ -1704,7 +1704,7 @@ fi if (( CLEANCACHE )); then #fix flyspray feature request #5223 - if [[ -n $SRCDEST && $SRCDEST != $startdir ]]; then + if [[ -n $SRCDEST && $SRCDEST -ef "${startdir}" ]]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" -- 1.7.3.1

1 1

[pacman-dev] [PATCH] makepkg: canonicalize paths from environmental variables
by Allan McRae 05 Oct '10

05 Oct '10

This prevents circular symlinks and weird final package locations when using commands like 'PKGDEST="." makepkg'. Fixes FS#20922. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9bcd446..ccf4213 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1410,6 +1410,19 @@ run_split_packaging() { done } +# Canonicalize a path if it exists +canonicalize_path() { + local path=$1; + + if [[ -d $path ]]; then + cd $path + path=$(pwd) + cd - &>/dev/null + fi + + echo $path +} + # getopt like parser parse_options() { local short_options=$1; shift; @@ -1615,10 +1628,10 @@ while true; do shift done -#preserve environment variables -_PKGDEST=${PKGDEST} -_SRCDEST=${SRCDEST} -_SRCPKGDEST=${SRCPKGDEST} +# preserve environment variables and canonicalize path +[[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) +[[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) +[[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(canonicalize_path ${SRCPKGDEST}) # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -- 1.7.3.1

4 5

Re: [pacman-dev] Groups. Again.
by Xavier 04 Oct '10

04 Oct '10

Hi list Jakob and I have been going back and forth about where groups handlings should be, in backend or frontend, and how alpm interface should look like. It turns out Jakob has several arguments for the group backend solution, and he spent quite some time working on it, improving and fixing things. This solution fixes several flaws that pacman currently has without drastically changing the code. There are just two disappointing aspects that Jakob covered below in bad news. Also there are still some points I would like to see improved, but more aesthetic than real issues, so low priority. I was going to cover them here, but this will just confuse things and would deserve its own topic/discussion. Jakob Gruber wrote: > Hi Xavier, > > here is yet another revision of the group patches. > > http://github.com/schuay/pacman-arch/commits/group_backend > > This time it should be easier to see what is actually being done. > The commit messages aren't final, I can elaborate on them if the > patches are accepted. > > Changes from the last time (as far as I can remember): > > * use sync_pkg directly for group members and explicitly check if > package is ignored > * use a temporary alpm_list_t instead of a temporary pmgrp_t > * altered few more function signatures to use 'const char *' instead > of 'char *' > * skip to next repo if current repo/group contains only packages > already processed in another repo > > Now to the bad news: > > The repo name ( = db name) is passed to the 'Install whole content > from ...' callback but not to 'group ....:: Members: pkg1 pkg2'. > This results in the following output: http://pastebin.com/LpG0MKSc > This is a little inconsistent, but it's still clear what's going on > IMO. What do you think, is this acceptable? > > Found out yesterday evening that clyde handles new callback values > rather ungracefully. It aborts when it encounters unknown callback > enum values (see > http://github.com/Kiwi/clyde/blob/master//lualpm.c#L2032) It does > the same for all callback enums, pmtransevt, pmloglevel, ... > I opened an issue on their github site about it. This sucks, but I > think it's a bad decision by the clyde developers and should be > changed by them. > > Cheers, > Jakob

4 8

[pacman-dev] [PATCH] makepkg: canonicalize paths from environmental variables
by Allan McRae 04 Oct '10

04 Oct '10

This prevents circular symlinks and weird final package locations when using commands like 'PKGDEST="." makepkg'. Fixes FS#20922. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that this adds readlink as a dependency to makepkg. That is provided by coreutils which is essential anyway so I do not think this is an issue. scripts/makepkg.sh.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 01d73f8..9c85d21 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1616,10 +1616,10 @@ while true; do shift done -#preserve environment variables -_PKGDEST=${PKGDEST} -_SRCDEST=${SRCDEST} -_SRCPKGDEST=${SRCPKGDEST} +# preserve environment variables and canonicalize path +[[ -n ${PKGDEST} ]] && _PKGDEST=$(readlink -f ${PKGDEST}) +[[ -n ${SRCDEST} ]] && _SRCDEST=$(readlink -f ${SRCDEST}) +[[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(readlink -f ${SRCPKGDEST}) # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -- 1.7.3

5 11

[pacman-dev] [PATCH] makepkg: improve srcdir check and add pkgdir
by Allan McRae 02 Oct '10

02 Oct '10

The checking of the package for $srcdir references was overly sensitive and gave a lot of what appear to be false positives with binary files (in particular with debugging symbols kept). Restrict the search for $srcdir to non-binary files as this should still catch the majority of configuration issues the check was initially designed to catch. Also, add a similar check for $pkgdir. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed1380d..01d73f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -972,10 +972,15 @@ check_package() { fi done - # check for references to the build directory - if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then + # check for references to the build and package directory + local filelist=$(find "${pkgdir}" -type f) + if grep -q -I "${srcdir}" $filelist; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi + if grep -q -I "${pkgdir}" $filelist; then + warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + fi + } create_package() { -- 1.7.3

6 16