- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg and VCS packages
by Allan McRae 12 Mar '10

12 Mar '10

Hi all, There are a number of bug reports about improving VCS support in makepkg. To address many of these, we really need to give this whole part of makepkg an overhaul. I have create a wiki page [1] where i have made some initial notes and will start filling out brainstorming for ideas on how this could be improved. Please add any ideas people have for how these could be improved. [1] http://wiki.archlinux.org/index.php/User:Allan/Makepkg_VCS_overhaul Allan

2 1

[pacman-dev] [PATCH] external debug symbols
by Bernhard Beschow 11 Mar '10

11 Mar '10

Hello pacman devs, I'm an Arch user and I really enjoy the tight integration of the KDE packages from the extra repository. Given that Arch seems to be one of the best KDE distros around, it's a pity that - unlike many other distros - Arch doesn't provide (external) debug symbols. However, these are critical for useful crash reports. Moreover, the KDE crash dialogue even prevents reporting crashes to bugzilla when no debug symbols are present. Sure, there are two obvious alternatives: 1) use kdemod, or 2) compile own packages with debug symbols. However, both have drawbacks: kdemod isn't integrated as tightly into Arch, wich means that things could break. The second option takes a lot of resources and a lot of time, especially on low-end hardware. That's why I propose that Arch should deliver extra packages with external debug symbols. To help you out, I've added support for external debug symbols to the makepkg tool [1]. BTW, my patch is based on the kdemod-version of makepkg. I've tested the patch with the kdeplasma-addons module and got a separate debug package for each split package without modifying the PKGBUILD. So I can say that it "works for me". However, it would be nice if there was a chance for the patch to get merged so it works for all Arch users. What do you think? Greetings, Bernhard [1] http://gitorious.org/pacman-shentey/pacman-shentey

2 1

[pacman-dev] [PATCH] makepkg: abort on missing or non-writable PKGDEST
by Allan McRae 07 Mar '10

07 Mar '10

When PKGDEST pointed to a non-writable location, makepkg would fail after completing the build process. This patch makes it abort as soon as PKGDEST is parsed. Also, move the SRCDEST check to the same point rather than right before downloading sources (which was after dependency checks). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5560c77..a087ee7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -454,12 +454,6 @@ remove_deps() { download_sources() { msg "$(gettext "Retrieving Sources...")" - if [[ ! -w $SRCDEST ]] ; then - error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" - plain "$(gettext "Aborting...")" - exit 1 - fi - pushd "$SRCDEST" &>/dev/null local netfile @@ -1644,8 +1638,20 @@ readonly ALL_OFF BOLD BLUE GREEN RED YELLOW # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $PKGDEST ]]; then + error "$(gettext "You do not have write permission to store packages in %s.")" "$PKGDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $SRCDEST ]] ; then + error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined -- 1.7.0.1

1 0

[pacman-dev] [PATCH] makepkg: fall back to su if sudo is not available
by Ray Kohler 06 Mar '10

06 Mar '10

There's a bit of a hack here with the "fullcmd" temporary variable to get around the need to pass the entire command line to su -c as one argument. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/makepkg.sh.in | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5bd294c..2dc9262 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -344,8 +344,13 @@ download_file() { run_pacman() { local ret=0 - if (( ! ASROOT )) && [[ $1 != "-T" ]] && sudo -l $PACMAN &>/dev/null; then - sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + if (( ! ASROOT )) && [[ $1 != "-T" ]]; then + if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + else + fullcmd="$PACMAN $PACMAN_OPTS $@" + su -c "$fullcmd" || ret=$? + fi else $PACMAN $PACMAN_OPTS "$@" || ret=$? fi @@ -1686,16 +1691,6 @@ else fi fi -# check for sudo if we will need it during makepkg execution -if (( ! ASROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if [ ! "$(type -p sudo)" ]; then - error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" - plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" - plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")" - exit 1 - fi -fi - unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -- 1.7.0

3 7

[pacman-dev] [PATCH] makepkg: always update symlinks to compressed man pages
by Allan McRae 05 Mar '10

05 Mar '10

When a man page has both symbolic and hard links, any symlink pointing to other than the alphabetically first hardlink was not "compressed" and left dangling towards the uncompressed man page. Fixes FS#18569. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3d987ac..f8072f9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -836,17 +836,18 @@ tidy_install() { local manpage ext file link hardlinks hl find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do - # check file still exists (potentially compressed with hard link) - if [[ -f ${manpage} ]]; then - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do - rm -f "$link" - ln -sf "${file}.gz" "${link}.gz" - done + ext="${manpage##*.}" + file="${manpage##*/}" + if [[ $ext != gz && $ext != bz2 ]]; then + # update symlinks to this manpage + find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | + while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" + done + + # check file still exists (potentially already compressed due to hardlink) + if [[ -f ${manpage} ]]; then # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist -- 1.7.0.1

1 1

Re: [pacman-dev] [arch-general] [arch-dev-public] Versioned dependency fun...
by Dan McGee 03 Mar '10

03 Mar '10

On Tue, Mar 2, 2010 at 4:40 PM, Xavier Chantry <chantry.xavier(a)gmail.com> wrote: > On Tue, Mar 2, 2010 at 7:32 PM, Pierre Schmitz <pierre(a)archlinux.de> wrote: >> Am Dienstag, 2. März 2010 14:06:57 schrieb Dan McGee: >>> > and here we have another reason to punish anybody using versioned >>> > dependencies. ;-) (of course upstream needs to be hit, too) >>> >>> Blaming this on versioned deps is punishing the messenger; this >>> package wouldn't upgrade without a force option either because the >>> same version comparison is used everywhere... >> >> You did notice the smiley? I know this wasn't fair in this case and not too >> serious. But anyway, I would prefer add the force flag and add the (stupid) >> upstream version instead of making your own up. >> > > The force flag is a big ugly crap. > I find sanitizing upstream version to be much.. saner. > Or figure out a way to have both a sane version for pacman and the > insane upstream version. I was actually thinking about this again and thinking epoch might not be a bad idea- I don't know if I had any legit objection to it before but I can't think of one anymore. If someone is interested in implementing, I'd be for it. -Dan

4 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-125-g1a00ee5
by dan＠archlinux.org 01 Mar '10

01 Mar '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 1a00ee5c276785aef70225c2cc951dbb15888ea5 (commit) via d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 (commit) via afb61bb22a9478ec076f77ff0e102e81763191e7 (commit) via 27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a (commit) from 0eadc992400aaad58da5866d23caee01a22e1341 (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 1a00ee5c276785aef70225c2cc951dbb15888ea5 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Feb 25 23:23:06 2010 +0100 bash_completion: remove absolute utility paths again The location of the used utilities may and does differ between various distributions and therefore absolute paths do not work well. Since the main purpose of its introduction was to avoid side-effects caused by aliases, it is sufficient to disable possible aliases temporarily by preceding the commands with a backslash. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Thu Feb 18 05:18:10 2010 +0100 contrib/*_completion: match *.pkg.tar.* Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afb61bb22a9478ec076f77ff0e102e81763191e7 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 24 08:09:38 2009 +1000 Do not print installed size when only downloading When using --downloadonly the "Total Installed Size" message is not needed and perhaps misleading. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 19 21:35:13 2010 +0100 Print "there is nothing to do" with NOOP transactions 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 32 ++++++++++++++++---------------- contrib/zsh_completion | 8 ++++---- src/pacman/remove.c | 1 + src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 1 + src/pacman/util.c | 4 +++- 6 files changed, 26 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] contrib/*_completion: match *.pkg.tar.*
by Pierre Schmitz 01 Mar '10

01 Mar '10

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- contrib/bash_completion | 4 ++-- contrib/zsh_completion | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..a231eb6 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -321,7 +321,7 @@ _pacman () case "${op}" in U) COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) return 0 ;; h|V) @@ -336,7 +336,7 @@ _pacman () $( compgen -f -- "$cur" ) ) elif _instring $mod p; then COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) elif _instring $mod u; then COMPREPLY='' return 0 diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..01b3c44 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -32,7 +32,7 @@ _pacman_opts_common=( _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' - '*:package file:_files -g "*.pkg.tar.gz(.)"' + '*:package file:_files -g "*.pkg.tar.*(.)"' ) # options for passing to _arguments: subactions for --query command @@ -120,7 +120,7 @@ _pacman_action_query() { _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ - '*:package file:_files -g "*.pkg.tar.gz"' + '*:package file:_files -g "*.pkg.tar.*"' ;; query_group) _arguments -s : \ @@ -295,11 +295,11 @@ _pacman() { "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files' ;; - -Q*p*) # file *.pkg.tar.gz + -Q*p*) # file *.pkg.tar.* _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ - '*:package file:_files -g "*.pkg.tar.gz"' + '*:package file:_files -g "*.pkg.tar.*"' ;; -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; -- 1.7.0 -- Pierre Schmitz, https://users.archlinux.de/~pierre

2 1

[pacman-dev] -Qi output corrupted when using screen
by Roman Kyrylych 28 Feb '10

28 Feb '10

Hi! It has been a looong time since I last posted here (or even read the list), so please forgive me if this is a known issue. I have a VPS on Linode and they have a tool called LISH which is a minimal environment that is accessible via logging in via ssh on the _host_. There is a screen session that shows the output from /dev/hvc0 (which is hardware tty in Xen), so you can access your system even if you locked yourself from accessing it via ssh. When doing pacman -Qi in that screen session I get corrupted output like this: <some text from the top of the host's tty buffer goes here first> Feb 2010 12:14:18 AM UTC Install Date : Sun 14 Feb 2010 02:21:13 PM UTC Install Reason : Explicitly installed Install Script : Yes Description : Utility programs used for creating patch files This happens only when doing -Qi. Any ideas about this? And if it's a known issue - how to fix it? -- Roman Kyrylych (Роман Кирилич)

6 16

[pacman-dev] [PATCH] bash_completion: remove absolute utility paths again
by Cedric Staniewski 26 Feb '10

26 Feb '10

The location of the used utilities may and does differ between various distributions and therefore absolute paths do not work well. Since the main purpose of its introduction was to avoid side-effects caused by aliases, it is sufficient to disable possible aliases temporarily by preceding the commands with a backslash. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- contrib/bash_completion | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..40ef8c0 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -14,7 +14,7 @@ rem_selected () # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) # This removes any options from the list of completions that have # already been specified on the command line. - COMPREPLY=($(/bin/echo "${COMP_WORDS[@]}" | \ + COMPREPLY=($(\echo "${COMP_WORDS[@]}" | \ (while read -d ' ' i; do [ "${i}" == "" ] && continue # flatten array with spaces on either side, @@ -24,20 +24,20 @@ rem_selected () # remove word from list of completions COMPREPLY=(${COMPREPLY/ ${i%% *} / }) done - /bin/echo ${COMPREPLY[@]}))) + \echo ${COMPREPLY[@]}))) return 0 } _available_repos () { - COMPREPLY=( $( compgen -W "$(/bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(\grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' )" -- $cur ) ) } _installed_pkgs () { local installed_pkgs - installed_pkgs=$( /bin/ls /var/lib/pacman/local/ ) - COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + installed_pkgs=$( \ls /var/lib/pacman/local/ ) + COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do \echo ${i%-*-*}; done )" -- $cur ) ) } _available_pkgs () @@ -47,16 +47,16 @@ _available_pkgs () # This little change-up removes the find *and* only uses enabled repos local available_pkgs local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_pkgs=$( for r in $enabled_repos; do /bin/echo /var/lib/pacman/sync/$r/*; done ) + enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' ) + available_pkgs=$( for r in $enabled_repos; do \echo /var/lib/pacman/sync/$r/*; done ) COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) } _installed_groups () { local installed_groups - installed_groups=$( /bin/find /var/lib/pacman/local -name desc -exec /bin/sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | /bin/sort -u ) - COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + installed_groups=$( \find /var/lib/pacman/local -name desc -exec \sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | \sort -u ) + COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) } _available_groups () @@ -66,9 +66,9 @@ _available_groups () # This little change-up removes the find *and* only uses enabled repos local available_groups local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_groups=$( for r in $enabled_repos; do /bin/sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | /bin/sort -u; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | tr -d '[]' ) + available_groups=$( for r in $enabled_repos; do \sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | \sort -u; done ) + COMPREPLY=( $( compgen -W "$( for i in $available_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) } ## makepkg completion @@ -126,7 +126,7 @@ _instring () str="${1}" shift 1 for c in "${@}"; do - if [ $(/bin/expr index "${str}" "${c}") -gt 0 ]; then + if [ $(\expr index "${str}" "${c}") -gt 0 ]; then return 0 fi done @@ -193,7 +193,7 @@ _pacman () esac arglen=$(( ${#toparse}-1 )) - for c in $(/bin/seq 0 "${arglen}"); do + for c in $(\seq 0 "${arglen}"); do arg=${toparse:$c:1} [ "${arg}" != "-" ] && mod="${mod}${arg}" done -- 1.7.0

9 13