- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: exit on error during build() or package()
by Henning Garus 23 Aug '09

23 Aug '09

Set the ERR trap to abort upon encountering an error during the execution of a build or package function. Activate set -E, which lets functions inherit the ERR trap. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- scripts/makepkg.sh.in | 45 ++++++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index daa9585..bb0542c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,6 +174,7 @@ clean_up() { ## # Signal Traps ## +set -E trap 'clean_up' 0 trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT @@ -673,6 +674,16 @@ extract_sources() { fi } +error_build() { + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Build Failed.")" + plain "$(gettext "Aborting...")" + remove_deps + fi + exit 2 # $E_BUILD_FAILED +} + run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then @@ -716,19 +727,28 @@ run_build() { mv "$BUILDLOG" "$BUILDLOG.$i" fi + set +E build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + set -E + if [ $ret -gt 0 ]; then error_build; fi else - build 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_build' ERR + build 2>&1 + eval $restoretrap fi # reset our shell options eval "$shellopts" +} - if [ $ret -gt 0 ]; then - error "$(gettext "Build Failed.")" +error_package() { + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Packaging Failed.")" plain "$(gettext "Aborting...")" remove_deps - exit 2 # $E_BUILD_FAILED fi + exit 2 # $E_BUILD_FAILED } run_package() { @@ -772,19 +792,18 @@ run_package() { exec 3>&1 tee "$BUILDLOG" < "$logpipe" & exec 1>"$logpipe" 2>"$logpipe" - $pkgfunc 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap sync exec 1>&3 2>&3 3>&- rm "$logpipe" else - $pkgfunc 2>&1 || ret=$? - fi - - if [ $ret -gt 0 ]; then - error "$(gettext "Packaging Failed.")" - plain "$(gettext "Aborting...")" - remove_deps - exit 2 # $E_BUILD_FAILED + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap fi } -- 1.6.4

3 4

[pacman-dev] [PATCH] makepkg: always keep sources symlinks
by Xavier Chantry 23 Aug '09

23 Aug '09

Make bunzip2/xz/gunzip decompressing to stdout, because gzip does not offer something like a -k option. The selection of the decompression command for gzip/bzip2/xz compressed files now also depends on the file suffix, since we need to strip the extensions to get the output filename. Thanks to Cedric Staniewski <cedric(a)gmx.ca> for reporting this issue and contributing patches. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/makepkg.sh.in | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 126379a..80d3867 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -646,16 +646,26 @@ extract_sources() { # fix flyspray #6246 local file_type=$(file -bizL "$file") + local ext=${file##*.} local cmd='' case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar -x -f" ;; + cmd="bsdtar" ;; *application/x-gzip*) - cmd="gunzip -d -f" ;; + case "$ext" in + gz|z|Z) cmd="gzip" ;; + *) continue;; + esac ;; *application/x-bzip*) - cmd="bunzip2 -f" ;; + case "$ext" in + bz2|bz) cmd="bzip2" ;; + *) continue;; + esac ;; *application/x-xz*) - cmd="xz -d -f" ;; + case "$ext" in + xz) cmd="xz" ;; + *) continue;; + esac ;; *) # Don't know what to use to extract this file, # skip to the next file @@ -663,8 +673,13 @@ extract_sources() { esac local ret=0 - msg2 '%s' "$cmd \"$file\"" - $cmd "$file" || ret=$? + msg2 "$(gettext "extracting %s with %s")" "$file" "$cmd" + if [ "$cmd" = "bsdtar" ]; then + $cmd -xf "$file" || ret=? + else + rm -f "${file%.*}" + $cmd -dcf "$file" > "${file%.*}" || ret=? + fi if [ $ret -ne 0 ]; then error "$(gettext "Failed to extract %s")" "$file" plain "$(gettext "Aborting...")" -- 1.6.4.1

1 0

[pacman-dev] [PATCH] allow "makepkg -R" to first unpack an already built package when $pkgdir is empty
by FC 22 Aug '09

22 Aug '09

>From ae3dd41af891f059b0aa1cc888eed873684b5580 Mon Sep 17 00:00:00 2001 From: Francois Charette <francois(a)archlinux.org> Date: Tue, 18 Aug 2009 22:10:56 +0200 Subject: [PATCH] makepkg -R: allow unpacking when pkgdir is empty Also fixed some typos :) --- scripts/makepkg.sh.in | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index daa9585..6848c93 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,6 +1,6 @@ #!/bin/bash -e # -# makepkg - make packages compatable for use with pacman +# makepkg - make packages compatible for use with pacman # @configure_input@ # # Copyright (c) 2006-2009 Pacman Development Team < pacman-dev(a)archlinux.org> @@ -177,7 +177,7 @@ clean_up() { trap 'clean_up' 0 trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR +trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR # a source entry can have two forms : # 1) "filename::http://path/to/file" @@ -187,11 +187,11 @@ trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR get_filename() { # if a filename is specified, use it local filename=$(echo $1 | sed 's|::.*||') - # if it is just an url, we only keep the last component + # if it is just an URL, we only keep the last component echo "$filename" | sed 's|^.*://.*/||g' } -# extract the url from a source entry +# extract the URL from a source entry get_url() { # strip an eventual filename echo $1 | sed 's|.*::||' @@ -278,7 +278,7 @@ in_array() { } get_downloadclient() { - # $1 = url with valid protocol prefix + # $1 = URL with valid protocol prefix local url=$1 local proto=$(echo "$url" | sed 's|://.*||') @@ -314,11 +314,11 @@ get_downloadclient() { download_file() { # download command local dlcmd=$1 - # url of the file + # URL of the file local url=$2 # destination file local file=$3 - # temporary download file, default to last component of the url + # temporary download file, default to last component of the URL local dlfile=$(echo "$url" | sed 's|^.*://.*/||g') # replace %o by the temporary dlfile if it exists @@ -326,7 +326,7 @@ download_file() { dlcmd=${dlcmd//\%o/\"$file.part\"} dlfile="$file.part" fi - # add the url, either in place of %u or at the end + # add the URL, either in place of %u or at the end if echo "$dlcmd" | grep -q "%u" ; then dlcmd=${dlcmd//\%u/\"$url\"} else @@ -766,7 +766,7 @@ run_package() { mv "$BUILDLOG" "$BUILDLOG.$i" fi - # ensure overridden package variables suvrive tee with split packages + # ensure overridden package variables survive tee with split packages logpipe=$(mktemp -u "$startdir/logpipe.XXXXXXXX") mknod "$logpipe" p exec 3>&1 @@ -849,7 +849,7 @@ tidy_install() { local binary find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in - *compressed-encoding*) # Skip compressed binarys + *compressed-encoding*) # Skip compressed binaries ;; *application/x-sharedlib*) # Libraries (.so) /usr/bin/strip -S "$binary";; @@ -948,9 +948,18 @@ write_pkginfo() { create_package() { if [ ! -d "$pkgdir" ]; then - error "$(gettext "Missing pkg/ directory.")" - plain "$(gettext "Aborting...")" - exit 1 # $E_MISSING_PKGDIR + if [ "$REPKG" -eq 1 -a -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then + mkdir "$pkgdir" && cd "$pkgdir" + if ! bsdtar -xf $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ; then + error "$(gettext "Failed to extract package for repackaging")" + exit 1 # TODO: error code + fi + cd .. + else + error "$(gettext "Missing pkg/ directory.")" + plain "$(gettext "Aborting...")" + exit 1 # $E_MISSING_PKGDIR + fi fi cd "$pkgdir" -- 1.6.4

4 5

[pacman-dev] [PATCH] replace rankmirrors by bash clone
by Xavier Chantry 19 Aug '09

19 Aug '09

This removes python optdepends in pacman package \o/ This bash clone is a courtesy of Matthew Bruenig <matthewbruenig(a)gmail.com> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/Makefile.am | 4 +- scripts/rankmirrors.py.in | 189 ------------------------------------------- scripts/rankmirrors.sh.in | 196 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 191 deletions(-) delete mode 100644 scripts/rankmirrors.py.in create mode 100644 scripts/rankmirrors.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5d65653..330acb9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ - rankmirrors.py.in \ + rankmirrors.sh.in \ repo-add.sh.in # Files that should be removed, but which Automake does not know. @@ -62,7 +62,7 @@ $(OURSCRIPTS): Makefile makepkg: $(srcdir)/makepkg.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in pkgdelta: $(srcdir)/pkgdelta.sh.in -rankmirrors: $(srcdir)/rankmirrors.py.in +rankmirrors: $(srcdir)/rankmirrors.sh.in repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove diff --git a/scripts/rankmirrors.py.in b/scripts/rankmirrors.py.in deleted file mode 100644 index 4b253b6..0000000 --- a/scripts/rankmirrors.py.in +++ /dev/null @@ -1,189 +0,0 @@ -#! /usr/bin/python -# -# rankmirrors - read a list of mirrors from a file and rank them by speed -# @configure_input@ -# -# Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org> -# Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -import os, sys, datetime, time, socket, urllib2 -from optparse import OptionParser -from string import Template - -def createOptParser(): - usage = "usage: %prog [options] MIRRORFILE | URL" - version = "%prog (pacman) @PACKAGE_VERSION@\n" \ - "Copyright (c) 2006-2009 Pacman Development Team <pacman-dev(a)archlinux.org>.\n" \ - "Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>.\n\n" \ - "This is free software; see the source for copying conditions.\n" \ - "There is NO WARRANTY, to the extent permitted by law." - description = "Ranks pacman mirrors by their connection and opening " \ - "speed. Pacman mirror files are located in /etc/pacman.d/. It " \ - "can also rank one mirror if the URL is provided." - parser = OptionParser(usage = usage, version = version, - description = description) - parser.add_option("-n", type = "int", dest = "num", default = 0, - help = "number of servers to output, 0 for all") - parser.add_option("-t", "--times", action = "store_true", - dest = "times", default = False, - help = "only output mirrors and their response times") - parser.add_option("-u", "--url", action = "store_true", dest = "url", - default = False, help = "test a specific url") - parser.add_option("-v", "--verbose", action = "store_true", - dest = "verbose", default = False, - help = "be verbose in ouptut") - # The following two options should be automatic - #parser.add_option("-h", "--help", action = "help") - #parser.add_option("-V", "--version", action = "version") - return parser - -def timeCmd(cmd): - before = time.time() - try: - cmd() - except KeyboardInterrupt, ki: - raise ki - except socket.timeout, ioe: - return 'timeout' - except Exception, e: - return 'unreachable' - return time.time() - before - -def talkToServer(serverUrl): - opener = urllib2.build_opener() - # retrieve first 50,000 bytes only - tmp = opener.open(serverUrl).read(50000) - -def getFuncToTime(serverUrl): - return lambda : talkToServer(serverUrl) - -def cmpPairBySecond(p1, p2): - if p1[1] == p2[1]: - return 0 - if p1[1] < p2[1]: - return -1 - return 1 - -def printResults(servers, time, verbose, num): - items = servers.items() - items.sort(cmpPairBySecond) - itemsLen = len(items) - numToShow = num - if numToShow > itemsLen or numToShow == 0: - numToShow = itemsLen - if itemsLen > 0: - if time: - print - print ' Servers sorted by time (seconds):' - for i in items[0:numToShow]: - if i[1] == 'timeout' or i[1] == 'unreachable': - print i[0], ':', i[1] - else: - print i[0], ':', "%.2f" % i[1] - else: - for i in items[0:numToShow]: - print 'Server =', i[0] - -if __name__ == "__main__": - parser = createOptParser() - (options, args) = parser.parse_args() - - if len(args) != 1: - parser.print_help(sys.stderr) - sys.exit(0) - - # allows connections to time out if they take too long - socket.setdefaulttimeout(10) - - if options.url: - if options.verbose: - print 'Testing', args[0] + '...' - try: - serverToTime = timeCmd(getFuncToTime(args[0])) - except KeyboardInterrupt, ki: - sys.exit(1) - if serverToTime == 'timeout' or serverToTime == 'unreachable': - print args[0], ':', serverToTime - else: - print args[0], ':', "%.2f" % serverToTime - sys.exit(0) - - if not os.path.isfile(args[0]) and args[0] != "-": - print >>sys.stderr, 'rankmirrors: file', args[0], 'does not exist.' - sys.exit(1) - - if args[0] == "-": - fl = sys.stdin - else: - fl = open(args[0], 'r') - - serverToTime = {} - if options.times: - print 'Querying servers, this may take some time...' - else: - print "# Server list generated by rankmirrors on", - print datetime.date.today() - for ln in fl.readlines(): - splitted = ln.split('=') - if splitted[0].strip() != 'Server': - if not options.times: - print ln, - continue - - serverUrl = splitted[1].strip() - if serverUrl[-1] == '\n': - serverUrl = serverUrl[0:-1] - if options.verbose and options.times: - print serverUrl, '...', - elif options.verbose: - print '#', serverUrl, '...', - elif options.times: - print ' * ', - sys.stdout.flush() - - # if the $repo var is used in the url, replace it by core - tempUrl = Template(serverUrl).safe_substitute(repo='core') - - # add @DBEXT@ to server name. the repo name is parsed - # from the mirror url; it is the third (or fourth) dir - # from the end, where the url is http://foo/bar/REPO/os/arch - try: - splitted2 = tempUrl.split('/') - if tempUrl[-1] != '/': - repoName = splitted2[-3] - dbFileName = '/' + repoName + '@DBEXT@' - else: - repoName = splitted2[-4] - dbFileName = repoName + '@DBEXT@' - except: - dbFileName = '' - - try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(tempUrl + dbFileName)) - if options.verbose: - try: - print "%.2f" % serverToTime[serverUrl] - except: - print serverToTime[serverUrl] - except: - print - printResults(serverToTime, options.times, options.verbose, - options.num) - sys.exit(0) - - printResults(serverToTime, options.times, options.verbose, options.num) - -# vim: set ts=4 sw=4 et: diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in new file mode 100644 index 0000000..e1878a0 --- /dev/null +++ b/scripts/rankmirrors.sh.in @@ -0,0 +1,196 @@ +#!/bin/bash +# +# rankmirrors - read a list of mirrors from a file and rank them by speed +# @configure_input@ +# +# Copyright (c) 2009 Matthew Bruenig <matthewbruenig(a)gmail.com> +# +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# traps interrupt key to spit out pre-interrupt info +trap finaloutput INT + +usage() { + echo "Usage: rankmirrors [options] MIRRORFILE | URL" + echo + echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" + echo "files are located in /etc/pacman.d/. It can also rank one mirror if the URL is" + echo "provided." + echo + echo "Options:" + echo " --version show program's version number and exit" + echo " -h, --help show this help message and exit" + echo " -n NUM number of servers to output, 0 for all" + echo " -t, --times only output mirrors and their response times" + echo " -u, --url test a specific url" + echo " -v, --verbose be verbose in ouptut" + exit 0 +} + +version() { + echo "rankmirrors (pacman) @PACKAGE_VERSION@" + echo "Copyright (c) 2009 Matthew Bruenig <matthewbruenig(a)gmail.com>." + echo + echo "This is free software; see the source for copying conditions." + echo "There is NO WARRANTY, to the extent permitted by law." + exit 0 +} + +err() { + echo "$1" + exit 1 +} + +# gettime fetchurl (e.g gettime http://foo.com/core/os/i686/core.db.tar.gz) +# returns the fetching time, or timeout, or unreachable +gettime() { + IFS=' ' output=( $(curl -s -m 10 -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) + [[ $? = 28 ]] && echo timeout && return + [[ ${output[1]} -ge 400 || ${output[1]} -eq 0 ]] && echo unreachable && return + echo "${output[0]}" +} + +# getfetchurl serverurl (e.g. getturl http://foo.com/core/os/i686) +# if $repo is in the line, then assumes core +# returns a fetchurl (e.g. http://foo.com/core/os/i686/core.db.tar.gz) +getfetchurl() { + strippedurl="${1%/}" + replacedurl="${strippedurl//'$repo'/core}" + tmp1="${replacedurl%/*}" + tmp2="${tmp1%/*}" + reponame="${tmp2##*/}" + if [[ -z $reponame || $reponame = $replacedurl ]]; then + echo "fail" + else + fetchurl="${replacedurl}/$reponame@DBEXT@" + echo "$fetchurl" + fi +} + +# This exists to remove the need for a separate interrupt function +finaloutput() { + IFS=$'\n' sortedarray=( $(LC_COLLATE=C printf "%s\n" "${timesarray[@]}" | sort) ) + + # Final output for mirrorfile + numiterator="0" + if [[ $TIMESONLY ]]; then + echo + echo " Servers sorted by time (seconds):" + for line in "${sortedarray[@]}"; do + echo "${line#* } : ${line% *}" + ((numiterator++)) + [[ $NUM -ne 0 && $numiterator -ge $NUM ]] && break + done + else + for line in "${sortedarray[@]}"; do + echo "Server = ${line#* }" + ((numiterator++)) + [[ $NUM -ne 0 && $numiterator -ge $NUM ]] && break + done + fi + exit 0 +} + + +# Argument parsing +[[ $1 ]] || usage +while [[ $1 ]]; do + if [[ "${1:0:2}" = -- ]]; then + case "${1:2}" in + help) usage ;; + version) version ;; + times) TIMESONLY=1 ; shift ;; + verbose) VERBOSE=1 ; shift ;; + url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + *) err "\`$1' is an invalid argument." + esac + elif [[ ${1:0:1} = - ]]; then + + if [[ ! ${1:1:1} ]]; then + [[ -t 0 ]] && err "Stdin is empty." + IFS=$'\n' linearray=( $(</dev/stdin) ) + STDIN=1 + shift + else + snum=1 + for ((i=1 ; i<${#1}; i++)); do + case ${1:$i:1} in + h) usage ;; + t) TIMESONLY=1 ;; + v) VERBOSE=1 ;; + u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; + *) err "\`-$1' is an invald argument." ;; + esac + done + shift $snum + fi + elif [[ -f "$1" ]]; then + FILE="1" + IFS=$'\n' linearray=( $(<$1) ) + [[ $linearray ]] || err "File is empty." + shift + else + err "\`$1' does not exist." + fi +done + +# Some sanity checks +[[ $NUM ]] || NUM=0 +[[ $FILE && $CHECKURL ]] && err "Cannot specify a url and mirrorfile." +[[ $FILE || $CHECKURL || $STDIN ]] || err "Must specify url, mirrorfile, or stdin." + +# Single url handling +if [[ $CHECKURL ]]; then + url="$(getfetchurl "$URL")" + [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $VERBOSE ]] && echo "Testing $url..." + time=$(gettime "$url") + echo "$URL : $time" + exit 0 +fi + +# Get url results from mirrorfile, fill up the array, and so on +if [[ $TIMESONLY ]]; then + echo "Querying servers, this may take some time..." +elif [[ $FILE ]]; then + echo "# Server list generated by rankmirrors on $(date +%Y-%m-%d)" +fi + +timesarray=() +for line in "${linearray[@]}"; do + if [[ $line =~ ^# ]]; then + [[ $TIMESONLY ]] || echo $line + elif [[ $line =~ ^Server ]]; then + + # Getting values and times and such + server="${line#*= }" + url="$(getfetchurl "$server")" + [[ $url = fail ]] && err "url \`$URL' is malformed." + time=$(gettime "$url") + timesarray+=("$time $server") + + # Output + if [[ $VERBOSE && $TIMESONLY ]]; then + echo "$server ... $time" + elif [[ $VERBOSE ]]; then + echo "# $server ... $time" + elif [[ $TIMESONLY ]]; then + echo -n " *" + fi + fi +done +finaloutput + +# vim: set ts=2 sw=2 noet: -- 1.6.4

3 2

[pacman-dev] [PATCH 1/3] Add Architecture and --arch option
by Xavier Chantry 19 Aug '09

19 Aug '09

--- doc/pacman.8.txt | 2 ++ doc/pacman.conf.5.txt | 8 ++++++++ etc/pacman.conf.in | 1 + lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 16 ++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/pacman.c | 22 ++++++++++++++++++++++ 7 files changed, 53 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index b288a59..a534e05 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -166,6 +166,8 @@ Options If an install scriptlet exists, do not execute it. Do not use this unless you know what you are doing. +*\--arch* <'arch'>:: + Specify an alternate architecture. Query Options[[QO]] ------------------- diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 46a0b3d..51c5188 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -150,6 +150,14 @@ Options than the percent of each individual download target. The progress bar is still based solely on the current file download. +*Architecture =* auto | i686 | x86_64 | ...:: + If set, pacman will only allow to install packages of the given + architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will + use the system architecture, as in 'uname -m'. + If unset, no architecture checks are made. + *NOTE*: the packages with the special architecture 'any' can always be + installed, as they are meant to be architecture independent. + Repository Sections ------------------- Each repository section defines a section name and at least one location where diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 3557274..929d38b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -19,6 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl %u > %o #CleanMethod = KeepInstalled +Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9a935c2..b81b3f8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -151,6 +151,9 @@ void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); int alpm_option_remove_ignoregrp(const char *grp); +const char *alpm_option_get_arch(); +void alpm_option_set_arch(const char *arch); + void alpm_option_set_usedelta(unsigned short usedelta); pmdb_t *alpm_option_get_localdb(); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 819b974..012d412 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -79,6 +79,7 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->cachedirs); FREE(handle->logfile); FREE(handle->lockfile); + FREE(handle->arch); FREELIST(handle->dbs_sync); FREELIST(handle->noupgrade); FREELIST(handle->noextract); @@ -213,6 +214,15 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps() return handle->ignoregrp; } +const char SYMEXPORT *alpm_option_get_arch() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->arch; +} + pmdb_t SYMEXPORT *alpm_option_get_localdb() { if (handle == NULL) { @@ -520,6 +530,12 @@ int SYMEXPORT alpm_option_remove_ignoregrp(const char *grp) return(0); } +void SYMEXPORT alpm_option_set_arch(const char *arch) +{ + if(handle->arch) FREE(handle->arch); + if(arch) handle->arch = strdup(arch); +} + void SYMEXPORT alpm_option_set_usedelta(unsigned short usedelta) { handle->usedelta = usedelta; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 541eb23..a1eb1cd 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -58,6 +58,7 @@ typedef struct _pmhandle_t { /* options */ unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ + char *arch; /* Architecture of packages we should allow */ unsigned short usedelta; /* Download deltas if possible */ } pmhandle_t; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 25647b5..5fab247 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -149,6 +149,7 @@ static void usage(int op, const char * const myname) printf(_(" -r, --root <path> set an alternate installation root\n")); printf(_(" -b, --dbpath <path> set an alternate database location\n")); printf(_(" --cachedir <dir> set an alternate package cache location\n")); + printf(_(" --arch <arch> set an alternate architecture\n")); } } @@ -195,6 +196,19 @@ static void setuseragent(void) setenv("HTTP_USER_AGENT", agent, 0); } +static void setarch(const char *arch) +{ + if (strcmp(arch, "auto") == 0) { + struct utsname un; + uname(&un); + pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", un.machine); + alpm_option_set_arch(un.machine); + } else { + pm_printf(PM_LOG_DEBUG, "config: architecture: %s\n", arch); + alpm_option_set_arch(arch); + } +} + /** Free the resources. * * @param ret the return value @@ -376,6 +390,7 @@ static int parseargs(int argc, char *argv[]) {"ignoregroup", required_argument, 0, 1010}, {"needed", no_argument, 0, 1011}, {"asexplicit", no_argument, 0, 1012}, + {"arch", required_argument, 0, 1013}, {0, 0, 0, 0} }; @@ -450,6 +465,9 @@ static int parseargs(int argc, char *argv[]) case 1012: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; + case 1013: + setarch(optarg); + break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; @@ -827,6 +845,10 @@ static int _parseconfig(const char *file, const char *givensection, setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); + } else if(strcmp(key, "Architecture") == 0) { + if(!alpm_option_get_arch()) { + setarch(ptr); + } } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { -- 1.6.4

1 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-12-gbdd8e92
by dan＠archlinux.org 19 Aug '09

19 Aug '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 bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (commit) via 6f97842ab22eb50fdc689e8aa2e95688d015fa74 (commit) via 8a55b793631f37dbe7f906cd55d0997f920d36e8 (commit) via bba234a92ed9560bab1f1846870faa8303f98064 (commit) via 600782853ad5317ee51423a03487abcf34efd166 (commit) from 14a93b2e436ed19c814653c3b2b61605fd5ca156 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- lib/libalpm/dload.c | 18 +++++++++++------- src/pacman/query.c | 12 +++++++++++- src/pacman/sync.c | 2 +- src/util/testdb.c | 6 ++---- 5 files changed, 26 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-20-g92f0775
by dan＠archlinux.org 19 Aug '09

19 Aug '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 92f0775e76c75ebe9e30355cc99bb40cf365abcb (commit) via 7dae79e7b95c517df136003728363dc9ad346a7e (commit) via bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (commit) via 6f97842ab22eb50fdc689e8aa2e95688d015fa74 (commit) via 8a55b793631f37dbe7f906cd55d0997f920d36e8 (commit) via bba234a92ed9560bab1f1846870faa8303f98064 (commit) via 600782853ad5317ee51423a03487abcf34efd166 (commit) via 14a93b2e436ed19c814653c3b2b61605fd5ca156 (commit) from 7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881 (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 92f0775e76c75ebe9e30355cc99bb40cf365abcb Merge: 7dae79e7b95c517df136003728363dc9ad346a7e bdd8e92ff601aab44941e7572f6c48d7e32a3f24 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 18 20:49:25 2009 -0500 Merge branch 'maint' Conflicts: lib/libalpm/dload.c commit 7dae79e7b95c517df136003728363dc9ad346a7e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Aug 8 19:59:02 2009 +0200 dload.c : various fixes - fix one memleak if get_filename failed - cleanup according to Joerg's feedback: "url_for_string: If fetchParseURL returned successful, you should always have a scheme set. The logic for anonftp should only be needed for very broken server -- do you know of any such? download_internal: Specifying 'p' is now a nop -- it is tried by default first with fall-back to active FTP." Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: remove from pacman.conf and pacman.conf.5] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 1 - configure.ac | 2 +- doc/pacman.conf.5.txt | 3 --- etc/pacman.conf.in | 1 - lib/libalpm/alpm.h | 2 -- lib/libalpm/dload.c | 43 +++++++++++-------------------------------- lib/libalpm/handle.c | 14 -------------- lib/libalpm/handle.h | 1 - src/pacman/pacman.c | 5 +---- src/pacman/query.c | 12 +++++++++++- src/pacman/sync.c | 2 +- src/util/testdb.c | 6 ++---- 12 files changed, 27 insertions(+), 65 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Inconsistency of makepkg's activities in devel_check()
by Benjamin Richter 18 Aug '09

18 Aug '09

Hello developers. :-) I noticed that makepkg handles Mercurial repositories differently from CVS/SVN/Bazaar/etc. With the others, $newpkgver is either computed using $(date ...) or retrieved from the online repository and the PKGBUILD is responsible for retrieving the contents as it is demonstrated here: http://wiki.archlinux.org/index.php/Arch_CVS_%6_SVN_PKGBUILD_guidelines. Only with hg the repository is automatically cloned, pulled and updated: - - - - - makepkg, in devel_check(), lines 1211 and following - - - - - if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then [ $(type -p darcs) ] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) elif [ -n "${_cvsroot}" -a -n "${_cvsmod}" ] ; then [ $(type -p cvs) ] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) elif [ -n "${_gitroot}" -a -n "${_gitname}" ] ; then [ $(type -p git) ] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) elif [ -n "${_svntrunk}" -a -n "${_svnmod}" ] ; then [ $(type -p svn) ] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [ -n "${_bzrtrunk}" -a -n "${_bzrmod}" ] ; then [ $(type -p bzr) ] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then [ $(type -p hg) ] || return 0 msg "$(gettext "Determining latest hg revision...")" if [ -d ./src/$_hgrepo ] ; then cd ./src/$_hgrepo hg pull hg update else [[ ! -d ./src/ ]] && mkdir ./src/ hg clone $_hgroot/$_hgrepo ./src/$_hgrepo cd ./src/$_hgrepo fi newpkgver=$(hg tip --template "{rev}") cd ../../ fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This behaviour seems to be widely unknown, which leads to a lot of PKGBUILDS pulling/updating twice - first automatically and then again in build(): http://aur.archlinux.org/packages/aldrin-hg/aldrin-hg/PKGBUILD http://aur.archlinux.org/packages/audacious-hg/audacious-hg/PKGBUILD ... I just wonder why hg is handled differently and whether it wouldn't be better a) also to clone/update/pull/... svn/bzr/cvs/etc. in devel_check() - cf. http://wiki.archlinux.org/index.php/The_Arch_Way regarding automation or b) to remove devel_check() entirely, but leave devel_update() and let the PKGBUILD handle such changes, eg. like this: - - - complete example PKGBUILD in case anyone wants to try it - - - # Contributor: Artyom Smirnov <smirnoffjr(a)gmail.com> # Contributor: Benjamin Richter <webmaster(a)waldteufel-online.net> pkgname=gajim-hg pkgver=10960 pkgrel=1 pkgdesc="Jabber/XMMP instant messenger client written in PyGTK" arch=('i686' 'x86_64') url="http://gajim.org" license=('GPL') depends=('python>=2.5' 'pygtk>=2.12' 'sqlite3' 'dnsutils') makedepends=('python>=2.5' 'pygtk>=2.12' 'gtk2' 'libxss' 'dbus' 'gtkspell' 'intltool>=0.40.1' 'automake>=1.8' 'autoconf>=2.59' 'libtool' 'pkgconfig>=0.19') optdepends=('pyopenssl: secure SSL/TLS' 'pycrypto: End to end encryption' 'dbus-glib: link-local messaging (install python-avahi!)' 'python-avahi: link-local messaging (install dbus-glib!)' 'dnsutils: SRV support' 'gtkspell: Spell checking (install aspell-LANG!)' 'gnome-python-extras: GNOME integration' 'gnome-python-desktop: Keyring support' 'python-notify: Notification popups' 'dbus-python' 'python-sexy: for clickable URLs' 'python-kerberos>=1.1: GSSAPI authentication') provides=('gajim') conflicts=('gajim' 'gajim-svn') options=(!libtool) source=() md5sums=() scm_hg() { [[ -d "$2" ]] || hg clone "$1" "$2" || return cd "$2" ; hg pull -u || return newpkgver=$(hg tip --template '{rev}') } scm_retrieve() { [[ -z "$REPO_LATEST" ]] || return 0 export REPO_LATEST=1 msg "$(gettext "Determining latest $1 revision...")" cd "${srcdir}" "scm_${1}" "$2" "$3" msg2 "$(gettext 'Version found: %s')" "${newpkgver}" cd "${startdir}" devel_update } scm_retrieve hg http://hg.gajim.org/gajim gajim build() { cp -al gajim gajim-build cd gajim-build ./autogen.sh || return ./configure --prefix=/usr || return make || return make DESTDIR="${pkgdir}" install || return cd .. rm -r gajim-build find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cf. http://wiki.archlinux.org/index.php/The_Arch_Way regarding freedom (in this case: ... of the PKGBUILDer to choose by which means to retrieve sources under SCM) btw.: This latter approach already works without any change in makepkg. The question is whether it is advisable, especially because there is code outside build() which is run when the PKGBUILD is sourced, which happens twice because of fakeroot. This is why this PKGBUILD needs either the variable $REPO_LATEST or a rather ugly check whether makepkg is running in fakeroot (INFAKEROOT=1), which I'd rather not use because $INFAKEROOT is more like an implementation detail of makepkg. All this could be avoided by introducing another function - eg. update() - into the PKGBUILD which is run only once - that is: after sourcing the PKGBUILD when outside fakeroot - and sets $newpkgver, which would then be read by devel_update, which would be called after update() automatically. Makepkg would detect the existence of a function called update() and display the appropriate messages - eg. "Updating PKGBUILD...". The PKGBUILD would then look like this - provided that update() is called in $srcdir: - - - - - - - - - - - - - - another example - - - - - - - - - - - - - - pkgname=gajim-hg #... variables as before update() { [[ -d gajim ]] || hg clone http://hg.gajim.org/gajim || return 1 hg pull -u -R gajim || return 1 newpkgver=$(hg tip --template '{rev}' -R gajim) } #... build() as before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update() could also be called scm_retrieve() or something like that. Any opinions? Kind regards. Benjamin Richter (aka Waldteufel)

4 7

Re: [pacman-dev] [PATCH] add support for .so dependencies
by Christoph Schied 15 Aug '09

15 Aug '09

On Sun, Aug 16, 2009 at 01:38:51AM +1000, Allan McRae wrote: > The "magically" adding depends is my concern. If the libraries provided > by a package are to be in a depends array, then there is no need for > that package to be in the depends array (but should be in makedepends). > Otherwise this makes pacman have to do redundant checks and slows down > dependency resolution. Yes, like you already said, putting package dependencies into makedepends would solve that issue. The so-dependency is a lot nicer because it exactly specifies on what the package depends, and not on a "virtual" package version. You cannot produce inconsitent linking without breaking dependencies, and you get this almost for free, as there is no extra maintaining effort needed. > What I would like is a description of the problem this is trying to > solve that could not be already handled by versioned deps? It ensures consitent linking without providing manual versioned dependencies. This will solve problems like pacman -S y <package> because the full linking dependencies will have to be considered. This is especially nice if you consider packages that aren't built upstream, as linking-breakage will be detected by pacman, so it will make the handling with AUR packages a lot easier. My Motivation to this is that I broke my system quite often because I wasn't aware of how simple pacman handles the dependencies, and i think a packagemanagers purpose is to not break the system and keep everything consistent. greetings, Christoph

1 0

Re: [pacman-dev] [PATCH] add support for .so dependencies
by Christoph Schied 15 Aug '09

15 Aug '09

On Sun, Aug 16, 2009 at 12:45:50AM +1000, Allan McRae wrote: > "arch" is a reserved variable name in PKGBUILDs. This will break split > package support for packages that have both binary and arch=any packages > (which will be supported in the future). Okay, this one should be easy to fix. > As far as I can tell, IFS does absolutely nothing here. IFS is set to newline. > Well, the patch being broken and so I assume untested was my main > issue. I will not review a patch the submitter has not even tested. Bluewind tested it yesterday, and it worked for him. > Well, then... what is the point? Versioned dependencies already cover > soname values if the package is listed as a dep in addition to is > library. The point is that the dependencies are magically generated and this greatly reduces the work for the maintainer to specify the explicit versioned dependencies (which doesn't happen right now). Also the .so dependencies are not about the library version, but about the content of the package. greetings, Christoph Schied

2 1