- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-121-g0eadc99
by dan＠archlinux.org 20 Jan '10

20 Jan '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 0eadc992400aaad58da5866d23caee01a22e1341 (commit) via 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 (commit) via ce9bb994f86f9653dc293f2dda0f8f2160964090 (commit) via 0c3f5020645ab5ab28113322e33abdeeb2b34a63 (commit) via a12ed63545ee16d37da2b28bbf4c1820bd367315 (commit) via afc37c58c74848a11adb04b0ae182cca467cd25e (commit) via 335627d72dd5e51201b4cd53d84b70954946c013 (commit) from a6cca6e456e9b84362e00b5e5209059a20df965c (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 0eadc992400aaad58da5866d23caee01a22e1341 Merge: afc37c58c74848a11adb04b0ae182cca467cd25e 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 19 22:03:54 2010 -0600 Merge branch 'maint' Just a slight touchup in makepkg due to the [ -> [[ conversion, so nothing to see here. Conflicts: scripts/makepkg.sh.in commit afc37c58c74848a11adb04b0ae182cca467cd25e Author: Nezmer <git(a)nezmer.info> Date: Tue Jan 19 20:05:06 2010 +0200 makepkg: Introduce $SRCPKGDEST Introduce $SRCPKGDEST to define a destination dir for source packages instead of saving them in $PKGDEST with binary packages. The simple patch doesn't break old behavior. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 2 ++ lib/libalpm/alpm.c | 1 + scripts/makepkg.sh.in | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Print "there is nothing to do" with NOOP transactions
by Nagy Gabor 19 Jan '10

19 Jan '10

The "local database is up to date" message has been replaced with "there is nothing to do" message. This used with "empty" -S, -R, -U operations too. (Examples: pacman -S ignored_pkg, pacman -Ru needed_pkg.) See FS#17859. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/remove.c | 1 + src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 6d44350..61b57c7 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -118,6 +118,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 3: actually perform the removal */ alpm_list_t *pkglist = alpm_trans_get_remove(); if(pkglist == NULL) { + printf(_(" there is nothing to do\n")); goto cleanup; /* we are done */ } /* print targets and ask user confirmation */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..24acf5f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -663,7 +663,7 @@ static int sync_trans(alpm_list_t *targets) packages = alpm_trans_get_add(); if(packages == NULL) { /* nothing to do: just exit without complaining */ - printf(_(" local database is up to date\n")); + printf(_(" there is nothing to do\n")); goto cleanup; } diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 57c7b79..ddb4796 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -132,6 +132,7 @@ int pacman_upgrade(alpm_list_t *targets) /* print targets and ask user confirmation */ alpm_list_t *packages = alpm_trans_get_add(); if(packages == NULL) { /* we are done */ + printf(_(" there is nothing to do\n")); trans_release(); return(retval); } -- 1.6.6

1 0

[pacman-dev] [PATCH] Show used/freed space when syncing (FR FS#12566)
by Hugo Chargois 11 Jan '10

11 Jan '10

Shows the "Total Used/Freed Size" after "Total Download Size" and "Total Installed Size" when syncing packages. It is the difference of installation size between packages to be updated and the installation size of the older version of these packages on disk. For exemple, if uploading to a new version of a package that has an installed size of 60 and the old version has an installed size of 50, this will show 10. Negative numbers represent space actually freed. Signed-off-by: Hugo Chargois <hugo.chargois(a)free.fr> --- src/pacman/util.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..e1e0064 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -44,6 +44,7 @@ #include "conf.h" #include "callback.h" +extern pmdb_t db_local; int trans_init(pmtransflag_t flags) { @@ -498,8 +499,8 @@ void display_targets(const alpm_list_t *pkgs, int install) { char *str; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; - double mbisize = 0.0, mbdlsize = 0.0; + off_t isize = 0, dlsize = 0, localsize = 0; + double mbisize = 0.0, mbdlsize = 0.0, mbdeltasize = 0.0; alpm_list_t *targets = NULL; if(!pkgs) { @@ -510,8 +511,14 @@ void display_targets(const alpm_list_t *pkgs, int install) for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); + char *name = alpm_pkg_get_name(pkg); + pmpkg_t *local_pkg = alpm_db_get_pkg(db_local, name); + dlsize += alpm_pkg_download_size(pkg); isize += alpm_pkg_get_isize(pkg); + if(local_pkg != NULL){ + localsize += alpm_pkg_get_isize(local_pkg); + } /* print the package size with the output if ShowSize option set */ if(config->showsize) { @@ -527,9 +534,10 @@ void display_targets(const alpm_list_t *pkgs, int install) targets = alpm_list_add(targets, str); } - /* Convert byte sizes to MB */ + /* Convert byte sizes to MB and calculate delta size*/ mbdlsize = dlsize / (1024.0 * 1024.0); mbisize = isize / (1024.0 * 1024.0); + mbdeltasize = (isize - localsize) / (1024.0 * 1024.0); if(install) { asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); @@ -539,6 +547,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Download Size: %.2f MB\n"), mbdlsize); printf(_("Total Installed Size: %.2f MB\n"), mbisize); + printf(_("Total Size Used/Freed: % .2f MB\n"), mbdeltasize); } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.3.3

1 0

[pacman-dev] Humble proposal: replace autotools by CMake for pacman
by Yannick LM 09 Jan '10

09 Jan '10

Hi, First of all, since it's my first message on this list, a few words about myself: I'm a French software engineer in a small company, I've use Arch from several years now, and CMake at work. (We produce a big piece of software written in C++ that must run on windows, linux and mac) I'm also a huge fan of the Python language. Also, a few words about cmake: Web page: http://www.cmake.org/ Typical workflow is: cd /path/to/source mkdir build cd build cmake .. ccmake . #optional, to change configuration make Pros : * Nothing gets generated anywhere but in source/build, so there's no need for "clean" rules and a .gitignore containing "build" is enough :) * It's widely used, so lots of stuff such as using gettext is easily done. * It's fast! (written in C++) Cons: * It has a ugly syntax * It lacks decent documentation: http://cmake.org/cmake/help/cmake-2-8-docs.html is all you've got. Back to the subject: one day I decided it would be great to see libalpm wrapped in Python (or Ruby, or whatever ...) It's quite easy done once you use swig, and swig is easy when you use cmake. So, I started hacking a few CMakeLists files. The result is in a "cmake" branch in git://sd-5791.dedibox.fr/prog/pacman.git (which I'll try to keep not too far from pacman's official master branch) Right now, here's what those files can do: * let the user choose a few variables such as CONFFILE, DBEXT, LOGFILE (using ccmake) * build libalpm and pacman * install some files. If you want, I could take care of everything that's still missing: documentation, translations, tests ... I don't have much spare time to spend on this, but there's no need to hurry, isn't it? Just let me know if you are interested or if you have any question on the subject. Cheers, Yannick LM

3 3

[pacman-dev] Parsing variables in PKGBUILD packaging functions.
by Xyne 06 Jan '10

06 Jan '10

Hi, Is there any way to _unequivocally_ parse PKGBUILD variables within a "package" function, e.g. "depends", without executing the entire code block? Please tell me that you don't actually need to build the package(s) to get all of the variables. Thanks, Xyne *holds breath and hopes*

2 2

[pacman-dev] Handling splitpkg overrides in scripts
by Allan McRae 27 Dec '09

27 Dec '09

This is the start of what will be a makepkg test suite. It shows a (somewhat robust?) method of parsing splitpkg overrides so will be of use when updating db-scripts to handle splitpkg's with different arch/pkgrel/pkgver's (which can be overrided in pacman-git now). It extracts the "package_foo()" function with a sed statements that assumes that it starts at the start of the line and the closing "}" is the only thing on its line (could be made more robust...). Then is extracts the various variables using a grep. It can handle the following syntax: foo=1 foo=STRING foo="ABC DEF" for=('a' 'b' \ 'c' ) which is basically everything... Any comments on how to improve this are welcome. Allan #!/bin/bash splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') readonly -a splitpkg_overrides backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} fi done } parse_splitpkg_overrides() { if grep -q "package_$1()" PKGBUILD; then pkgfunc=$(sed -n "/^package_$1/,/^}/p" PKGBUILD) for var in ${splitpkg_overrides[@]}; do eval $(echo $pkgfunc | grep -Eo "$var=(\"[^)]*\"|$[^)]*$|[^ ]*)") done fi } ## # Checks if all packages are created - does not work yet... :P ## pkg_exists() { # get package arch if [[ $arch != "any" ]]; then arch=$CARCH fi for pkg in ${pkgname[@]}; do # check for package specific overrides backup_package_variables parse_splitpkg_overrides $pkg echo $pkg-$pkgver-$pkgrel-$arch$PKGEXT restore_package_variables done } source /etc/makepkg.conf source PKGBUILD pkg_exists

1 0

[pacman-dev] [PATCH] Do not print installed size when only downloading
by Allan McRae 23 Dec '09

23 Dec '09

When using --downloadonly the "Total Installed Size" message is not needed and perhaps misleading. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..d237d00 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -538,7 +538,9 @@ void display_targets(const alpm_list_t *pkgs, int install) printf("\n"); printf(_("Total Download Size: %.2f MB\n"), mbdlsize); - printf(_("Total Installed Size: %.2f MB\n"), mbisize); + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + printf(_("Total Installed Size: %.2f MB\n"), mbisize); + } } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.5.6

1 0

[pacman-dev] [PATCH] Allow -Qo to perform a functional 'which'
by Allan McRae 23 Dec '09

23 Dec '09

When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Patch-by: Shankar <jatheendra(a)gmail.com> [Allan: rework for master, tidy-up] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This was original posted a year ago... http://mailman.archlinux.org/pipermail/pacman-dev/2008-November/007659.html The comments then were that we should maybe refactor out stuff dealing with file paths, specifically removing trailing backslashes. That appears to only occur in two other places and is very simple so I do not thing it needs refactored and can be done in a spearate patch if necessary. The only other part I do not like is the "failed to read file" error block is repeated, but I can not see a nice way to fix that. src/pacman/query.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..6f579fd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -56,6 +56,41 @@ 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 the trailing slash if one exists */ + if(path[len - 1] == '/') { + path[len - 1] = '\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; @@ -67,19 +102,31 @@ 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(lstat(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)) { @@ -140,6 +187,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.5.6

3 8

[pacman-dev] [PATCH] makepkg: make strip options configurable
by Cedric Staniewski 21 Dec '09

21 Dec '09

The newly added variables STRIP_BINARIES, STRIP_SHARED and STRIP_STATIC, that are set in makepkg.conf, specify the strip options used on binaries and shared and static libraries. In addition, files are now stripped more aggressively by default. Implements FS#13592 the way it was suggested by Allan in the comments. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- configure.ac | 9 +++++++++ doc/Makefile.am | 14 ++++++++++++-- doc/makepkg.conf.5.txt | 12 ++++++++++++ etc/Makefile.am | 3 +++ etc/makepkg.conf.in | 6 ++++++ scripts/makepkg.sh.in | 6 +++--- 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 80e41a6..faf774f 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,9 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -L -c %s" SEDINPLACE="sed -i" +STRIP_BINARIES="--strip-all" +STRIP_SHARED="--strip-unneeded" +STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) SIZECMD="stat -L -f %z" @@ -199,6 +202,9 @@ case "${host_os}" in host_os_darwin=yes SIZECMD="/usr/bin/stat -L -f %z" SEDINPLACE="/usr/bin/sed -i ''" + STRIP_BINARIES="" + STRIP_SHARED="-S" + STRIP_STATIC="-S" ;; esac @@ -206,6 +212,9 @@ AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) +AC_SUBST(STRIP_BINARIES) +AC_SUBST(STRIP_SHARED) +AC_SUBST(STRIP_STATIC) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) diff --git a/doc/Makefile.am b/doc/Makefile.am index fcbcab8..ce1adab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -66,6 +66,12 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif +#### Taken from the autoconf scripts Makefile.am #### +edit = sed \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' + man_MANS = dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8 @@ -93,8 +99,12 @@ A2X_OPTS = \ --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile + @echo GEN $@; + @rm -f $@.tmp + @test -f $(srcdir)/$@.txt && $(edit) $(srcdir)/$@.txt >$@.tmp || true + a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.tmp + @rm -f $@.tmp %.html: %.txt asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 88c4cbb..359db68 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -135,6 +135,18 @@ Options affects both generation and checking. The current valid options are: `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. +**STRIP_BINARIES=**"@STRIP_BINARIES@":: + Options to be used when stripping binaries. See `strip''s man page + for details. + +**STRIP_SHARED=**"@STRIP_SHARED@":: + Options to be used when stripping shared libraries. See `strip''s + man page for details. + +**STRIP_STATIC=**"@STRIP_STATIC@":: + Options to be used when stripping static libraries. See `strip''s + man page for details. + **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: If `zipman` is specified in the OPTIONS array, this variable will instruct makepkg where to look to compress manual (man and info) diff --git a/etc/Makefile.am b/etc/Makefile.am index 55c28c3..25f1834 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -13,6 +13,9 @@ edit = sed \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..032a7fc 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -72,6 +72,12 @@ OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="@STRIP_BINARIES@" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="@STRIP_SHARED@" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="@STRIP_STATIC@" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0688e7c..e2d6cef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -853,11 +853,11 @@ tidy_install() { *compressed-encoding*) # Skip compressed binaries ;; *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_SHARED "$binary";; *application/x-archive*) # Libraries (.a) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_STATIC "$binary";; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip $STRIP_BINARIES "$binary";; esac done fi -- 1.6.5.6

2 5

Re: [pacman-dev] [arch-dev-public] doc size
by Xavier 18 Dec '09

18 Dec '09

On Wed, Dec 16, 2009 at 11:07 PM, Xavier <shiningxc(a)gmail.com> wrote: > > The results are slightly different, mostly because makepkg > overestimates uncompressed size by not using -a with du, while namcap > lotsofdocs computes the real size. > > Now that I think about it, maybe the trick/hack I used in my first > script would actually be a portable way to get the real uncompressed > size : > bsdtar tvf foo.pkg.tar.gz 2>/dev/null | awk '{ SUM += $5 } END { print SUM }' > > But this is offtopic, I should find again the makepkg bug report we > had about this that we probably rejected :P > http://bugs.archlinux.org/task/11225 I see, so we made a patch for repo-add : http://bugs.archlinux.org/task/11225?getfile=2429 I also made one for makepkg : http://bugs.archlinux.org/task/11225?getfile=2426 But Dan rejected it with this reason : "Note that I did not touch makepkg because our size there is not critical- a size to the nearest K is just fine, and switching to a find/stat way of doing it would cause all hard links to get double-counted." It is a size to the nearest K for each file, and we accumulate the errors ? I did not realize the difference was so big until today, when playing with docsize stuff. e.g. for libsigc++-2.0 : du -s = 12040 K du -s --apparent-size = 10723 K So that's 1300K. and 12% error if I am not mistaken.

2 3

[pacman-dev] [PATCH 1/2] callback.c : less magic progress bars
by Xavier Chantry 16 Dec '09

16 Dec '09

1 - Explain magic numbers 2 - There was a weird off by 1 mess in the progress bar. The code supposedly shared the width between 50 chars for text (textlen) and the rest for the progress bar (proglen = getcols() - textlen). But the code actually used textlen + 1 for the text and proglen - 1 for the progress bar (with haslen=1, the progress bar was actually empty), which was a bit confusing so I changed it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/callback.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 15f5423..a40a702 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -90,20 +90,20 @@ static float get_update_timediff(int first_call) static void fill_progress(const int bar_percent, const int disp_percent, const int proglen) { - const unsigned int hashlen = proglen - 8; - const unsigned int hash = bar_percent * hashlen / 100; - static unsigned int lasthash = 0, mouth = 0; - unsigned int i; + /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ + const int hashlen = proglen - 8; + const int hash = bar_percent * hashlen / 100; + static int lasthash = 0, mouth = 0; + int i; if(bar_percent == 0) { lasthash = 0; mouth = 0; } - /* magic numbers, how I loathe thee */ - if(proglen > 8) { + if(hashlen > 0) { printf(" ["); - for(i = hashlen; i > 1; --i) { + for(i = hashlen; i > 0; --i) { /* if special progress bar enabled */ if(config->chomp) { if(i > hashlen - hash) { @@ -139,7 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent, printf("]"); } /* print display percent after progress bar */ - if(proglen > 5) { + /* 5 = 1 space + 3 digits + 1 % */ + if(proglen >= 5) { printf(" %3d%%", disp_percent); } @@ -376,7 +377,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, ++digits; } /* determine room left for non-digits text [not ( 1/12) part] */ - textlen = infolen - 3 - (2 * digits); + textlen = infolen - 3 /* (/) */ - (2 * digits) - 1 /* space */; /* In order to deal with characters from all locales, we have to worry * about wide characters and their column widths. A lot of stuff is @@ -451,7 +452,8 @@ void cb_dl_total(off_t total) void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { const int infolen = 50; - const int filenamelen = infolen - 27; + /* explanation of magic 28 number at the end */ + const int filenamelen = infolen - 28; char *fname, *p; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; @@ -613,6 +615,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } } + /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname, padwid, "", f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); -- 1.6.5.6

1 1

[pacman-dev] [PATCH] zsh_completion: Add proper completion for --ignore and --ignoregroup
by Nezmer 15 Dec '09

15 Dec '09

This patch provides proper comma-separated completions for --ignore and --ignoregroup Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- contrib/zsh_completion | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..b27261f 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -86,9 +86,9 @@ _pacman_opts_sync_modifiers=( '-w[Download packages only]' '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package: - _pacman_completions_all_packages' - '*--ignoregroup[Ignore a group upgrade]:package group: - _pacman_completions_all_groups' + _pacman_completions_ignore_packages' + '*--ignoregroup[Ignore a group upgrade]:group: + _pacman_completions_ignore_groups' '--asdeps[Install packages as non-explicitly installed]' '--asexplicit[Install packages as explicitly installed]' ) @@ -240,6 +240,29 @@ _pacman_completions_all_packages() { fi } +# provides comma-separated completions for packages available from repositories +# to be used with --ignore +_pacman_completions_ignore_packages() { + local -a cmd packages repositories packages_long + + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted packages expl "packages" _values -s "," compadd - "${(@)packages}" +} + +# provides comma-separated completions for package groups to be used +# with --ignoregroup +_pacman_completions_ignore_groups() { + local -a cmd groups + _pacman_get_command + groups=($(pacman -Sg)) + typeset -U groups + _wanted groups expl "groups" _values -s "," compadd - "${(@)groups}" +} + # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups -- 1.6.5.6

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.3-1-g335627d
by dan＠archlinux.org 15 Dec '09

15 Dec '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 335627d72dd5e51201b4cd53d84b70954946c013 (commit) from e09253d15b879f3375d57efd656e687a984ebc36 (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 335627d72dd5e51201b4cd53d84b70954946c013 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 16:06:42 2009 +0200 makepkg: check for non-empty pkgbase instead of pkgname pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. 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> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: move pacman calls to a function
by Cedric Staniewski 14 Dec '09

14 Dec '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- I'm not sure about that part pmout=$(run_pacman -T "$@") for two reasons. First, we have to work around sudo in run_pacman, and second, most of the pacman wrappers does not support -T or do not return the same codes as pacman does. For this second reason, the following patch would be (currently) useless for the majority of pacman wrapper users. scripts/makepkg.sh.in | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fbcdc70..cfc5736 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -328,10 +328,21 @@ download_file() { fi } +run_pacman() { + local ret=0 + if (( ! ASROOT )) && [[ $1 != -T ]]; then + sudo pacman $PACMAN_OPTS "$@" || ret=$? + else + pacman $PACMAN_OPTS "$@" || ret=$? + fi + return $ret +} + check_deps() { [ $# -gt 0 ] || return - pmout=$(pacman $PACMAN_OPTS -T "$@") + local ret=0 + pmout=$(run_pacman -T "$@") ret=$? if [ $ret -eq 127 ]; then #unresolved deps echo "$pmout" @@ -356,15 +367,8 @@ handle_deps() { if [ "$DEP_BIN" -eq 1 ]; then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" - local ret=0 - - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - else - pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - fi - if [ $ret -ne 0 ]; then + if ! run_pacman -S --asdeps $deplist; then error "$(gettext "Pacman failed to install missing dependencies.")" exit 1 # TODO: error code fi @@ -422,15 +426,9 @@ remove_deps() { done msg "Removing installed dependencies..." - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? - else - pacman $PACMAN_OPTS -Rns $deplist || ret=$? - fi # Fixes FS#10039 - exit cleanly as package has built successfully - if [ $ret -ne 0 ]; then + if ! run_pacman -Rns $deplist; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -1113,14 +1111,7 @@ install_package() { fi done - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - else - pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - fi - - if [ $ret -ne 0 ]; then + if ! run_pacman -U $pkglist; then warning "$(gettext "Failed to install built package(s).")" return 0 fi -- 1.6.5.2

4 41

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-114-ga6cca6e
by dan＠archlinux.org 14 Dec '09

14 Dec '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 a6cca6e456e9b84362e00b5e5209059a20df965c (commit) via 9fe27b068ae40a407fd5dd12f974d84499d41ef0 (commit) via 05ff276eefc51eeeee58832accd8398eac047037 (commit) via 66c6d288fd44b2f148860c7abbd1ed56b31a9238 (commit) via b805fe58ae8e762f2d663cb6416005521b76e182 (commit) via a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec (commit) via b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 (commit) via 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d (commit) via 444ff9564195223e31d445459009fceb2ae79002 (commit) via e612eb6ba227104761b9c6fafe375c74267bba09 (commit) via 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 (commit) via 03f35b1432675f5b10ec53945e48c2bbd7c628e9 (commit) from f2c9e51eb00edb2f3123bd150fd9944c765426e0 (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 a6cca6e456e9b84362e00b5e5209059a20df965c Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:05:39 2009 +0100 makepkg: remove srclinks directory on error exit When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. 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 9fe27b068ae40a407fd5dd12f974d84499d41ef0 Author: Nezmer <Nezmer(a)allurelinux.org> Date: Sat Dec 12 01:25:32 2009 +0200 makepkg: skip devel_check() when repackaging Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> [Allan: adjusted comment] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05ff276eefc51eeeee58832accd8398eac047037 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:33 2009 +0100 makepkg: limit sudo usage to allowed pacman commands This is particularly useful when using pacman wrappers which call sudo by themselves and therefore should not be run as root. 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 66c6d288fd44b2f148860c7abbd1ed56b31a9238 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:32 2009 +0100 makepkg: allow to specify an alternative pacman command If PACMAN environment variable is set, makepkg will try to use this command to check for installed dependencies and to install or remove packages. Otherwise, makepkg will fall back to pacman. Implements FS#13028. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: move envvar section in manpage] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b805fe58ae8e762f2d663cb6416005521b76e182 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 25 13:57:20 2009 +1000 makepkg: check for references to build root in package Add a check that the package does not contain references to the folder it was built in. Fixes FS#14751 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 9 23:20:29 2009 +0100 improve download_internal error messages download_internal is supposed to always set pm_errno but did not in many cases. The most important (and tested) change is the one concerning fetchStat. This is typically where the code will fail when the network is down for example. Before commit d2dbb04a9af7a18da, this fetchStat call did not exist and the same kind of errors would be encountered in the fetchXGet call that follows. I just copied the error printing to restore the old behavior. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:45:34 2009 +0100 add some more sanity check for optarg getopt should already ensure that optarg is not NULL when an argument is required, but just be extra safe and double check it before using optarg. To be honest, I only did that to make clang shut up and eliminate the last warnings it reported. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:20:53 2009 +0100 refactor _parseoptions This function was quite huge (~230 lines) and difficult to parse, now it is slightly better. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 444ff9564195223e31d445459009fceb2ae79002 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 13 16:42:42 2009 +0100 Print error on duplicated database entries Some users reported duplicated database entries in /var/lib/pacman/local/, for example, both foo-1.0-1 and foo-2.0-1 subdirectories existed. (Bogus 3rd-party scripts, backup?) In this case pacman reported no error and its behaviour was mysterious. From now on, pacman detects this situation and prints an error message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e612eb6ba227104761b9c6fafe375c74267bba09 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 13 23:12:44 2009 -0600 Remove trailing whitespace on all lines in list_display This ensures we never have trailing whitespace. Take the following text, with line numbers added for clarity: 1. Title : item1 item2 item3 item4 2. item5 item6 item7 item8 3. item9 itemA itemB itemC Laszlo Papp helpfully pointed out we would have two trailing spaces on line three after the last item. However, we also had these trailing spaces on lines one and two, which the initial patch didn't take care of. This can be seen on something like `pacman -Qi glibc`. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 7 22:48:59 2009 -0600 Fix requiredby output This is a bit embarrassing. For example: $ pacman -Qi mesa ... Required By : mesa mesa mesa mesa mesa mesa Something is clearly not right, and the problem was introduced in commit 0bc961. Fix the issue by getting the package name off the correct variable. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03f35b1432675f5b10ec53945e48c2bbd7c628e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 30 22:56:44 2009 -0600 bash_completion: use absolute paths to utilities Fixes issues noted in FS#16630. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 28 ++-- doc/makepkg.8.txt | 9 ++ lib/libalpm/be_files.c | 7 + lib/libalpm/dload.c | 10 +- lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 33 +++-- src/pacman/pacman.c | 324 +++++++++++++++++++++++++++-------------------- src/pacman/util.c | 10 +- 8 files changed, 251 insertions(+), 172 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove trailing whitespaces in the output for -Qi/-Si
by Laszlo Papp 14 Dec '09

14 Dec '09

--- src/pacman/util.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 115b367..e23d96d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -446,8 +446,11 @@ void list_display(const char *title, const alpm_list_t *list) for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = string_length(str); - /* two additional spaces are added to the length */ - s += 2; + /* two additional spaces are added to the length, if this is not the + * last element in the list */ + if (alpm_list_next(i)) { + s += 2; + } int maxcols = getcols(); if(s + cols > maxcols && maxcols > 0) { int j; @@ -457,7 +460,11 @@ void list_display(const char *title, const alpm_list_t *list) printf(" "); } } - printf("%s ", str); + if (alpm_list_next(i)) { + printf("%s ", str); + } else { + printf("%s", str); + } cols += s; } printf("\n"); -- 1.6.5.5

4 3

[pacman-dev] [PATCH] makepkg: improve removal of installed dependencies
by Allan McRae 14 Dec '09

14 Dec '09

Compare a list of packages on the system before and after dependency resolution in order to get a complete list of packages to remove. This allows makepkg to remove packages installed due to provides. Bail in cases where packages that were on the system originally have been removed as there is a risk of breaking the system when removing the new packages Fixes FS#15144 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This moves the generation of the installed package list to directly after the installation of deps to prevent issues if the user installs packages while the build is occurring: http://bugs.archlinux.org/task/15144#comment53938 Rebased on Cedric's run_pacman and $PACMAN patches. doc/makepkg.8.txt | 6 +++--- scripts/makepkg.sh.in | 39 +++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ad27bca..168b369 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -166,9 +166,9 @@ Environment Variables --------------------- *PACMAN*:: The command that will be used to check for missing dependencies and to - install and remove packages. Pacman's -U, -T, -S and -Rns operations - must be supported by this command. If the variable is not set or - empty, makepkg will fall back to `pacman'. + install and remove packages. Pacman's -Qq, -Rns, -S, -T, and -U + operations must be supported by this command. If the variable is not + set or empty, makepkg will fall back to `pacman'. Additional Features diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c730150..5743ea4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,8 +27,10 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: -# bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed, tput (ncurses) +# bsdtar (libarchive), bzip2, coreutils, diff (diffutils), fakeroot, +# find (findutils), getopt (util-linux), gettext, grep, gzip, openssl, +# sed, tput (ncurses) + # gettext initialization export TEXTDOMAIN='pacman' @@ -343,7 +345,7 @@ download_file() { run_pacman() { local ret=0 - if (( ! ASROOT )) && [[ $1 != "-T" ]] && sudo -l $PACMAN &>/dev/null; then + if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]] && sudo -l $PACMAN &>/dev/null; then sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? else $PACMAN $PACMAN_OPTS "$@" || ret=$? @@ -398,7 +400,6 @@ handle_deps() { } resolve_deps() { - # $pkgdeps is a GLOBAL variable, used by remove_deps() local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 @@ -408,7 +409,6 @@ resolve_deps() { fi if handle_deps $deplist; then - pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" [[ -z $deplist ]] && return $R_DEPS_SATISFIED @@ -425,23 +425,25 @@ resolve_deps() { return $R_DEPS_MISSING } -# fix flyspray bug #5923 remove_deps() { - # $pkgdeps is a GLOBAL variable, set by resolve_deps() (( ! RMDEPS )) && return - [[ -z $pkgdeps ]] && return - local dep depstrip deplist - deplist="" - for dep in $pkgdeps; do - depstrip="${dep%%[<=>]*}" - deplist="$deplist $depstrip" - done + # check for packages removed during dependency install (e.g. due to conflicts) + # removing all installed packages is risky in this case + if (( $(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | grep "<" | wc -l) > 0 )); then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 + fi - msg "Removing installed dependencies..." + local deplist=($(diff <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") | grep ">")) + deplist=(${deplist[@]#>}) + [ ${#deplist[@]} -eq 0 ] && return + msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully - if ! run_pacman -Rns $deplist; then + if ! run_pacman -Rn ${deplist[@]}; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -1874,14 +1876,13 @@ if (( SOURCEONLY )); then exit 0 fi -# fix flyspray bug #5973 if (( NODEPS || NOBUILD || REPKG )); then # no warning message needed for nobuild, repkg if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p "${PACMAN%% *}") ]; then - unset pkgdeps # Set by resolve_deps() and used by remove_deps() + original_pkglist=($(run_pacman -Qq)) # required by remove_deps deperr=0 msg "$(gettext "Checking Runtime Dependencies...")" @@ -1890,6 +1891,8 @@ elif [ $(type -p "${PACMAN%% *}") ]; then msg "$(gettext "Checking Buildtime Dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 + current_pkglist=($(run_pacman -Qq)) # required by remove_deps + if (( deperr )); then error "$(gettext "Could not resolve all dependencies.")" exit 1 -- 1.6.5.3

2 3

[pacman-dev] pacman cold caches performance, too much stat()ing
by Dimitrios Apostolou 13 Dec '09

13 Dec '09

Hello list, I have been investigating the slow performance of pacman regarding the cold caches scenario and I'm trying to write some proof of concept code that improves things a lot for some cases. However I need your help regarding some facts I might have misunderstood, and any pointers to the source code you also give me would also help a lot. I wouldn't like to lose time changing stuff that would break current functionality. So here are some first questions that come to mind, just by using strace: When doing "pacman -Q blah" I can see that besides the getdents() syscalls in /var/lib/pacman/local (probably caused by readdir()), there are also stat() and access() calls for every single subdirectory. Why are the last ones necessary? Isn't readdir enough? The same goes when doing "pacman -S blah". But in that case it stat()'s both 'local' and 'sync' directories, so worst case is really bad, it will stat() all contents of local, core, extra and community... In the case of "pacman -S" I measured that a great deal of time goes also to reading the "depends" files of all packages in local, please enlighten me what this is for. I have thought of a new way to store dependencies that should improve things, but I should first be sure it doesn't break anything and get some measurements myself. Thanks in advance, Dimitris P.S. Is there some option --pretend I might have missed? What I need is to get exactly the same actions of "pacman -S blah" or "pacman -Su" until the Y/N prompt, as non-root user.

5 18

[pacman-dev] [RFC] Package parser in python
by Allan McRae 13 Dec '09

13 Dec '09

Hi, This is one part of the makepkg test suite I am working on. It is fairly a simple class that takes a pacman package filename and does some parsing. Currently that involves getting the file list and the info from the .PKGINFO file. I am still fairly new to python so I am looking for comments on how this could be improved. One idea I have had is to not initialize all the fields in the pkginfo dict and add a test if an array exists before appending. It would make the code tidier but that would mean the need to test if the field exists when comparing it later. --- #!/usr/bin/env python3 import os, tarfile class package: ''' parse information from a pacman package member variables: file (string) - name of package file file_list (array) - list of files in the package archive pkginfo (dict) - package information parsed from .PKGINFO ''' def __init__ (self, file): self.file = file if not os.path.exists(file): raise IOError('{} does not exist'.format(file)) if not tarfile.is_tarfile(file): raise TypeError('{} is not a tar file'.format(file)) pkg = tarfile.open(file) self.file_list = pkg.getnames() if not ".PKGINFO" in self.file_list: raise TypeError('{} is not a package file'.format(file)) self.__parse_pkginfo(pkg) pkg.close() def __parse_pkginfo(self, pkg): self.pkginfo = {} self.pkginfo['pkgname'] = "" self.pkginfo['pkgbase'] = "" self.pkginfo['pkgver'] = "" self.pkginfo['pkgdesc'] = "" self.pkginfo['url'] = "" self.pkginfo['builddate'] = "" self.pkginfo['packager'] = "" self.pkginfo['size'] = "" self.pkginfo['arch'] = "" self.pkginfo['force'] = "" self.pkginfo['license'] = [] self.pkginfo['replaces'] = [] self.pkginfo['group'] = [] self.pkginfo['depend'] = [] self.pkginfo['optdepend'] = [] self.pkginfo['conflict'] = [] self.pkginfo['provides'] = [] self.pkginfo['backup'] = [] self.pkginfo['makepkgopt'] = [] arrays = ['license', 'replaces', 'group', 'depend', 'optdepend', 'conflict', 'provides', 'backup', 'makepkgopt'] pkginfo = pkg.extractfile(".PKGINFO") for line in pkginfo: if (line[0] == '#'.encode('utf-8')[0]): continue (key, value) = line.decode('utf-8').split(" = ") if key in arrays: self.pkginfo[key].append(value.strip()) else: self.pkginfo[key] = value.strip() pkginfo.close() if __name__ == '__main__': pkg = package('/var/cache/pacman/pkg/pacman-3.3.1-1-i686.pkg.tar.gz') print('Package file: \n\t{}\n'.format(pkg.file)) print('Package info: \n\t{}\n'.format(pkg.pkginfo)) print('File list: \n\t{}\n'.format(pkg.file_list)) --- Example output: > python3 package.py Package file: /var/cache/pacman/pkg/pacman-3.3.1-1-i686.pkg.tar.gz Package info: {'license': ['GPL'], 'backup': ['etc/pacman.conf', 'etc/makepkg.conf'], 'replaces': [], 'pkgname': 'pacman', 'builddate': '1253674558', 'pkgdesc': 'A library-based package manager with dependency support', 'makepkgopt': ['strip', '!docs', '!libtool', 'emptydirs', 'zipman', 'purge'], 'url': 'http://www.archlinux.org/pacman/', 'optdepend': ['fakeroot: for makepkg usage as normal user', 'python: for rankmirrors script usage'], 'depend': ['bash', 'libarchive>=2.7.0-2', 'libfetch>=2.20', 'pacman-mirrorlist'], 'group': ['base'], 'pkgbase': '', 'provides': [], 'force': '', 'packager': 'Dan McGee <dan(a)archlinux.org>', 'size': '2093056', 'arch': 'i686', 'conflict': [], 'pkgver': '3.3.1-1'} File list: ['.PKGINFO', '.INSTALL', 'etc', 'etc/makepkg.conf', 'etc/pacman.conf', 'etc/bash_completion.d', 'etc/bash_completion.d/pacman', 'usr', 'usr/include', 'usr/share', 'usr/bin', 'usr/lib', 'usr/lib/libalpm.so.4', 'usr/lib/libalpm.so.4.0.1', 'usr/lib/libalpm.so', 'usr/lib/libalpm.a', ....

5 13

[pacman-dev] [PATCH] makepkg: remove srclinks directory on error exit
by Cedric Staniewski 12 Dec '09

12 Dec '09

When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..b618881 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -118,6 +118,7 @@ trap_exit() { echo error "$@" fi + [[ -n $srclinks ]] && rm -rf "$srclinks" exit 1 } -- 1.6.5.3

3 5

[pacman-dev] [PATCH] Skip devel_check() when repackaging
by Nezmer 12 Dec '09

12 Dec '09

Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..0e18e3f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1265,7 +1265,7 @@ devel_check() { # Do not update pkgver if --holdver is set, when building a source package, # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if (( HOLDVER || SOURCEONLY )) \ + if (( HOLDVER || SOURCEONLY || REPKG )) \ || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi -- 1.6.5.5

2 1

[pacman-dev] makepkg in a constrained environment
by Ciprian Dorin, Craciun 11 Dec '09

11 Dec '09

Hello all! For some time I was struggling in creating (for myself) a "sterile" environment for package building purposes. (I want to build some custom packages for a custom lightweight distribution.) And in what follows I would like to share my experience with pacman / makepkg developers in such a "sterile" environment. By "sterile" I mean the following: * clean, uncontaminated packages: freshly installed by pacman from a repository without my intervention; (if I would use my ArchLinux installation, some packages (compiler, libraries, etc.) would be configured to my like, and thus it could create a non-repeatable build); * minimal package installation base: only the packages that have been clearly declared as dependencies in PKGBUILD should be installed (of course with their dependencies); * I need the assurance that configure and make scripts of different packages pick up the right build tool-chains (for example for cross-compiling); As such, I've decided of the following: * prepare a UML (User Mode Linux) kernel, that shall provide me with a clean build Linux environment; (this could of course be replaced with a Vserver instance;) * prepare a (static linked) BusyBox with all the tools built in; (this shall be installed outside of the normal PATH, to be sure it's not picked up by the configure and make scripts;) * prepare a (static linked) Bash (installed outside the normal PATH); * when running makepkg, I'll set the PATH=/.workbench/tools/busybox/bin:/.workbench/tools/bash/bin; * but when inside the PKGBUILD I'll reset the PATH=/usr/local/bin:/usr/bin:/bin:etc.... Now my experiences with makepkg in such an environment: * it seems it works without too much fuss with the commands provided by busybox, except; * if one has declared of using only MD5 sums (most of the packages do this), it insists on using `openssl dgst` to create them; * it insists on using file tool to identify the file type; * it insists on using bsdtar to untar the tar archives; * it breaks if it's not able to chown the source tree; (this happens as inside UML I'm root, but outside UML the file system is owned by a normal user (the root filesystem of UML is exported by using hostfs)); So, as you can see nothing that can't be solved with some minor corrections. As such, if the community is interested I could provide some patches that allow makepkg to: * use md5sum instead of openssl for MD5 checksums; * use normal tar if bsdtar is not available; * base the file-type decision on file (if available), or on extension (if file is not available); * ignore errors for chown of source tree; (of course with a warning;) * provide a way to customize the path of the pacman tool; (maybe this has already been done); Also it would be nice (though painful) to allow the customization of paths for all external (non Bash functions) tools. For example: instead of calling mv, one should call "$mv", which should default to mv="${MV:-$( which mv )}" (that is if the variable MV is not defined then fallback on using the mv tool found in the PATH). So would the developers be interested in such patches? Any comments? Any ideas? Thanks, Ciprian.

6 9

[pacman-dev] [PATCH 1/2] print installed packages
by Xavier Chantry 10 Dec '09

10 Dec '09

Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/sync.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f101f9..896d028 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -274,6 +274,21 @@ static int sync_synctree(int level, alpm_list_t *syncs) return(success > 0); } +static void print_installed(pmpkg_t *pkg) +{ + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + pmpkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); + if(lpkg) { + const char *lpkgver = alpm_pkg_get_version(lpkg); + if(strcmp(lpkgver,pkgver) == 0) { + printf(" [%s]", _("installed")); + } else { + printf(_(" [%s: %s]"), _("installed"), lpkgver); + } + } +} + /* search the sync dbs for a matching package */ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) { @@ -330,6 +345,8 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + print_installed(pkg); + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); @@ -514,9 +531,12 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { pmpkg_t *pkg = alpm_list_getdata(j); + if (!config->quiet) { - printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + print_installed(pkg); + printf("\n"); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.6.4.2

3 6

[pacman-dev] pacman -Sy with no network = weird result
by Xavier 09 Dec '09

09 Dec '09

Here is a quick and lazy bug report so that I do not forget :) LANG=C sudo pacman -Sy :: Synchronizing package databases... error: failed to update testing (library not initialized) error: failed to update core (library not initialized) error: failed to update extra (library not initialized) error: failed to update community-testing (library not initialized) error: failed to update community (library not initialized) error: failed to synchronize any databases The error and the output is quite confusing.

3 3

[pacman-dev] [PATCH] docs: set text width to 72 in vim directive
by Cedric Staniewski 09 Dec '09

09 Dec '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/repo-add.8.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2d6589b..3fae95f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 8290f3c..806e071 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index b7a892c..83dca68 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 18ee6ed..be41751 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 704dccc..88c4cbb 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// makepkg.conf(5) =============== diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 7f92ec7..9907281 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 89c22a1..9852fc7 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// pacman.conf(5) ============== diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 81bf837..4d5258a 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// repo-add(8) ========== -- 1.6.5.3

3 3