- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 2/2] Save path to Pacman, which could be lost during --syncdeps operation
by Martin Panter 03 Nov '12

03 Nov '12

Unmangled version: https://github.com/vadmium/pacman-arch/commit/b984a8b.patch Turns out it wasn’t too hard to allow spaces in the path returned from “command -v”, while handling any extra arguments. >From b984a8b2cb3daa05177420d1a9d83648d6c0aa0d Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 31 Oct 2012 02:45:36 +0000 Subject: [PATCH] Save path to Pacman, which could be lost during --syncdeps operation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Access to the Pacman command could be lost when /etc/profile is invoked and $PATH is reset. Tested to make sure the following scenarios behave sensibly, where “roopwn” is in ~/bin/: PACMAN="pacman --config /etc/pacman.conf" makepkg --syncdeps --install PACMAN="nonexistent --dummy" makepkg --syncdeps --install PACMAN="nonexistent --dummy" makepkg PACMAN="roopwn --verbose" makepkg --syncdeps --install --- scripts/makepkg.sh.in | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3b4f27f..2b224b8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -873,9 +873,9 @@ source_has_signatures() { run_pacman() { local cmd if [[ ! $1 = -@(T|Qq) ]]; then - cmd=($PACMAN $PACMAN_OPTS "$@") + cmd=("${PACMAN[@]}" $PACMAN_OPTS "$@") else - cmd=($PACMAN "$@") + cmd=("${PACMAN[@]}" "$@") fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then @@ -898,7 +898,7 @@ check_deps() { if (( ret == 127 )); then #unresolved deps printf "%s\n" "$pmout" elif (( ret )); then - error "$(gettext "'%s' returned a fatal error (%i): %s")" "$PACMAN" "$ret" "$pmout" + error "$(gettext "'%s' returned a fatal error (%i): %s")" "${PACMAN[*]}" "$ret" "$pmout" return "$ret" fi } @@ -920,7 +920,7 @@ handle_deps() { msg "$(gettext "Installing missing dependencies...")" if ! run_pacman -S --asdeps $deplist; then - error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" + error "$(gettext "'%s' failed to install missing dependencies.")" "${PACMAN[*]}" exit 1 # TODO: error code fi fi @@ -1899,9 +1899,9 @@ install_package() { (( ! INSTALL )) && return if (( ! SPLITPKG )); then - msg "$(gettext "Installing package %s with %s...")" "$pkgname" "$PACMAN -U" + msg "$(gettext "Installing package %s with %s...")" "$pkgname" "${PACMAN[*]} -U" else - msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "$PACMAN -U" + msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "${PACMAN[*]} -U" fi local fullver pkgarch pkg pkglist @@ -2457,8 +2457,9 @@ if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then source_safe ~/.makepkg.conf fi -# set pacman command if not already defined -PACMAN=${PACMAN:-pacman} +# Set pacman command if not already defined. Convert to Bash array so that +# spaces can be included in the path while any arguments are retained. +PACMAN=(${PACMAN:-pacman}) # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW @@ -2728,7 +2729,11 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif type -p "${PACMAN%% *}" >/dev/null; then +elif output="$(command -v "$PACMAN")"; then + # Save full path to Pacman in case the --syncdeps operation modifies + # the $PATH and makes it inaccessible + PACMAN="$output" + if (( RMDEPS && ! INSTALL )); then original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi @@ -2757,7 +2762,7 @@ elif type -p "${PACMAN%% *}" >/dev/null; then exit 1 fi else - warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "${PACMAN%% *}" "PATH" + warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH" fi # ensure we have a sane umask set -- 1.7.12

3 6

[pacman-dev] Tar backend for local db
by Allan McRae 01 Nov '12

01 Nov '12

I was thinking about the local database backend in pacman and how we could improve it. The tar-based backed for sync dbs have been quite a success. Ever since we did that, I have been wanting to do the same with the local database. But there were two issues: 1) tar is not designed for removing and updating files in place 2) with a directory/files per package structure, we are quite robust to corruption as a single file effects only a single package. Well... I have a cunning plan... How about we do both! Have the local database in a tarball but also extracted. All reading is done from the tarball, so -Q operations would be fast due to not require reading from lots of small files. With an operation that adds/removes/updates a package, the local database is still read from the tarball, but the modifications are done on the files backend and then the tarball is recreated at the end. We could even be efficient during the recreation and read all the old files from the old tarball and only read the new files from the filesystem (which will be in the kernel cache...). This would also give another use for "pacman -D" - an option could be added to recreate the local db tarball - in case it became corrupt or the files were manually edited. What do people think?

8 12

[pacman-dev] Fwd: [PATCH] Hack to detect Pacman-command-no-found error
by Martin Panter 31 Oct '12

31 Oct '12

[Resending after subscribing my address. If this works perhaps a note should be added saying you have to subscribe to be able to send to the list?] Original [patch] in case it gets garbled: https://github.com/vadmium/pacman-arch/commit/0a71ece.patch If the spirit of the change is appropriate but you’re not happy about using the ”test” command, I’m happy to learn how to use the Bash-specific way with double square brackets. Or someone who already knows can translate it :) >From 0a71ece90951894953ffd7bae741d69af927bf3f Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Thu, 18 Oct 2012 06:31:07 +0000 Subject: [PATCH] Hack to detect Pacman-command-no-found error Bash also uses exit code 127 for command-not-found errors, which can occur if we lose access to the command given by $PACMAN. For instance after invoking /etc/profile, $PATH may be reset. --- 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 d387b7d..307ceeb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -895,7 +895,7 @@ check_deps() { pmout=$(run_pacman -T "$@") ret=$? - if (( ret == 127 )); then #unresolved deps + if test "$ret" -eq 127 -a -n "$pmout"; then #unresolved deps printf "%s\n" "$pmout" elif (( ret )); then error "$(gettext "'%s' returned a fatal error (%i): %s")" "$PACMAN" "$ret" "$pmout" -- 1.7.12

2 3

[pacman-dev] Changing from double quotes to single quotes
by Alexander Rødseth 30 Oct '12

30 Oct '12

Hi, Patch 1 and 4 are for changing quotes from double to single for the pkgdesc in PKGBUILD.proto and PKGBUILD-split.proto. Since few packages perform variable replacement in the package description, I think it would make sense to make single quotes the default. Patch 2 is for doing the same for the url. Patch 3 and 5 are for removing quotes when using cd and make. I was informed that this is safe to do when using $pkgdir. Best regards, Alexander Rødseth

4 14

[pacman-dev] Getting fingerprint of key used to make signature
by Allan McRae 29 Oct '12

29 Oct '12

Can anyone figure out how to take the PGP signature and extract the key ID used to make it in gpgme _without_ completely verifying the signature? Allan

1 0

[pacman-dev] [PATCH] Do not warn about missing database if being downloaded
by Allan McRae 29 Oct '12

29 Oct '12

When a configured repo database is not already downloaded, a warning message such as "warning: database file for 'testing' does not exist" is printed. Disable this warning when the database is scheduled to be downloaded in the transaction. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/be_sync.c | 3 +-- src/pacman/callback.c | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 66cd6b0..fb4d845 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -358,7 +358,9 @@ typedef enum _alpm_event_t { ALPM_EVENT_DISKSPACE_DONE, /** An optdepend for another package is being removed * The requiring package and its dependency are passed to the callback */ - ALPM_EVENT_OPTDEP_REQUIRED + ALPM_EVENT_OPTDEP_REQUIRED, + /** A configured repository database is missing */ + ALPM_EVENT_DATABASE_MISSING } alpm_event_t; /** Event callback */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 033f8b7..f980246 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -89,8 +89,7 @@ static int sync_db_validate(alpm_db_t *db) if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) { db->status &= ~DB_STATUS_EXISTS; db->status |= DB_STATUS_MISSING; - _alpm_log(db->handle, ALPM_LOG_WARNING, - "database file for '%s' does not exist\n", db->treename); + EVENT(db->handle, ALPM_EVENT_DATABASE_MISSING, db->treename, NULL); goto valid; } db->status |= DB_STATUS_EXISTS; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a51aa4b..a249a6e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -243,6 +243,12 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1), alpm_dep_compute_string(data2)); break; + case ALPM_EVENT_DATABASE_MISSING: + if(!config->op_s_sync) { + pm_printf(ALPM_LOG_WARNING, + "database file for '%s' does not exist\n", (char *)data1); + } + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: -- 1.8.0

1 0

[pacman-dev] [PATCH] pactree: unindent first limb
by Andrew Gregory 26 Oct '12

26 Oct '12

Removing the leader for the toplevel package shifted the name left but not it's limb. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- For the pactree-cleanup branch. src/util/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 7b8fd93..0c1710f 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -336,7 +336,7 @@ static void print_text(const char *pkg, const char *provision, tdepth *depth, int last) { const char* tip = ""; - int level = 0; + int level = 1; if(!pkg && !provision) { /* not much we can do */ return; -- 1.8.0

1 0

[pacman-dev] [PATCH] makepkg: use --apparent-size when du supports it
by Allan McRae 23 Oct '12

23 Oct '12

Amazingly, using "sleep 1" to convince btrfs to report correct file sizes is only a 90% fix. Sometimes more sleep is needed. Instead we use the --apparent-size argument to du to get actual file sizes. This is used only on Linux as the various BSDs do not support this argument. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 2 ++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 7 +------ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 03fb015..2323669 100644 --- a/configure.ac +++ b/configure.ac @@ -300,11 +300,13 @@ GCC_GNU89_INLINE_CC INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed -i" +DUFLAGS="-sk --apparent-size" case "${host_os}" in *bsd*) INODECMD="stat -f '%i %n'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" + DUFLAGS="-sk" ;; esac diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2bd6411..da7047b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -58,6 +58,7 @@ edit = sed \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ + -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5822843..1e9068b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1704,12 +1704,7 @@ write_pkginfo() { local packager="Unknown Packager" fi - # btrfs's delayed allocation causes the stat buffers from the kernel to "lie" - # to us momentarily and report 0 blocks allocated (which is how du calculates - # size). Sleeping for a second here is about the dirtiest thing possible, - # but avoids reporting entirely bogus install sizes. - sleep 1 - local size="$(@DUPATH@ -sk)" + local size="$(@DUPATH@ @DUFLAGS@)" size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" -- 1.8.0

1 0

[pacman-dev] [PATCH 1/2] pactree: fix --sync getopt value
by Andrew Gregory 15 Oct '12

15 Oct '12

The long --sync options has apparently never worked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 4488645..ab5d90a 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -217,7 +217,7 @@ static int parse_options(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"linear", no_argument, 0, 'l'}, {"reverse", no_argument, 0, 'r'}, - {"sync", no_argument, 0, 'S'}, + {"sync", no_argument, 0, 's'}, {"unique", no_argument, 0, 'u'}, {"config", required_argument, 0, OP_CONFIG}, -- 1.7.12.2

3 5

[pacman-dev] [PATCH 1/3] makepkg: allow debug package suffix to be configurable
by Allan McRae 29 Sep '12

29 Sep '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 8 ++++++++ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 036dda2..48aa4c5 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,11 @@ AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), [BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD]) +# Help line for debug package suffix +AC_ARG_WITH(debug-suffix, + AS_HELP_STRING([--with-debux-suffix=name], [set the suffix for split debugging symbol packages used by makepkg]), + [DEBUGSUFFIX=$withval], [DEBUGSUFFIX=debug]) + # Help line for changing shell used to run install scriptlets AC_ARG_WITH(scriptlet-shell, AS_HELP_STRING([--with-scriptlet-shell=shell], @@ -425,6 +430,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) +# Set makepkg split debugging symbol package suffix +AC_SUBST(DEBUGSUFFIX) +AC_DEFINE_UNQUOTED([DEBUGSUFFIX], "$DEBUGSUFFIX", [The suffix for debugging symbol packages used by makepkg]) # Set shell used by install scriptlets AC_SUBST(SCRIPTLET_SHELL) AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The shell used to run install scriptlets]) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 29c81aa..2bd6411 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,6 +53,7 @@ edit = sed \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ + -e 's|@DEBUGSUFFIX[@]|$(DEBUGSUFFIX)|g' \ -e "s|@INODECMD[@]|$(INODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 337ada9..bb2391f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1438,38 +1438,38 @@ strip_file() { # has this file already been stripped if [[ -n "$bid" ]]; then - if [[ -f "$pkgdir-debug"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then + if [[ -f "$pkgdir-@DEBUGSUFFIX@"/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug ]]; then return fi - elif [[ -f "$pkgdir-debug/usr/lib/debug/$binary.debug" ]]; then + elif [[ -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" ]]; then return fi - mkdir -p "$pkgdir-debug/usr/lib/debug/${binary%/*}" - objcopy --only-keep-debug "$binary" "$pkgdir-debug/usr/lib/debug/$binary.debug" - objcopy --add-gnu-debuglink="$pkgdir-debug/usr/lib/debug/${binary#/}.debug" "$binary" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary%/*}" + objcopy --only-keep-debug "$binary" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/$binary.debug" + objcopy --add-gnu-debuglink="$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary#/}.debug" "$binary" # create any needed hardlinks while read -d '' file ; do if [[ "${binary}" -ef "${file}" && - ! -f "$pkgdir-debug/usr/lib/debug/${file}.debug" ]]; then - mkdir -p "$pkgdir-debug/usr/lib/debug/${file%/*}" - ln "$pkgdir-debug/usr/lib/debug/${binary}.debug" \ - "$pkgdir-debug/usr/lib/debug/${file}.debug" + ! -f "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" ]]; then + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file%/*}" + ln "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${binary}.debug" \ + "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/${file}.debug" fi done < <(find . -type f -perm -u+w -print0 2>/dev/null) if [[ -n "$bid" ]]; then local target - mkdir -p "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}" + mkdir -p "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}" target="../../../../../${binary#./}" target="${target/..\/..\/usr\/lib\/}" target="${target/..\/usr\/}" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}" target="../../${binary#./}.debug" - ln -s "$target" "$pkgdir-debug/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" + ln -s "$target" "$pkgdir-@DEBUGSUFFIX@/usr/lib/debug/.build_id/${bid:0:2}/${bid:2}.debug" fi fi @@ -1532,7 +1532,7 @@ tidy_install() { [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" if check_option "debug" "y"; then - mkdir -p $pkgdir-debug/usr/lib/debug + mkdir -p $pkgdir-@DEBUGSUFFIX@/usr/lib/debug fi local binary strip_flags @@ -1876,7 +1876,7 @@ create_debug_package() { return fi - pkgdir="${pkgdir}-debug" + pkgdir="${pkgdir}-@DEBUGSUFFIX@" # check if we have any debug symbols to package if dir_is_empty "$pkgdir/usr/lib/debug"; then @@ -1885,7 +1885,7 @@ create_debug_package() { depends=("$pkgname=$(get_full_version)") pkgdesc="Detached debugging symbols for $pkgname" - pkgname=$pkgname-debug + pkgname=$pkgname-@DEBUGSUFFIX@ unset groups optdepends provides conflicts replaces backup install changelog -- 1.7.12.1

1 2