- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] checkupdates: Consistency in environmental variable name
by Allan McRae 18 Jun '13

18 Jun '13

Use CHECKUPDATES_DB rather than CHECKUPDATE_DB for consistency with the script name. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/checkupdates.sh.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 0079a24..48ceff9 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,23 +21,23 @@ if (( $# > 0 )); then echo "checkupdates: Safely print a list of pending updates." echo "Use: checkupdates" - echo "Export the 'CHECKUPDATE_DB' variable to change the path of the temporary database." + echo "Export the 'CHECKUPDATES_DB' variable to change the path of the temporary database." exit 0 fi -if [[ -z $CHECKUPDATE_DB ]]; then - CHECKUPDATE_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" +if [[ -z $CHECKUPDATES_DB ]]; then + CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" fi -trap 'rm -f $CHECKUPDATE_DB/db.lck' INT TERM EXIT +trap 'rm -f $CHECKUPDATES_DB/db.lck' INT TERM EXIT DBPath="${DBPath:-@localstatedir@/lib/pacman/}" eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.conf) -mkdir -p "$CHECKUPDATE_DB" -ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null -fakeroot pacman -Sy --dbpath "$CHECKUPDATE_DB" --logfile /dev/null &> /dev/null -pacman -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null +mkdir -p "$CHECKUPDATES_DB" +ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null +fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null +pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null exit 0 -- 1.8.3.1

1 0

[pacman-dev] [PATCH 1/2] pacscripts: don't read the whole package from cache
by Karol Blazewicz 17 Jun '13

17 Jun '13

'-q' means "Exit as soon as each specified pattern or filename has been matched." There is no reason to keep reading the whole package from the cache when the install script has already been printed to stdout. Signed-off-by: Karol Błażewicz <karol.blazewicz at gmail.com> --- contrib/pacscripts.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 8468714..4ecebde 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -5,6 +5,7 @@ # # Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante(a)gmail.com> # Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com> +# Copyright (c) 2009-2013 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ print_db() { } print_pkg() { - if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + if ! bsdtar -xqOf "$1" .INSTALL 2>/dev/null; then error "Package $1 does not include any .INSTALL script" return 1 fi -- 1.8.3.1

1 1

[pacman-dev] Thanks to the pacman devs from a new arch fanboi :)
by walt 17 Jun '13

17 Jun '13

Hi devs. I just installed arch with a gnome desktop, so I used pacman about 200 times today and it was a real pleasure. I've used a lot of package managers from both linux and bsd, but pacman is the best IMHO. It's completely intuitive and easy to learn just by using it (trial-and-error of course because nobody reads the man pages) so congrats on a great project. BTW, I decided to try arch after listening to this podcast: http://www.jupiterbroadcasting.com/38086/the-arch-way-aas-s27e03/ A lot of this episode is not about archlinux, so you'll need to ff to the actual arch segment. (Hey, it convinced me... :)

2 1

[pacman-dev] [PATCH] contrib/checkupdates: fix typo
by Allan McRae 16 Jun '13

16 Jun '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- FS#35755 also suggests that CHECKUPDATE_DB should be CHECKUPDATES_DB. Any opinions on that? contrib/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index b41dfa0..0079a24 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -19,7 +19,7 @@ # if (( $# > 0 )); then - echo "checkupdate: Safely print a list of pending updates." + echo "checkupdates: Safely print a list of pending updates." echo "Use: checkupdates" echo "Export the 'CHECKUPDATE_DB' variable to change the path of the temporary database." exit 0 -- 1.8.3.1

1 0

[pacman-dev] [PATCH] makepkg: fix typo for distcc test
by Allan McRae 16 Jun '13

16 Jun '13

Introduced in commit 9dd42dc0. Fixes FS#35741. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a8a552f..940e947 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1485,7 +1485,7 @@ run_prepare() { run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) - if check_buildenv "distcc" "y" && ! check_option "distc" "n"; then + if check_buildenv "distcc" "y" && ! check_option "distcc" "n"; then [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS fi -- 1.8.3.1

1 0

[pacman-dev] [PATCH] pacscripts: don't read the whole package from cache
by Karol Blazewicz <karol.blazewicz at gmail.com> 16 Jun '13

16 Jun '13

From: Karol Blazewicz <karol.blazewicz(a)gmail.com> '-q' means "Exit as soon as each specified pattern or filename has been matched." There is no reason to keep reading the rest of the package from cache when the install script has already been printed to stdout. Signed-off-by: Karol Błażewicz <karol.blazewicz at gmail.com> --- contrib/pacscripts.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 8468714..4ecebde 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -91,7 +91,7 @@ print_db() { } print_pkg() { - if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + if ! bsdtar -xqOf "$1" .INSTALL 2>/dev/null; then error "Package $1 does not include any .INSTALL script" return 1 fi -- 1.8.3.1

3 2

[pacman-dev] [RFC] pacman, package introspection, and managing linking
by Simon Gomizelj 15 Jun '13

15 Jun '13

So, this started off as a what-if and I have a sort of proof of concept working. It be cool if pacman tracked the required and provided sonames. Now I realize that versioned deps have been discussed and decided against, but tracking these lower level dependencies could provide some additional and useful information to the database. It is actually possible to do this fully automatically. I hacked together this: <https://github.com/vodik/pkgelf>. Its a tool that can recursively introspect a directory or a built package and dump out all the needed libraries and provided sonames. A quick example, inspecting libpulse-4.0-2-x86_64.pkg.tar.xz yeilds this: REQUIRE libasyncns.so=0-64 REQUIRE libc.so=6-64 REQUIRE libdbus-1.so=3-64 REQUIRE libdl.so=2-64 REQUIRE libglib-2.0.so=0-64 REQUIRE libjson-c.so=2-64 REQUIRE libm.so=6-64 REQUIRE libpthread.so=0-64 REQUIRE librt.so=1-64 REQUIRE libsndfile.so=1-64 REQUIRE libxcb.so=1-64 PROVIDE libpulse-mainloop-glib.so=0-64 PROVIDE libpulse-simple.so=0-64 PROVIDE libpulse.so=0-64 The elf parsing does not bring in much code or any extra dependencies. Elf.h itself is part of glibc. Having pacman aware of linkage can allow us to do a few cool things: - Have pacman refuse operations when linkages would break. If one library provides libfoo=4 and an update replaces it with libfoo=5 but some package on the system still needs version 4, pacman warn the user of the breakage or refuse to do the update. - Allowing PKGBUILD writers to verify they're not missing dependencies; if a package is found requires a soname that's not in the depends array, the author can be warned - Aid in rebuilding. It be possible, theoretically, to check what needs to be rebuilt immediately. Probably especially useful in the case of building lots of packages from -git when upstream bumps the soname. Now I realize there are a few caveats: sodepends/soprovides puts entries in the depends/provides field. I don't think this is appropriate, especially if this is done automatically. Also not every package will have this information available. I think its best to have it as additional information that could provide pacman with hints. Pacman should continue to work as it currently does so long as provides/requires is fulfilled, whether or not the linkage information is consistent (after all, maybe its just missing from the package). Also pacman supports Mac OS X as a platform, so pacman can't run under the assumption that the binaries to deals with are ELF based. So I'd propose that instead of adding this information to the existing `provides` and `requires` fields in the `desc` db entry, maybe a new entry should be added for linkage information, say one called `elf`. Old versions of pacman will ignore the entry, newer versions can take advantage of the information. For example, libpulse-4.0-2-x86_64/elf could look like this: %NEEDED% libasyncns.so=0-64 libc.so=6-64 libdbus-1.so=3-64 libdl.so=2-64 libglib-2.0.so=0-64 libjson-c.so=2-64 libm.so=6-64 libpthread.so=0-64 librt.so=1-64 libsndfile.so=1-64 libxcb.so=1-64 %SONAME% libpulse-mainloop-glib.so=0-64 libpulse-simple.so=0-64 libpulse.so=0-64 Pacman could also automatically detect if it should be using the ELF support extensions by querying itself to see if it was compiled as an ELF binary.

2 1

[pacman-dev] [PATCH] Install unchanged backup files to get correct timestamps.
by Patrick Steinhardt 15 Jun '13

15 Jun '13

Fixes FS#35515. --- lib/libalpm/add.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c20e7c6..cab04a8 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -309,11 +309,13 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, _alpm_log(handle, ALPM_LOG_DEBUG, "original: %s\n", hash_orig); if(hash_local && hash_pkg && strcmp(hash_local, hash_pkg) == 0) { - /* local and new files are the same, no sense in installing the file - * over itself, regardless of what the original file was */ - _alpm_log(handle, ALPM_LOG_DEBUG, - "action: leaving existing file in place\n"); - unlink(checkfile); + /* local and new files are the same, updating anyway to get + * correct timestamps */ + _alpm_log(handle, ALPM_LOG_DEBUG, "action: installing new file: %s\n", + entryname_orig); + if(try_rename(handle, checkfile, filename)) { + errors++; + } } else if(hash_orig && hash_pkg && strcmp(hash_orig, hash_pkg) == 0) { /* original and new files are the same, leave the local version alone, * including any user changes */ -- 1.8.3

3 7

[pacman-dev] Make pacscripts faster
by Karol Blazewicz 11 Jun '13

11 Jun '13

I noticed that for bigger packages that are in the cache, but are not installed, pacscripts takes a long time reading the archive, even though it prints the install script almost instantaneously. $ diff -Naur /usr/bin/pacscripts{,.alt} --- /usr/bin/pacscripts 2013-05-07 05:36:51.000000000 +0200 +++ /usr/bin/pacscripts.alt 2013-06-11 10:24:40.382742837 +0200 @@ -91,7 +91,7 @@ } print_pkg() { - if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + if ! bsdtar -xqOf "$1" .INSTALL 2>/dev/null; then error "Package $1 does not include any .INSTALL script" return 1 fi Adding '-q' switch doesn't seem to break anything and on slower computers the difference in execution is significant: $ time /usr/bin/pacscripts.alt >/dev/null chromium real 0m1.690s user 0m1.045s sys 0m0.085s $ time /usr/bin/pacscripts >/dev/null chromium real 0m16.536s user 0m12.991s sys 0m0.175s

2 1

[pacman-dev] [PATCH] Correct INODECMD for BSD and Darwin
by Allan McRae 06 Jun '13

06 Jun '13

Fixes FS#35469. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0d08e86..1f1608a 100644 --- a/configure.ac +++ b/configure.ac @@ -313,14 +313,14 @@ STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) - INODECMD="stat -f '%i %n'" + INODECMD="stat -f '%i %N'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" DUFLAGS="-sk" ;; darwin*) host_os_darwin=yes - INODECMD="/usr/bin/stat -f '%i %n'" + INODECMD="/usr/bin/stat -f '%i %N'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" DUFLAGS="-sk" -- 1.8.3

1 0