September 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] Error compiling latest git
by Stefano Esposito 22 Sep '07

22 Sep '07

make[2]: Entering directory `/home/ragnarok/workspace/pac-dev/src/pacman/doc' make[2]: *** No rule to make target `pacman.8', needed by `all-am'. Stop. make[2]: Leaving directory `/home/ragnarok/workspace/pac-dev/src/pacman/doc' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ragnarok/workspace/pac-dev/src/pacman' make: *** [all] Error 2 This happens everytime i try to compile, with or without asciidoc and with or whitout doxygen. Attached is a patch that solves the problem and compiles with asciidoc and doxygen and without them. Signed-off-by: Stefano Esposito <stefano.esposito87(a)gmail.com> -- doc/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) P.S. for Dan: i've chmodded +x the pre-commit hook, thanks for your hints :) -- Stefano Esposito <stefano.esposito87(a)gmail.com>

2 2

[pacman-dev] [PATCH] scripts/*.sh.in: Clean up and fix a few bugs
by Andrew Fyfe 21 Sep '07

21 Sep '07

repo-add, repo-remove: 'bsdtar -c * | ...' doesn't work (you need '-f -'). Code clean up eliminated this bug. Removed the multiple checksum support, pacman now only supports MD5, so there's no need for the database to contain multiple checksums. Quote all variables containing file/dir names to prevent paths containing spaces from causing problems. Add msg, warning and error functions. General code clean up. pacman-optimize: Use a sub-directory in /tmp for working files to make it easier to clean up at the end. Add quotes round $@ in die and die_r, otherwise printf can't display the message correctly. makepkg: Disable colour output if stderr is not a tty. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg.sh.in | 10 +- scripts/pacman-optimize.sh.in | 49 ++++--- scripts/repo-add.sh.in | 297 ++++++++++++++++++++--------------------- scripts/repo-remove.sh.in | 144 +++++++++++++------- 4 files changed, 266 insertions(+), 234 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cd5dbf5..d5b4114 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -66,7 +66,7 @@ PACMAN_OPTS= plain() { local mesg=$1; shift - if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then printf "\033[1;37m ${mesg}\033[0m\n" "$@" >&2 else printf " ${mesg}\n" "$@" >&2 @@ -75,7 +75,7 @@ plain() { msg() { local mesg=$1; shift - if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then printf "\033[1;32m==>\033[1;37m ${mesg}\033[0m\n" "$@" >&2 else printf "==> ${mesg}\n" "$@" >&2 @@ -84,7 +84,7 @@ msg() { msg2() { local mesg=$1; shift - if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then printf "\033[1;34m ->\033[1;37m ${mesg}\033[0m\n" "$@" >&2 else printf " -> ${mesg}\n" "$@" >&2 @@ -93,7 +93,7 @@ msg2() { warning() { local mesg=$1; shift - if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then printf "\033[1;33m==> $(gettext "WARNING:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 else printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 @@ -102,7 +102,7 @@ warning() { error() { local mesg=$1; shift - if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then + if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then printf "\033[1;31m==> $(gettext "ERROR:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 else printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 4c47d88..83c56a7 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -63,13 +63,13 @@ There is NO WARRANTY, to the extent permitted by law.\n")" } die() { - error $@ + error "$@" exit 1 } die_r() { - rm -f $lockfile - die $@ + rm -f "$lockfile" + die "$@" } if [ "$1" = "-h" -o "$1" = "--help" ]; then @@ -87,8 +87,8 @@ if [ "$1" != "" ]; then fi # make sure pacman isn't running -if [ -f $lockfile ]; then - die "$(gettext "Pacman lockfile was found. Cannot run while pacman is running.")" +if [ -f "$lockfile" ]; then + die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" fi if [ ! -d "$dbroot" ]; then @@ -99,55 +99,58 @@ if [ ! -w "$dbroot" ]; then die "$(gettext "You must have correct permissions to optimize the database.")" fi +workdir=$(mktemp -d /tmp/pacman-optimize.XXXXXXXXXX) || + die_r "$(gettext "ERROR: Can not create temp directory for database building.")\n" >&2 + # do not let pacman run while we do this -touch $lockfile +touch "$lockfile" # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" -find $dbroot -type f | sort | xargs md5sum > /tmp/pacsums.old +find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" -cd $dbroot -bsdtar -czf /tmp/pacmanDB.tgz ./ +cd "$dbroot" +bsdtar -czf "$workdir/pacmanDB.tgz" ./ if [ $? -ne 0 ]; then - rm -f /tmp/pacmanDB.tgz /tmp/pacsums.old + rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" fi # step 3: make and sum the new db msg "$(gettext "Making and MD5sum'ing the new db...")" -mkdir $dbroot.new -bsdtar -zxpf /tmp/pacmanDB.tgz -C $dbroot.new/ +mkdir "$dbroot.new" +bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot.new/" if [ $? -ne 0 ]; then - rm -f /tmp/pacmanDB.tgz /tmp/pacsums.old - rm -rf "$dbroot.new" - die_r "$(gettext "Untar'ing $dbroot failed.")" + rm -rf "$workdir" + die_r "$(gettext "Untar'ing %s failed.")" "$dbroot" fi -find "$dbroot.new" -type f | sort | sed -e 's/pacman.new/pacman/g' | \ - xargs md5sum > /tmp/pacsums.new +find "$dbroot.new" -type f | sort | \ + xargs md5sum | sed 's#.new/##' > "$workdir/pacsums.new" # step 4: compare the sums msg "$(gettext "Checking integrity...")" -diff /tmp/pacsums.old /tmp/pacsums.new >/dev/null 2>&1 +diff "$workdir/pacsums.old" "$workdir/pacsums.new" >/dev/null 2>&1 if [ $? -ne 0 ]; then # failed # leave /tmp/pacsums.old and .new for checking to see what doesn't match up - rm -rf "$dbroot.new" $lockfile /tmp/pacmanDB.tgz - die_r "$(gettext "integrity check FAILED, reverting to old database.")" + rm -rf "$dbroot.new" + die_r "$(gettext "Integrity check FAILED, reverting to old database.")" fi # step 5: remove the new temporary database and the old one # and use the .tgz to replace the old one msg "$(gettext "Putting the new database in place...")" rm -rf "$dbroot.new" "$dbroot"/* -bsdtar -zxpf /tmp/pacmanDB.tgz -C "$dbroot"/ +bsdtar -zxpf "$workdir/pacmanDB.tgz" -C "$dbroot/" # remove the lock file, sum files, and .tgz of database -rm -f $lockfile /tmp/pacsums.old /tmp/pacsums.new /tmp/pacmanDB.tgz +rm -f "$lockfile" +rm -rf "$workdir" echo -echo "$(gettext "Finished. Your pacman database has been optimized.")" +msg "$(gettext "Finished. Your pacman database has been optimized.")" echo exit 0 diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index f8c5de2..c2cb297 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -29,6 +29,42 @@ myver='@PACKAGE_VERSION@' FORCE=0 REPO_DB_FILE="" +msg() { + local mesg=$1; shift + if [ -t 1 ]; then + printf "\033[1;32m==>\033[1;37m ${mesg}\033[0m\n" "$@" >&1 + else + printf "==> ${mesg}\n" "$@" >&1 + fi +} + +msg2() { + local mesg=$1; shift + if [ -t 1 ]; then + printf "\033[1;34m ->\033[1;37m ${mesg}\033[0m\n" "$@" >&1 + else + printf " -> ${mesg}\n" "$@" >&1 + fi +} + +warning() { + local mesg=$1; shift + if [ -t 2 ]; then + printf "\033[1;33m==> $(gettext "WARNING:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 + else + printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 + fi +} + +error() { + local mesg=$1; shift + if [ -t 2 ]; then + printf "\033[1;31m==> $(gettext "ERROR:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 + else + printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 + fi +} + # print usage instructions usage() { printf "repo-add (pacman) %s\n\n" "$myver" @@ -51,37 +87,28 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } -# return calculated checksum of package -# arg1 - checksum type -# arg2 - path to package -get_checksum () { - case "$(echo "$1" | tr A-Z a-z)" in - md5) sum=$(md5sum $2); echo ${sum% *} ;; - sha1) sum=$(sha1sum $2); echo ${sum% *} ;; - sha256) sum=$(sha256sum $2); echo ${sum% *} ;; - sha384) sum=$(sha256sum $2); echo ${sum% *} ;; - sha512) sum=$(sha256sum $2); echo ${sum% *} ;; - esac -} - -# return PKGINFO string for checksum type -# arg1 - checksum type -checksum_name () { - case "$(echo "$1" | tr A-Z a-z)" in - md5) echo "MD5SUM" ;; - sha1) echo "SHA1SUM" ;; - sha256) echo "SHA256SUM" ;; - sha384) echo "SHA384SUM" ;; - sha512) echo "SHA512SUM" ;; - esac -} - # test if a file is a repository DB test_repo_db_file () { if [ -f "$REPO_DB_FILE" ]; then - [ "$(bsdtar -tf "$REPO_DB_FILE" | grep -c "/desc")" -gt 0 ] || return 1 + if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then + return 0 # YES + fi else - true + return 0 # YES - No database file is also aloud. + fi + + return 1 # NO +} + +# write a list entry +# arg1 - Entry name +# arg2 - List +# arg3 - File to write to +write_list_entry() { + if [ -n "$2" ]; then + echo "%$1%" >>$3 + echo $2 | tr -s ' ' '\n' >>$3 + echo "" >>$3 fi } @@ -90,60 +117,51 @@ test_repo_db_file () { db_write_entry() { # blank out all variables and set pkgfile - pkgfile=$(readlink -f $1) - export pkgname="" - pkgver="" - pkgdesc="" - url="" - builddate="" - packager="" - csize="" - size="" - _groups="" - _depends="" - _backups="" - _licenses="" - _replaces="" - _provides="" - _conflicts="" - - OLDIFS="$IFS" + local pkgfile=$(readlink -f "$1") + local pkgname pkgver pkgdesc url builddate packager csize size \ + _groups _depends _backups _licenses _replaces _provides _conflicts + + local OLDIFS="$IFS" # IFS (field seperator) is only the newline character IFS=" " # read info from the zipped package - for i in $(bsdtar -xOf "$pkgfile" .PKGINFO | grep -v "^#" |sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do - eval "${i}" - case "$i" in - group=*) _groups="$_groups $group" ;; - depend=*) _depends="$_depends $depend" ;; - backup=*) _backups="$_backups $backup" ;; - license=*) _licenses="$_licenses $license" ;; + local line + for line in $(bsdtar -xOf "$pkgfile" .PKGINFO | \ + grep -v "^#" | sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do + case "$line" in + group=*) _groups="$_groups $group" ;; + depend=*) _depends="$_depends $depend" ;; + backup=*) _backups="$_backups $backup" ;; + license=*) _licenses="$_licenses $license" ;; replaces=*) _replaces="$_replaces $replaces" ;; provides=*) _provides="$_provides $provides" ;; conflict=*) _conflicts="$_conflicts $conflict" ;; + *) eval "$line" ;; esac done IFS=$OLDIFS # get compressed size of package - csize="$(du -b -L $pkgfile | cut -f1)" + csize=$(du -b -L "$pkgfile" | cut -f 1) - cd $gstmpdir + pushd "$gstmpdir" 2>&1 >/dev/null # ensure $pkgname and $pkgver variables were found if [ -z "$pkgname" -o -z "$pkgver" ]; then - printf "$(gettext " error: invalid package file")\n" + error "$(gettext "ERROR: Invalid package file '%s'.")" "$pkgfile" + popd 2>&1 >/dev/null return 1 fi # remove any other package in the DB with same name + local existing for existing in *; do if [ "${existing%-*-*}" = "$pkgname" ]; then - printf "$(gettext ":: removing existing package '%s'")\n" "$existing" - rm -rf $existing + msg2 "$(gettext "Removing existing package '%s'...")" "$existing" + rm -rf "$existing" fi done @@ -152,67 +170,37 @@ db_write_entry() cd "$pkgname-$pkgver" # create desc entry - printf "$(gettext ":: creating 'desc' db entry")\n" - echo -e "%FILENAME%\n$(basename $1)\n" >>desc + msg2 "$(gettext "Creating 'desc' db entry...")" + echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc - if [ -n "$pkgdesc" ]; then - echo -e "%DESC%\n$pkgdesc\n" >>desc - fi - if [ -n "$_groups" ]; then - echo "%GROUPS%" >>desc - echo $_groups | tr -s ' ' '\n' >>desc - echo "" >>desc - fi + [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc + write_list_entry "GROUPS" "$_groups" "desc" [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc # compute checksums - for chk in ${DB_CHECKSUMS[@]}; do - name="$(checksum_name $chk)" - printf "$(gettext ":: computing %s checksums")\n" "$name" - if [ -n "$name" ]; then - echo -e "%$name%\n$(get_checksum $chk $pkgfile)\n" >>desc - fi - done + msg2 "$(gettext "Computing md5 checksums...")" + echo -e "%MD5SUM%\n$(md5sum "$pkgfile" | cut -d ' ' -f 1)\n" >>desc [ -n "$url" ] && echo -e "%URL%\n$url\n" >>desc - if [ -n "$_licenses" ]; then - echo "%LICENSE%" >>desc - echo $_licenses | tr -s ' ' '\n' >>desc - echo "" >>desc - fi + write_list_entry "LICENSE" "$_licenses" "desc" [ -n "$arch" ] && echo -e "%ARCH%\n$arch\n" >>desc [ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc [ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc - - if [ -n "$_replaces" ]; then - echo "%REPLACES%" >>desc - echo $_replaces | tr -s ' ' '\n' >>desc - echo "" >>desc - fi - [ "$FORCE" = "1" ] && echo -e "%FORCE%\n" >>desc + write_list_entry "REPLACES" "$_replaces" "desc" + [ $FORCE -eq 1 ] && echo -e "%FORCE%\n" >>desc # create depends entry - echo ":: creating 'depends' db entry" - if [ -n "$_depends" ]; then - echo "%DEPENDS%" >>depends - echo $_depends | tr -s ' ' '\n' >>depends - echo "" >>depends - fi - if [ -n "$_conflicts" ]; then - echo "%CONFLICTS%" >>depends - echo $_conflicts | tr -s ' ' '\n' >>depends - echo "" >>depends - fi - if [ -n "$_provides" ]; then - echo "%PROVIDES%" >>depends - echo $_provides | tr -s ' ' '\n' >>depends - echo "" >>depends - fi + msg2 "$(gettext "Creating 'depends' db entry...")" + write_list_entry "DEPENDS" "$_depends" "depends" + write_list_entry "CONFLICTS" "$_conflicts" "depends" + write_list_entry "PROVIDES" "$_provides" "depends" # preserve the modification time touch -r "$pkgfile" desc depends + + popd 2>&1 >/dev/null } # end db_write_entry # PROGRAM START @@ -236,10 +224,10 @@ if [ $# -lt 2 ]; then fi # source system and user makepkg.conf -if [ -r @sysconfdir@/makepkg.conf ]; then - source @sysconfdir@/makepkg.conf +if [ -r "@sysconfdir@/makepkg.conf" ]; then + source "@sysconfdir@/makepkg.conf" else - printf "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")\n" >&2 + error "$(gettext "/etc/makepkg.conf not found. Can not continue.")" "@sysconfdir@/makepkg.conf" exit 1 # $E_CONFIG_ERROR fi @@ -248,64 +236,65 @@ if [ -r ~/.makepkg.conf ]; then fi # main routine -if [ $# -gt 1 ]; then - gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - printf "$(gettext "cannot create temp directory for database building")\n"; \ +gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ + error "$(gettext "Can not create temp directory for database building.")"; \ exit 1) - success=0 - # parse arguements - for arg in $@; do - if [ "$arg" == "--force" -o "$arg" == "-f" ]; then - FORCE=1 - elif [ -z "$REPO_DB_FILE" ]; then - REPO_DB_FILE="$(readlink -f $arg)" - if ! test_repo_db_file; then - printf "$(gettext "error: repository file '%s' is not a proper pacman db")\n" "$REPO_DB_FILE" - exit 1 - elif [ -f "$REPO_DB_FILE" ]; then - printf "$(gettext ":: extracting database to a temporary location")\n" - bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" - fi - else - if [ -f "$arg" ]; then - if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then - printf "$(gettext "error: '%s' is not a package file, skipping")\n" "$arg" - else - printf "$(gettext ":: adding package '%s'")\n" "$arg" - - this_dir="$(pwd)" - if db_write_entry "$arg"; then - success=1 - fi - cd $this_dir - fi +success=0 +# parse arguements +for arg in "$@"; do + if [ "$arg" == "--force" -o "$arg" == "-f" ]; then + FORCE=1 + elif [ -z "$REPO_DB_FILE" ]; then + REPO_DB_FILE=$(readlink -f "$arg") + if ! test_repo_db_file; then + error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" + exit 1 + elif [ -f "$REPO_DB_FILE" ]; then + msg "$(gettext "Extracting database to a temporary location...")" + bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" + fi + else + if [ -f "$arg" ]; then + if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then + error "$(gettext "'%s' is not a package file, skipping")" "$arg" else - printf "$(gettext "error: package '%s' not found")\n" "$arg" + msg "$(gettext "Adding package '%s'")" "$arg" + + if db_write_entry "$arg"; then + success=1 + fi fi + else + error "$(gettext "Package '%s' not found.")" "$arg" fi - done + fi +done - # if all operations were a success, rezip database - if [ "$success" = "1" ]; then - printf "$(gettext ":: creating updated database file %s")\n" "$REPO_DB_FILE" - cd $gstmpdir - if [ -n "$(ls)" ]; then - [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" - [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" - case "$DB_COMPRESSION" in - gz) bsdtar -c * | gzip -9 >$REPO_DB_FILE ;; - bz2) bsdtar -c * | bzip2 -9 >$REPO_DB_FILE ;; - *) printf "$(gettext "warning: no compression set")\n" - bsdtar -c * >$REPO_DB_FILE;; - esac - fi - else - printf "$(gettext ":: no packages modified, nothing to do")\n" +# if all operations were a success, rezip database +if [ $success -eq 1 ]; then + msg "$(gettext "Creating updated database file %s")" "$REPO_DB_FILE" + pushd "$gstmpdir" 2>&1 >/dev/null + + if [ -n "$(ls)" ]; then + [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" + [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + + case "$DB_COMPRESSION" in + gz) TAR_OPT="z" ;; + bz2) TAR_OPT="j" ;; + *) warning "$(gettext "No compression set.")" ;; + esac + + bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * fi + + popd 2>&1 >/dev/null +else + msg "$(gettext "No packages modified, nothing to do.")" fi # remove the temp directory used to unzip -[ -d "$gstmpdir" ] && rm -rf $gstmpdir +[ -d "$gstmpdir" ] && rm -rf "$gstmpdir" # vim: set ts=2 sw=2 noet: diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index 49ff358..ee0c16c 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -29,6 +29,42 @@ myver='@PACKAGE_VERSION@' FORCE=0 REPO_DB_FILE="" +msg() { + local mesg=$1; shift + if [ -t 1 ]; then + printf "\033[1;32m==>\033[1;37m ${mesg}\033[0m\n" "$@" >&1 + else + printf "==> ${mesg}\n" "$@" >&1 + fi +} + +msg2() { + local mesg=$1; shift + if [ -t 1 ]; then + printf "\033[1;34m ->\033[1;37m ${mesg}\033[0m\n" "$@" >&1 + else + printf " -> ${mesg}\n" "$@" >&1 + fi +} + +warning() { + local mesg=$1; shift + if [ -t 2 ]; then + printf "\033[1;33m==> $(gettext "WARNING:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 + else + printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 + fi +} + +error() { + local mesg=$1; shift + if [ -t 2 ]; then + printf "\033[1;31m==> $(gettext "ERROR:")\033[1;37m ${mesg}\033[0m\n" "$@" >&2 + else + printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 + fi +} + # print usage instructions usage() { printf "$(gettext "repo-remove %s\n\n")" $myver @@ -51,24 +87,28 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # test if a file is a repository DB test_repo_db_file () { if [ -f "$REPO_DB_FILE" ]; then - [ "$(bsdtar -tf "$REPO_DB_FILE" | grep -c "/desc")" -gt 0 ] || return 1 - else - true + if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then + return 0 # YES + fi fi + + return 1 # NO } # remove existing entries from the DB -db_remove_entry() -{ - cd $gstmpdir +db_remove_entry() { + pushd "$gstmpdir" 2>&1 >/dev/null # remove any other package in the DB with same name + local existing for existing in *; do if [ "${existing%-*-*}" = "$1" ]; then - printf "$(gettext ":: removing existing package '%s'")\n" "$existing" - rm -rf $existing + msg2 "$(gettext "Removing existing package '%s'...")" "$existing" + rm -rf "$existing" fi done + + popd &>/dev/null } # end db_remove_entry # PROGRAM START @@ -92,10 +132,10 @@ if [ $# -lt 2 ]; then fi # source system and user makepkg.conf -if [ -r @sysconfdir@/makepkg.conf ]; then - source @sysconfdir@/makepkg.conf +if [ -r "@sysconfdir@/makepkg.conf" ]; then + source "@sysconfdir@/makepkg.conf" else - printf "$(gettext "ERROR: /etc/makepkg.conf not found. Can not continue.")\n" >&2 + error "$(gettext "%s not found. Cannot continue.")" "@sysconfdir@/makepkg.conf" exit 1 # $E_CONFIG_ERROR fi @@ -104,53 +144,53 @@ if [ -r ~/.makepkg.conf ]; then fi # main routine -if [ $# -gt 1 ]; then - gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ - printf "$(gettext "cannot create temp directory for database building")\n"; \ +gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ + error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) - success=0 - # parse arguements - for arg in $@; do - if [ -z "$REPO_DB_FILE" ]; then - REPO_DB_FILE="$(readlink -f $arg)" - if ! test_repo_db_file; then - printf "$(gettext "error: repository file '%s' is not a proper pacman db")\n" "$REPO_DB_FILE" - exit 1 - elif [ -f "$REPO_DB_FILE" ]; then - printf "$(gettext ":: extracting database to a temporary location")\n" - bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" - fi - else - printf "$(gettext ":: searching for package '%s'")\n" - - this_dir="$(pwd)" - if db_remove_entry "$arg"; then - success=1 - else - printf "$(gettext "error: package matching '%s' not found")\n" "$arg" - fi - cd $this_dir +success=0 +# parse arguements +for arg in "$@"; do + if [ -z "$REPO_DB_FILE" ]; then + REPO_DB_FILE=$(readlink -f "$arg") + if ! test_repo_db_file; then + error "$(gettext "Repository file '%s' is not a proper pacman database.")\n" "$REPO_DB_FILE" + exit 1 + elif [ -f "$REPO_DB_FILE" ]; then + msg "$(gettext "Extracting database to a temporary location...")" + bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" fi - done + else + msg "$(gettext "Searching for package '%s'...")" "$arg" - # if all operations were a success, rezip database - if [ "$success" = "1" ]; then - printf "$(gettext ":: creating updated database file %s")\n" "$REPO_DB_FILE" - cd $gstmpdir - if [ -n "$(ls)" ]; then - [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" - [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" - case "$DB_COMPRESSION" in - gz) bsdtar -c * | gzip -9 >$REPO_DB_FILE ;; - bz2) bsdtar -c * | bzip2 -9 >$REPO_DB_FILE ;; - *) printf "$(gettext "warning: no compression set")\n" - bsdtar -c * >$REPO_DB_FILE;; - esac + if db_remove_entry "$arg"; then + success=1 + else + error "$(gettext "Package matching '%s' not found.")" "$arg" fi - else - printf "$(gettext ":: no packages modified, nothing to do")\n" fi +done + +# if all operations were a success, rezip database +if [ $success -eq 1 ]; then + msg "$(gettext "Creating updated database file '%s'...")" "$REPO_DB_FILE" + pushd "$gstmpdir" 2>&1 >/dev/null + + if [ -n "$(ls)" ]; then + [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" + [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + case "$DB_COMPRESSION" in + gz) TAR_OPT="z" ;; + bz2) TAR_OPT="j" ;; + *) warning "$(gettext "No compression set.")" ;; + esac + + bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * + fi + + popd 2>&1 >/dev/null +else + msg "$(gettext "No packages modified, nothing to do.")" fi # remove the temp directory used to unzip -- 1.5.2.5

9 37

Re: [pacman-dev] Pacman for LFS
by Walter Barnes 21 Sep '07

21 Sep '07

>From: Dan McGee <dpmcgee(a)gmail.com> >> Also, when running configure with --prefix=/tools I found that all config files end up in /tools/etc but it seems that pacman and makepkg still look for the config files in /etc. I did some digging and found the --with-config-file option for pacman.conf but there is no equivelant for makepkg.conf and ended up editing the script by hand. I'm new to Linux and know nothing about automake/autoconf build systems but would it be possible to have configure generate the makepkg script with the correct location of makepkg.conf (and abs.conf too)? >> >> Thanks, >> Walter > >If you use pacman from GIT, most of this should have been fixed. The >configure script with pacman now respects the --sysconfdir, >--localstatedir, and --prefix directives, and all paths related to >pacman and makepkg should respect this. Let us know if this is not the >case. > >Of course, the current version of pacman in the GIT repo may not be >completely stable, so take caution when using it. However, I don't >want to discourage its use- it should be in a very usable state. I browsed the repository and indeed there have been lots of changes and paths seem to be computed dynamically instead of hard-wired. Unfortunately, my host system (Knoppix) does not have the autoconf/automake tools needed to generate the configure file and I do not know how to use these tools so I will wait (eagerly ;) until it is released. Are these changes planned for 3.0.7 or a later version? Thanks, Walter ____________________________________________________________________________________ Yahoo! oneSearch: Finally, mobile search that gives answers, not web links. http://mobile.yahoo.com/mobileweb/onesearch?refer=1ONXIC

2 1

[pacman-dev] pacman 3.1 release ?
by Xavier 20 Sep '07

20 Sep '07

There are several bugs fixed in 3.1 (mostly fix from Nagy), but also that bug with tr_TR locale that makes pacman unusable. Maybe there should be a listing of things that needs to be done before a 3.1 release is possible, and then maybe make a testing package for users that wish to try pacman 3.1 before it's released : http://bbs.archlinux.org/viewtopic.php?pid=272106#p272106

5 26

[pacman-dev] package PKGINFO format vs DB format
by Aaron Griffin 19 Sep '07

19 Sep '07

I may be missing some history here, but I am wondering why the package metadata is in a different format than the DB metadata. As far as parsing goes, it would be ideal to unify the two formats. Does anyone (judd, you're CC'd on this) know any reason to keep two different formats, or any tools that would be negatively impacted by such a change? Please note, a "negative impact" is not that same as "we have to change it for the new format" - more along the lines of "we can no longer do XYZ". -- Aaron

5 13

[pacman-dev] makepkg3 improvements (for pacman-3.1)
by Andrew Fyfe 19 Sep '07

19 Sep '07

Hi, I've been using pacman for over a year now on DIY-Linux (http://www.diy-linux.org) and to put it simply it's great easy to use and easy to setup. So I thought it was about time I contribute something back... an improved version of makepkg. For the impatient :p see the script attached. makepkg2's use of fakeroot was a bit hackish, it's now very hackish in makepkg3. It also kicks up a few strange bugs (flyspray #6208) because it's being used where it shouldn't be. So I've rewritten/reordered makepkg to reduce the amount of time spent in fakeroot. Specificly it's now only used for... fake_install() (if it exists. See below) build() (if there's no fake_install) tidy_install() - remove docs - move/compress man pages - strip binaries/libraries - remove libtool files - remove empty directories create_package() - create .PKGINFO & .FILELIST - tar it all up everything else is run outside of fakeroot. Over at DIY-Linux we have a patch that adds an extra function to PKGBUILD (fake_install). This way we can prepare, compile, and test the package as the user running makepkg. Then fake_install is run inside fakeroot to install the package. This further reduces the time spent in fakeroot and the possibility of any weird bugs popping up. If the build script doesn't contain a fake_install function the build function is run inside of fakeroot instead (maintaining backwards compatibility with how things work at the moment). Other changes... - reordered the code to reduce the number of if..then..else cases - renamed a lot of variables so they're a bit more descriptive - started to add error codes for the different reasons why makepkg exits - quoted all variables that contain paths so '/home/me/a folder with spaces' doesn't cause errors. (but build scripts are still a point of failure as the majority don't have $startdir in quotes.) - fixed flyspray bug #6468 -- Localized dates for build/install date - added some more error catching - added the ability to choose between usr/man and usr/share/man (var (_MAN_DIR) at the top of the script.) There are still a few things that need fixed, but some discussion is probably required. - Should build deps be removed after a successful build? At the moment deps are only removed if '-r' is used and it removes build deps and runtime deps. An extra option to remove build deps? - Should root be a loud to run makepkg? IMO running makepkg as root is a hanus crime, and anyone foolish enough to do so deserves to have their system burn to the ground as the result of a broken build script. One mistaken key stroke in a build script can result in a successful build or the destruction of a system :p I've added a warning that asks the user if they're sure the want to continue running makepkg as root. With sudo and fakeroot there's no need to run makepkg as root, but thats just my opinion. Andrew #!/bin/bash # # makepkg - make packages compatable for use with pacman # # Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> # Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> # Copyright (c) 2006 by Miklos Vajna <vmiklos(a)frugalware.org> # Copyright (c) 2005 by Christian Hamar <krics(a)linuxforum.hu> # Copyright (c) 2006 by Alex Smith <alex(a)alex-smith.me.uk> # Copyright (c) 2006 by Andras Voroskoi <voroskoi(a)frugalware.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, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. # #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # NOTES # ~~~~~~~ # TODO: Rename option names? # --syncdeps > --installdeps # --nodeps > --skipdeps # # TODO: Should root be aloud to run makepkg? # # TODO: Create error codes. # # TODO: Should build deps be removed after build? #____________________________________________________________________ set -e trap 'echo -e "\033[1;31mBANG! \033[1;37mThat didnt sound good. \033[1;33m:(\033[1;0m" >&2' ERR #set -x # For debugging, pipe the output to a file, there's lots of it. _DEBUG_MODE='n' #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Initialize Variables #---------------------------------------------------------------------- _VERSION='3.1.0' _BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' _ARG_LIST="$@" # Actions # ~~~~~~~~~ _CLEAN_CACHE='n' _CHECK_DEPS='y' _BUILD_DEPS='n' _SYNC_DEPS='n' _GENERATE_CHKSUM='n' _VALIDATE_CHKSUM='y' _EXTRACT_SOURCE='y' _BUILD_PACKAGE='y' _CLEANUP='n' _REMOVE_DEPS='n' _INSTALL_PACKAGE='n' # Options # ~~~~~~~~~ _FORCE='n' _REPACKAGE='n' _USE_SUDO='n' _LOG_BUILD='n' _USE_COLOR='n' # Miscellaneous # ~~~~~~~~~~~~~~~ _IN_FAKEROOT='n' _PACKAGE_NAME='UNKNOWN' _BUILD_SCRIPT='PKGBUILD' _PKG_EXT='pkg.tar.gz' _MAN_DIR='usr' # For Arch Linux #_MAN_DIR='usr/share' # For DIY-Linux _PACMAN_OPTS='' startdir="$(pwd)" # Exit/Error Codes # ~~~~~~~~~~~~~~~~~~ # TODO: Create exit codes for each different error. E_OK=0 E_UNKNOWN=1 E_USER_ABORT=4 E_INVALID_BUILD_SCRIPT=8 E_MISSING_PROGRAM=16 E_CONFIG_ERROR=32 # For dep checks # ~~~~~~~~~~~~~~~~ . /etc/abs/abs.conf _SRC_ROOT="$ABSROOT" #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # General purpose functions. #---------------------------------------------------------------------- # TODO: Use terminal safe coloring/bolding. See TODO.dan # TODO: Move general functions to an external library file, for all # pacman scripts to use. plain () { if [ $_USE_COLOR = 'y' ]; then echo -e " \033[1;37m$1\033[1;0m" >&2 else echo " $1" >&2 fi } msg () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;32m==>\033[1;37m $1\033[1;0m" >&2 else echo "==> $1" >&2 fi } msg2 () { if [ $_USE_COLOR = 'y' ]; then echo -e " \033[1;34m->\033[1;37m $1\033[1;0m" >&2 else echo " -> $1" >&2 fi } warning () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;33m==> WARNING:\033[1;37m $1\033[1;0m" >&2 else echo "==> WARNING: $1" >&2 fi } error () { if [ $_USE_COLOR = 'y' ]; then echo -e "\033[1;31m==> ERROR:\033[1;37m $1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 fi } debug () { [ $_DEBUG_MODE = 'y' ] || return if [ $_USE_COLOR = 'y' ]; then echo -e "\033[;35m**> DEBUG:\033[1;37m $1\033[1;0m" >&2 else echo "**> DEBUG: $1" >&2 fi } yn_question () { if [ $_USE_COLOR = 'y' ]; then echo -en " \033[1;1m$1\033[1;0m " >&2 else echo -n " $1 " >&2 fi local answer read answer answer="$(echo $answer | tr [:upper:] [:lower:])" if [ "$answer" = 'y' -o "$answer" = 'yes' ]; then return 0 else return 1 fi } strip_url () { echo "$1" | sed 's|^.*://.*/||g'; } in_array() { local needle=$1 shift 1 [ -z "$1" ] && return 1 for i in $*; do [ "$i" = "$needle" ] && return 0 done return 1 } in_array2 () { local needle=$(echo $1 | tr [:upper:] [:lower:]) local i shift 1 [ -z "$1" ] && return 2 for i in $*; do i=$(echo $i | tr [:upper:] [:lower:]) if [ "$i" = "$needle" ]; then return 0 elif [ "$i" = "!$needle" ]; then return 1 fi done return 2 } check_option () { local ret in_array2 $1 ${options[@]}; ret=$? [ $ret -eq 2 ] && { in_array2 $1 ${OPTIONS[@]}; ret=$?; } [ $ret -eq 2 ] && ret=1 return $ret } check_buildenv () { local ret in_array2 $1 ${BUILDENV[@]}; ret=$? [ $ret -eq -1 ] && ret=1 return $ret } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Usage functions. #---------------------------------------------------------------------- display_usage () { cat << EOF makepkg version $_VERSION Usage: $0 [options] Actions: -C, --cleancache Clean up source files from the cache. -g, --geninteg Generate integrity checks for source files. -c, --clean Clean up work files after build. -e, --noextract Do not extract source files (use existing src/ dir). -i, --install Install package after successful build. -o, --nobuild Download and extract files only. -R, --repackage Repackage contents of pkg/ without building. -b, --builddeps Build missing dependencies from source -d, --nodeps Skip all dependency checks -r, --rmdeps Remove installed dependencies after a successful build -s, --syncdeps Install missing dependencies with pacman Options: -f, --force Overwrite existing package. -L, --log Log package build process. -m, --nocolor Disable colorized output messages. -p <buildscript> Use an alternate build script (instead of '${_BUILD_SCRIPT}'). If -p is not specified, makepkg will look for '${_BUILD_SCRIPT}'. -S, --usesudo When calling pacman, use sudo. -h, --help Display this help and exit -V, --version Output version information and exit Variables: SRCDEST ... PKGDEST ... Exit Codes: 0 Ok 1 Unknown 4 User abort 8 Invalid build script 16 Missing program 32 Config error These options can be passed to pacman: --noconfirm Do not ask for confirmation when resolving dependencies --noprogressbar Do not show a progress bar when downloading files Report bugs to <${_BUG_REPORT_EMAIL}> EOF } display_version () { echo "makepkg $_VERSION"; } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # makepkg functions. #---------------------------------------------------------------------- run_build () { if [ "$(type -t $1)" != "function" ]; then error "Unknown function '$1'." exit 1 fi # use distcc if it is requested (check buildenv and PKGBUILD opts) if check_buildenv distcc && [ $(check_option distcc) -ne 1 ]; then [ -d /usr/lib/distcc/bin ] && export PATH="/usr/lib/distcc/bin:$PATH" elif [ $(check_option distcc) -eq 1 ]; then # if it is not wanted, clear the makeflags too export MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) if check_buildenv ccache && [ $(check_option ccache) -ne 1 ]; then [ -d /usr/lib/ccache/bin ] && export PATH="/usr/lib/ccache/bin:$PATH" fi # clear user-specified makeflags if requested if [ $(check_option makeflags) -eq 1 ]; then export MAKEFLAGS="" fi msg "Running '$1'..." cd "${startdir}/src" # Some locales can break builds. local _LC_ALL="$LC_ALL" ; export LC_ALL='C' local _LANG="$LANG" ; export LANG='C' umask 0022 local ret=0 if [ $_LOG_BUILD = 'y' ]; then local build_log="${startdir}/${_PACKAGE_NAME}-${1}.log" if [ -f "$build_log" ]; then local i=1 while true; do if [ -f "${build_log}.$i" ]; then i=$(($i+1)) else break fi done mv "${build_log}" "${build_log}.$i" fi msg2 "$1 will be logged to $build_log" $1 2>&1 | tee "${build_log}" || ret=${PIPESTATUS[0]} else $1 2>&1 || ret=$? fi export LC_ALL="$_LC_ALL" export LANG="$_LANG" if [ $ret -gt 0 ]; then error "Build FAILED. Aborting" exit 2 # TODO: error code fi } tidy_install () { cd "${startdir}/pkg" msg "Tidying Install..." if ! check_option docs; then msg2 "Removing documentation files..." #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi local old_man_dir if [ "$_MAN_DIR" = 'usr' ]; then old_man_dir='usr/share' else old_man_dir='usr' fi if [ -d $old_man_dir ]; then msg2 "Moving ${old_man_dir}/man files to /${_MAN_DIR}/man..." mkdir -p ${_MAN_DIR}/man cp -a ${old_man_dir}/man/* ${_MAN_DIR}/man/ rm -rf ${old_man_dir}/man fi if [ -d usr/info ]; then msg2 "Moving /usr/info files to /usr/share/info..." mkdir -p usr/share/info cp -a usr/info/* usr/share/info/ rm -rf usr/info fi [ -e usr/share/info/dir ] && rm -f usr/share/info/dir msg2 "Compressing man pages..." find {${_MAN_DIR}/,usr/local/,opt/*/}man -type f 2>/dev/null | while read i ; do ext="${i##*.}" fn="${i##*/}" if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then # update symlinks to this manpage find {${_MAN_DIR},usr/local/,opt/*/}man -lname "$fn" 2> /dev/null | while read ln ; do rm -f "$ln" ln -sf "${fn}.gz" "${ln}.gz" done # compress the original gzip -9 "$i" fi done if check_option strip; then local file msg2 "Stripping debugging symbols from libraries..." for file in $(LC_ALL=C LANG=C \ find {,usr/,usr/local/,opt/*/}lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec file '{}' \; 2>/dev/null | \ grep 'LSB shared object,' | cut -d : -f 1 ); do strip --strip-debug "${file}" done msg2 "Stripping symbols from binaries..." for file in $(LC_ALL=C LANG=C \ find {,usr/,usr/local/,opt/*/}{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -exec file '{}' \; 2>/dev/null | \ grep 'LSB executable,' | cut -d : -f 1); do strip --strip-unneeded "${file}" done fi if ! check_option libtool; then msg2 "Removing libtool .la files..." find -type f -name "*.la" -exec rm -f -- '{}' \; fi if ! check_option emptydirs; then msg2 "Removing empty directories..." find -depth -type d -empty -delete; fi } create_package () { cd "${startdir}/pkg" msg "Creating package..." # get some package meta info # flyspray bug 6468 -- Localized dates for build/install date local builddate="$(LC_ALL=C ; LANG=C ; date -u +"%Y-%m-%dT%T%:z")" if [ "$PACKAGER" != "" ]; then local packager="$PACKAGER" else local packager="Arch Linux (http://www.archlinux.org)" fi local size=$(du -sb | awk '{print $1}') # build a filelist - do this first to keep meta files out of the list msg2 "Generating .FILELIST file..." tar -cvf /dev/null * | sort >.FILELIST # write the .PKGINFO file msg2 "Generating .PKGINFO file..." echo "# Generated by makepkg $_VERSION" >.PKGINFO echo "# $(LC_ALL=C; LANG=C; date -u)" >>.PKGINFO echo "pkgname = $pkgname" >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "url = $url" >>.PKGINFO echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO if [ "$CARCH" != "" ]; then echo "arch = $CARCH" >>.PKGINFO fi local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO done for it in "${replaces[@]}"; do echo "replaces = $it" >>.PKGINFO done for it in "${groups[@]}"; do echo "group = $it" >>.PKGINFO done for it in "${depends[@]}"; do echo "depend = $it" >>.PKGINFO done for it in "${conflicts[@]}"; do echo "conflict = $it" >>.PKGINFO done for it in "${provides[@]}"; do echo "provides = $it" >>.PKGINFO done for it in "${backup[@]}"; do echo "backup = $it" >>.PKGINFO done # TODO: maybe remove this at some point # warn if license array is not present or empty if [ "$license" = "" ]; then warning "Please add a license line to your ${_BUILD_SCRIPT}!" plain "example for GPL'ed software: license=('GPL')." fi local comp_files # check for an install script if [ "$install" != "" ]; then msg2 "Copying install script..." cp "$startdir/$install" .INSTALL comp_files="${comp_files} .INSTALL" fi # do we have a changelog? if [ -f "$startdir/ChangeLog" ]; then msg2 "Copying package change log" cp "$startdir/ChangeLog" .CHANGELOG comp_files="${comp_files} .CHANGELOG" fi # tar it up msg2 "Compressing package..." local pkg_file="$PKGDEST/${_PACKAGE_NAME}.${_PKG_EXT}" comp_files="${comp_files} .PKGINFO .FILELIST" if ! tar -czf $pkg_file $comp_files *; then error "Failed to create package file." exit 1 # TODO: error code fi } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Dependencie check functions #---------------------------------------------------------------------- checkdeps() { debug "checkdeps() $*" [ $# -eq 0 ] && return pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? if [ $ret -eq 127 ]; then #unresolved deps #strip out the pacman prefix from "requires: xyz" echo $pmout | sed 's|requires:||g' elif [ $ret -ne 0 ]; then error "pacman returned a fatal error ($ret): $pmout" exit 1 fi } handledeps() { debug "handledeps() $*" local R_DEPS_SATISFIED=0 local R_MISSING_DEPS=1 [ $# -eq 0 ] && return $R_DEPS_SATISFIED local deplist="$*" local striplist local dep for dep in $deplist; do depstrip="$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" striplist="$striplist $depstrip" done if [ $_BUILD_DEPS = 'n' -a $_SYNC_DEPS = 'n' ]; then return $R_MISSING_DEPS elif [ $_USE_SUDO = 'n' -a $EUID -gt 0 ]; then warning "Cannot auto-install missing dependencies as a normal user without sudo!" plain "Run makepkg as root or with -S to resolve dependencies automatically." return $R_MISSING_DEPS fi if [ $_SYNC_DEPS = 'y' ]; then msg "Installing missing dependencies..." local ret=0 if [ $_USE_SUDO = 'y' ]; then # install missing deps from binary packages (using pacman -S and sudo) sudo pacman $_PACMAN_OPTS -S $striplist || ret=$? else # install missing deps from binary packages (using pacman -S) pacman $_PACMAN_OPTS -S $striplist || ret=$? fi if [ $ret -eq 1 ]; then error "Pacman failed to install missing dependencies." exit 1 # TODO: error code fi elif [ $_BUILD_DEPS = 'y' ]; then msg "Building missing dependencies..." # install missing deps by building them from source. # we look for each package name in $SRCROOT and build it. if [ "$_SRC_ROOT" = "" ]; then error "Source root cannot be found - please make sure it is specified in /etc/abs/abs.conf" exit $E_CONFIG_ERROR fi # TODO: handle version comparators (eg, glibc>=2.2.5) for dep in $striplist; do local candidates="$(find $_SRC_ROOT -type d -name "$dep")" if [ -z "$candidates" ]; then error "Could not find \"$dep\" under $_SRC_ROOT" exit 1 # TODO: error code fi local makepkg_opts='-i -c -b' [ $_REMOVE_DEPS = 'y' ] && makepkg_opts="-r $makepkg_opts" local ret=0 local pkgdir for pkgdir in $candidates; do if [ -f "$pkgdir/$_BUILD_SCRIPT" ]; then cd "$pkgdir" ret=0 PKGBUILD="$PKGBUILD" makepkg $makepkg_opts || ret=$? if [ $ret -eq 0 ]; then continue 2 fi fi done error "Failed to build \"$dep\"" exit 1 # TODO: error code done fi # rerun any additional sh scripts found in /etc/profile.d/ local i for i in /etc/profile.d/*.sh do if [ -x $i ]; then . $i &>/dev/null fi done return $R_DEPS_SATISFIED } resolvedeps() { debug "resolvedeps() $*" local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 deplist="$(checkdeps $*)" [ -z "$deplist" ] && return $R_DEPS_SATISFIED if handledeps $deplist; then # check deps again to make sure they were resolved deplist="$(checkdeps $*)" [ -z "$deplist" ] && return $R_DEPS_SATISFIED elif [ $_SYNC_DEPS = 'y' -o $_BUILD_DEPS = 'y' ]; then error "Failed to install all missing dependencies." fi msg "Missing Dependencies:" local dep for dep in $deplist; do msg2 "$dep" done return $R_DEPS_MISSING } # fix flyspray bug #5923 removedeps() { [ $_REMOVE_DEPS = 'n' ] && return [ $_USE_SUDO = 'n' -a $EUID -gt 0 ] && return # runtimedeps and buildtimedeps are set when resolving deps local deplist="$runtimedeps $buildtimedeps" local striplist="" [ -z "$deplist" ] && return local dep for dep in $deplist; do striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" done msg "Removing installed dependencies..." if [ $_USE_SUDO = 'y' ]; then sudo pacman $_PACMAN_OPTS -Rs $striplist else pacman $_PACMAN_OPTS -Rs $striplist fi # TODO: is error checking (pacman) required/helpful here? } install_package () { [ $_INSTALL_PACKAGE = 'n' ] && return [ $_USE_SUDO = 'n' -a $EUID -gt 0 ] && return local ret=0 msg "Installing package with 'pacman -U'..." if [ $_USE_SUDO = 'y' ]; then sudo pacman $_PACMAN_OPTS -U "${PKGDEST}/${_PACKAGE_NAME}.${_PKG_EXT}" || ret=$? else pacman $_PACMAN_OPTS -U "${PKGDEST}/${_PACKAGE_NAME}.${_PKG_EXT}" || ret=$? fi exit $ret } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Load config files #---------------------------------------------------------------------- # Preserve enviroment _PKGDEST="${PKGDEST}" _SRCDEST="${SRCDEST}" if [ -r /etc/makepkg.conf ]; then . /etc/makepkg.conf else error "/etc/makepkg.conf not found. cannot continue" exit $E_CONFIG_ERROR fi [ -r ~/.makepkg.conf ] && . ~/.makepkg.conf if check_buildenv color; then _USE_COLOR='y' fi # Environment overrules config file. PKGDEST="${_PKGDEST:-$PKGDEST}"; PKGDEST="${PKGDEST:-$startdir}" # default to $startdir if undefined SRCDEST="${_SRCDEST:-$SRCDEST}"; SRCDEST="${SRCDEST:-$startdir}" # default to $startdir if undefined unset _PKGDEST _SRCDEST #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Parse command line options #---------------------------------------------------------------------- _OPT_SHORT="bcCdefFghiLmop:rRsSV" _OPT_LONG="builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help," _OPT_LONG="${_OPT_LONG}install,log,nocolor,nobuild,rmdeps,repackage,syncdeps," _OPT_LONG="${_OPT_LONG}version,usesudo,noconfirm,noprogressbar" _OPT_TEMP=$(getopt -o $_OPT_SHORT --long $_OPT_LONG -n "$0" -- "$@") eval set -- "$_OPT_TEMP" unset _OPT_SHORT _OPT_LONG _OPT_TEMP while true; do case $1 in # makepkg Options -b|--builddeps) _BUILD_DEPS='y';; -c|--clean) _CLEANUP='y';; -C|--cleancache) _CLEAN_CACHE='y';; -d|--nodeps) _CHECK_DEPS='n';; -e|--noextract) _EXTRACT_SOURCE='n';; -f|--force) _FORCE='y';; -F) _IN_FAKEROOT='y';; -g|--geninteg) _GENERATE_CHKSUM='y';; -i|--install) _INSTALL_PACKAGE='y';; -L|--log) _LOG_BUILD='y';; -m|--nocolor) _USE_COLOR='n';; -o|--nobuild) _BUILD_PACKAGE='n';; -r|--rmdeps) _REMOVE_DEPS='y';; -R|--repackage) _REPACKAGE='y';; -s|--syncdeps) _SYNC_DEPS='y';; -S|--usesudo) _USE_SUDO='y';; -p) _BUILD_SCRIPT="$2"; shift;; # pacman Options --noconfirm) _PACMAN_OPTS="$_PACMAN_OPTS --noconfirm";; --noprogressbar) _PACMAN_OPTS="$_PACMAN_OPTS --noprogressbar";; -h|--help) display_usage; exit $E_OK;; -V|--version) display_version; exit $E_OK;; --) OPTIND=0; shift; break;; *) display_usage; exit $E_UNKNOWN;; esac shift done #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Clean Cache #---------------------------------------------------------------------- if [ $_CLEAN_CACHE = 'y' ]; then #fix flyspray feature request #5223 if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then msg "Cleaning up ALL files from ${SRCDEST}." if yn_question "Are you sure you wish to do this? [Y/n]"; then ret=0 rm "$SRCDEST"/* || ret=$? if [ $ret -ne 0 ]; then error "Problem removing files; you may not have correct permissions in $SRCDEST" exit 1 # TODO: error code else # removal worked msg "Source cache cleaned." exit $E_OK fi else # answer = no msg "No files have been removed." exit $E_OK fi else # $SRCDEST is $startdir, two possibilities error "Source destination must be defined in makepkg.conf." plain "In addition, please run makepkg -C outside of your cache directory." exit $E_CONFIG_ERROR fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Privilage checks #---------------------------------------------------------------------- if [ $_IN_FAKEROOT = 'n' ]; then if [ $EUID -eq 0 ]; then warning "Running makepkg as root is a \033[1;31mBAD\033[1;37m idea!" plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi elif check_buildenv fakeroot; then if ! type -p fakeroot &>/dev/null; then warning "Fakeroot is not installed. Building as an unprivileged user" plain "will result in non-root ownership of the packaged files. Install" plain "the fakeroot package to correctly build as a non-root user." plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi fi else warning "Running makepkg as an unprivileged user will result in non-root" plain "ownership of the packaged files. Try using the fakeroot environment by" plain "placing 'fakeroot' in the BUILDENV array in /etc/makepkg.conf." plain "" if ! yn_question "Are you sure you want to continue? [N/y]"; then error "Aborting..." exit $E_USER_ABORT fi fi else if [ -z "$FAKEROOTKEY" ]; then error "Do not use the -F option. This option is only used by makepkg when" plain "it is calling it's self inside fakeroot." plain "" exit 1 # TODO: error code fi fi if [ $_USE_SUDO = 'y' -a ! "$(type -p sudo)" ]; then error "Can not find the sudo binary! Is sudo installed?" exit $E_MISSING_PROGRAM elif [ $EUID -gt 0 -a $_INSTALL_PACKAGE = 'y' ]; then # TODO: Should this be an error and exit? warning "makepkg will not be able to install this package as an unprivilaged user." plain "Use the --usesudo (or -s) option to install this package after it has been" plain "built." plain "" sleep 3 fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Load $_BUILD_SCRIPT. #---------------------------------------------------------------------- unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract if [ ! -r "$_BUILD_SCRIPT" ]; then error "$_BUILD_SCRIPT does not exist." exit $E_INVALID_BUILD_SCRIPT #TODO this is an attempt at a generic way to unset all package specific #variables in a PKGBUILD #else # #this is fun.... we'll unset # for var in $(grep "=" $_BUILD_SCRIPT | sed "s|.*$\<.*\>$=.*|\1|g"); do # unset $var # done fi source "$_BUILD_SCRIPT" #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Sanity checks for $_BUILD_SCRIPT. #---------------------------------------------------------------------- # check for no-no's in the build script if [ -z "$pkgver" ]; then error "pkgver is not allowed to be empty." exit $E_INVALID_BUILD_SCRIPT fi if echo "$pkgver" | grep -q '-'; then error "pkgver is not allowed to contain hyphens." exit $E_INVALID_BUILD_SCRIPT fi if [ -z "$pkgrel" ]; then error "pkgrel is not allowed to be empty." exit $E_INVALID_BUILD_SCRIPT fi if echo "$pkgrel" | grep -q '-'; then error "pkgrel is not allowed to contain hyphens." exit $E_INVALID_BUILD_SCRIPT fi if ! in_array $CARCH ${arch[@]}; then error "$pkgname is not available for the '$CARCH' architecture." plain "Note that many packages may need a line added to their $_BUILD_SCRIPT" plain "such as arch=('$CARCH')." exit 1 # TODO: error code fi _PACKAGE_NAME="${pkgname}-${pkgver}-${pkgrel}-${CARCH}" if [ "$install" -a ! -f "$install" ]; then error "install scriptlet ($install) does not exist." exit $E_INVALID_BUILD_SCRIPT fi if [ -f "$PKGDEST/${_PACKAGE_NAME}.${_PKG_EXT}" \ -a $_FORCE = 'n' -a $_GENERATE_CHKSUM = 'n' ]; then if [ $_INSTALL_PACKAGE = 'y' ]; then warning "a package has already been built, installing existing package." installpackage else error "a package has already been built. (use -f to overwrite)" exit 1 # TODO: error code fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Build package inside fakeroot. #---------------------------------------------------------------------- # Run the bear minimum in fakeroot. # flyspray bug 6208 -- using makepkg with fakeroot gives an error if [ $_IN_FAKEROOT = 'y' ]; then if [ $_REPACKAGE = 'y' ]; then warning "Skipping build..." else if [ "$(type -t fake_install)" != "function" ]; then run_build build else run_build fake_install fi tidy_install fi create_package msg "Leaving fakeroot enviroment." exit $E_OK fi msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" if [ $_REPACKAGE = 'n' ]; then msg "Preparing work area..." if [ -d "${startdir}/src" ]; then msg2 "Removing existing src/ directory..." rm -rf "${startdir}/src" fi if [ -d "${startdir}/pkg" ]; then msg2 "Removing existing pkg/ directory..." rm -rf "${startdir}/pkg" fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Check dependencies. #---------------------------------------------------------------------- # fix flyspray bug #5973 if [ $_CHECK_DEPS = 'n' -o $_GENERATE_CHKSUM = 'y' -o \ $_BUILD_PACKAGE = 'n' -o $_REPACKAGE = 'y' ]; then if [ $_CHECK_DEPS = 'n' ]; then warning "Skipping dependecy checks." fi elif [ ! "$(type -p pacman)" ]; then warning "pacman was not found in PATH. skipping dependency checks." else deperr=0 unset runtimedeps buildtimedeps msg "Checking Runtime Dependencies..." if resolvedeps ${depends[@]}; then # deplist is a global variable set by resolvedeps runtimedeps="$deplist" else deperr=1 fi msg "Checking Buildtime Dependencies..." if resolvedeps ${makedepends[@]}; then # deplist is a global variable set by resolvedeps buildtimedeps="$deplist" else deperr=1 fi if [ $deperr -eq 1 ]; then error "could not resolve all dependencies." exit 1 # TODO: error code fi unset deperr fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Retrieve source. #---------------------------------------------------------------------- msg "Retrieving source files..." cd "${startdir}" mkdir -p src; cd src for netfile in ${source[@]}; do file="$(strip_url "$netfile")" if [ -f "../$file" ]; then msg2 "Found $file in build directory." cp "../$file" . elif [ -f "$SRCDEST/$file" ]; then msg2 "Using cached copy of ${file}." cp "$SRCDEST/$file" . else # check for a download utility if [ -z "$FTPAGENT" ]; then error "FTPAGENT is not configured. Check the /etc/makepkg.conf file." msg "Aborting..." exit $E_CONFIG_ERROR fi ftpclient="$(echo $FTPAGENT | awk {'print $1'})" if [ ! -x "$ftpclient" ]; then error "ftpclient $(basename $ftpclient) is not installed." msg "Aborting..." exit $E_MISSING_PROGRAM fi proto="$(echo "$netfile" | sed 's|://.*||')" if [ "$proto" != 'ftp' -a "$proto" != 'http' -a "$proto" != 'https' ]; then error "$netfile was not found in the build directory and is not a proper URL." msg "Aborting..." exit 1 # TODO: error code fi msg2 "Downloading ${file}..." ret=0 $FTPAGENT "$netfile" || ret=$? # fix flyspray bug #3289 if [ $ret -gt 0 ]; then error "Failure while downloading $file" msg "Aborting..." #rm "$file" exit 1 # TODO: error code fi if [ -n "$SRCDEST" ]; then ret=0 mkdir -p "$SRCDEST" && cp "$file" "$SRCDEST" || ret=$? if [ $ret -ne 0 ]; then warning "You do not have correct permissions to cache source in $SRCDEST" cp "$file" .. fi else cp "$file" .. fi fi done unset netfile file ftpclient proto ret #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Generate source file checksums. #---------------------------------------------------------------------- if [ $_GENERATE_CHKSUM = 'y' ]; then msg "Generating checksums for source files..." plain "" for integ in ${INTEGRITY_CHECK[@]}; do integ="$(echo $integ | tr [:upper:] [:lower:])" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) error "Invalid integrity algorithm '$integ' specified." exit $E_CONFIG_ERROR;; esac if ! type -p "${integ}sum" &>/dev/null; then error "Can not find the ${integ}sum program." exit $E_MISSING_PROGRAM fi ct=0 numsrc=${#source[@]} echo -n "${integ}sums=(" for netfile in "${source[@]}"; do file="$(strip_url "$netfile")" if [ ! -r "${file}" ]; then plain "" error "Unable to find '${file}' to generate checksum." exit 1 # TODO: error code fi sum=$(${integ}sum "$file" | cut -d ' ' -f 1) [ $ct -gt 0 ] && echo -ne "\t " echo -n "'$sum'" ct=$(($ct+1)) [ $ct -lt $numsrc ] && echo done echo ')' done exit $E_OK fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Validate source file checksums. #---------------------------------------------------------------------- if [ $_EXTRACT_SOURCE = 'n' -o $_REPACKAGE = 'y' ]; then warning "Skipping source integrity checks." elif [ $_VALIDATE_CHKSUM = 'y' ]; then for integ in ${INTEGRITY_CHECK[@]}; do integ="$(echo $integ | tr [:upper:] [:lower:])" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) error "Invalid integrity algorithm '$integ' specified." exit $E_CONFIG_ERROR;; esac if ! type -p "${integ}sum" &>/dev/null; then error "Can not find the ${integ}sum program." exit $E_MISSING_PROGRAM fi chksums=($(eval echo \${${integ}sums[@]})) if [ ${#chksums[@]} -ne ${#source[@]} ]; then warning "Integrity checks (${integ}) are missing or incomplete." else msg "Validating source files with ${integ}sums..." errors=0 idx=0 for netfile in "${source[@]}"; do file="$(strip_url "$netfile")" echo -n " $file ... " >&2 if echo "${chksums[$idx]} $file" | ${integ}sum --status -c -; then echo "Passed" >&2 else echo "FAILED" >&2 errors=1 fi idx=$(($idx+1)) done if [ $errors -gt 0 ]; then error "One or more files did not pass the validity check!" exit 1 # TODO: error code fi fi done unset integ chksums errors idx netfile file fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Extract sources. #---------------------------------------------------------------------- if [ $_EXTRACT_SOURCE = 'n' -o $_REPACKAGE = 'y' ]; then warning "Skipping source extraction -- using existing src/ tree." else msg "Extracting Sources..." for netfile in "${source[@]}"; do unziphack=0 file="$(strip_url "$netfile")" if in_array "$file" ${noextract[@]}; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi # fix flyspray #6246 file_type="$(file -biz "$file")" cmd='' case "$file_type" in *application/x-tar*) cmd="tar --no-same-owner -xf $file" ;; *application/x-zip*) unziphack=1 cmd="unzip -qqo $file" ;; *application/x-cpio*) cmd="bsdtar -x -f $file" ;; *application/x-gzip*) cmd="gunzip -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; esac if [ "$cmd" != "" ]; then msg2 "$cmd" ret=0 $cmd || ret=$? if [ $ret -ne 0 ]; then # unzip will return a 1 as a warning, it is not an error if [ $unziphack -eq 1 -o $ret -ne 1 ]; then error "Failed to extract $file" msg "Aborting..." exit 1 # TODO: error code fi fi fi done unset netfile file file_type cmd unziphack ret fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Build package #---------------------------------------------------------------------- if [ $_BUILD_PACKAGE = 'n' ]; then msg "Sources are ready." exit $E_OK else cd "$startdir" mkdir -p pkg if [ $EUID -eq 0 ]; then warning "It is not a good idea to run makepkg as root." if [ $_REPACKAGE = 'y' ]; then warning "Skipping build." else cd "${startdir}/src" run_build build [ "$(type -t fake_install)" = "function" ] && run_build fake_install tidy_install fi create_package else cd "${startdir}/src" if [ $_REPACKAGE = 'n' -a "$(type -t fake_install)" = "function" ]; then run_build build fi msg "Entering fakeroot environment." cd "${startdir}" ret=0 fakeroot -- $0 -F $_ARG_LIST || ret=$? [ $ret -ne 0 ] && exit $ret unset ret fi fi #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Clean up #---------------------------------------------------------------------- if [ $_CLEANUP = 'y' ]; then msg "Cleaning up..." cd "$startdir" rm -rf src pkg rm -f "${_PACKAGE_NAME}.log*" fi removedeps msg "Finished making: $pkgname ($(date))" install_package exit $E_OK # vim:set ts=2 sw=2 noet:

4 10

[pacman-dev] makepkg patch to create $pkgname-docs package for docs
by Alessio 'mOLOk' Bolognino 19 Sep '07

19 Sep '07

This patch is a proof of concept to create a separate package for docs file ($pkgname-docs) with an only PKGBUILD. Do you like it? --- scripts/makepkg.in | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.in b/scripts/makepkg.in index 1125e85..0fa9015 100755 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -414,6 +414,27 @@ installpackage() { fi } +installdocspackage() { + if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then + msg "$(gettext "Installing docs package with pacman -U...")" + if [ "$INFAKEROOT" = "1" ]; then + FAKEROOTKEY2=$FAKEROOTKEY + unset FAKEROOTKEY + fi + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-docs-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + local exitcode=$? + if [ "$INFAKEROOT" = "1" ]; then + export FAKEROOTKEY=$FAKEROOTKEY2 + unset FAKEROOTKEY2 + fi + exit $exitcode + elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then + msg "$(gettext "Installing docs package with pacman -U...")" + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-docs-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + exit $? + fi +} + usage() { echo "$(eval_gettext "makepkg version \$myver")" echo @@ -961,9 +982,90 @@ else fi fi -if [ "$(check_option docs)" = "n" ]; then - # remove info/doc files - msg "$(gettext "Removing info/doc files...")" + +if [ "$(check_option packdocs)" = "y" ]; then + msg "Packaging docs" + + rm -fr $startdir/pkg-docs + + cd "$startdir/pkg" + for ddir in ${DOC_DIRS[@]}; do + if [ -d $ddir ]; then + mkdir -p "$startdir/pkg-docs/$ddir" + mv $ddir/* "$startdir/pkg-docs/$ddir" + fi + done + + # remove docs from the master package + rm -rf ${DOC_DIRS[@]} + find -depth -type d -empty -delete; + + cd "$startdir/pkg-docs" + tar cvf /dev/null * | sort >.FILELIST + + builddate=$(LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y") + if [ "$PACKAGER" != "" ]; then + packager="$PACKAGER" + else + packager="Arch Linux (http://www.archlinux.org)" + fi + + size=$(du -cb "$startdir/pkg-docs" | tail -n 1 | awk '{print $1}') + + # write the .PKGINFO file + msg "$(gettext "Generating .PKGINFO file...")" + echo "# Generated by makepkg $myver" >.PKGINFO + echo -n "# " >>.PKGINFO + date >>.PKGINFO + echo "pkgname = $pkgname-docs" >>.PKGINFO + echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO + + # You may want to change this + echo "pkgdesc = $pkgname docs" >>.PKGINFO + + echo "url = $url" >>.PKGINFO + echo "builddate = $builddate" >>.PKGINFO + echo "packager = $packager" >>.PKGINFO + echo "size = $size" >>.PKGINFO + + # maybe put NOARCH or something similar? + if [ "$CARCH" != "" ]; then + echo "arch = $CARCH" >>.PKGINFO + fi + + # and which license? should docs package + # inherit master package license? (I don't think so) + # maybe we could add a docslicense var into the PKGBUILD + for it in "${license[@]}"; do + echo "license = $it" >>.PKGINFO + done + + # We could use a 'docs' group, or inherit master package group + for it in "${groups[@]}"; do + echo "group = $it" >>.PKGINFO + done + +# I don't think these are needed for a -docs package +# echo "replaces = $it" >>.PKGINFO +# echo "depend = $it" >>.PKGINFO +# echo "conflict = $it" >>.PKGINFO +# echo "provides = $it" >>.PKGINFO +# echo "backup = $it" >>.PKGINFO + + pkg_docs_file="$PKGDEST/$pkgname-docs-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" + comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" + + msg "$(gettext "Compressing docs package...")" + if ! tar czf $pkg_docs_file $comp_files *; then + error "$(gettext "Failed to create docs package file.")" + exit 1 + fi + +elif [ "$(check_option docs)" = "n" ]; then +# maybe "else" instead of "elif" would be better? + + # remove info/doc files + msg "$(gettext "Removing info/doc files...")" cd "$startdir/pkg" #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} @@ -1122,6 +1224,9 @@ msg "$(eval_gettext "Finished making: \$pkgname (\$date)")" installpackage +if [ "$(check_option packdocs)" = "y" ]; then + installdocspackage +fi exit 0 # vim: set ts=2 sw=2 noet: -- 1.5.1 -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User Public Key @ http://themolok.netsons.org/uploads/themolok.asc Key ID = 1024D / FE0270FB 2007-04-11 Key Fingerprint = 9AF8 9011 F271 450D 59CF 2D7D 96C9 8F2A FE02 70FB

9 20

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-410-g7325ebb
by Dan McGee 18 Sep '07

18 Sep '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 7325ebbc22091c698fd19140b7ed6986024ec6e8 (commit) via d34b2c4ed84bc40f4a895846785481fad88116a2 (commit) via d50390c089c23ca20c23febc45ea8b9cc24e70f0 (commit) via 82a1129539ee6c1a87ffbe816a0c8c42f3469177 (commit) via afdcf7552cc7afc26ff2f793f3c50e4b9172c1b6 (commit) via acfdad6db3ac6c934d8f1885b37520680a610bec (commit) via 3955858a2d75592ff3f7e2636b39841fc7269174 (commit) via 708488f6fe8bf5e06ae724243381b40586301633 (commit) via f131ee9c56b99429374dfcce583872ad9259ed96 (commit) via c9189f54cd9e57a4d66124d14467848db9fcc8f1 (commit) via d2613b97fa8173920ef7440cf291ca24a05b5b7c (commit) via cd5b38a4b0e8cfe634b31fc730bddbc373eb17ce (commit) via e412ac19f549afa26b58dbd2a2090ed95ca9cb95 (commit) via f1fac6abfb676b081ee2d474ab3e15f6d07d0416 (commit) via ab87657b937f3de392b1796e7f93c4008cc21f01 (commit) via 499b750c2fbbedde27ad25d241f0c95566e5a0b7 (commit) via fe9a0de32edaf1db58e46a3fd3f1c05ad0b0e6c2 (commit) via be0a472cb798f0bfd4a75d1cfe165b4005a8ca90 (commit) via 493e5fb7828793a8b834d5ecfd2e83050fcd920c (commit) via 2f7d2485f5c23223dad2b827d5c384837c878c5a (commit) via 168b795f9eb12c08d70d05f2ee313165004564e3 (commit) via 91f175270142aa8b03e4efc108a07ddf71f7080d (commit) from b0aa51059233849b0a7ef8d6a851750776ce6645 (commit) - Log ----------------------------------------------------------------- commit 7325ebbc22091c698fd19140b7ed6986024ec6e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 17 23:01:01 2007 -0500 Refine pacman manpage, clarify -S repo/package possibility, remove --test Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d34b2c4ed84bc40f4a895846785481fad88116a2 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Sep 13 16:29:05 2007 +0200 libalpm/add.c : newline fix. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit d50390c089c23ca20c23febc45ea8b9cc24e70f0 Author: Stefano Esposito <stefano.esposito87(a)gmail.com> Date: Tue Sep 11 22:27:55 2007 +0200 Avoid segfaults whet calling alpm_option_get_* before initialization When calling a function of the alpm_option_get_* group, you get a segfault if you don't call alpm_initialize() first. With this patch those functions set pm_errno to PM_ERR_HANDLE_NULL and return an error value if handle == NULL. (Dan: modified to meet pacman coding standards) Signed-off-by: Stefano Esposito <stefano.esposito87(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82a1129539ee6c1a87ffbe816a0c8c42f3469177 Author: Jeff Bailes <thepizzaking(a)gmail.com> Date: Mon Sep 17 21:22:32 2007 -0500 Update British English translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afdcf7552cc7afc26ff2f793f3c50e4b9172c1b6 Author: Peter Johnson <tam-al(a)hiddenrock.com> Date: Mon Sep 17 19:48:57 2007 -0500 Allow rankmirrors to read from stdin Feature Request #8043 and provided patch. Thanks! Signed-off-by: Dan McGee <dan(a)archlinux.org> commit acfdad6db3ac6c934d8f1885b37520680a610bec Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 17 19:35:23 2007 -0500 Add Australian mirror Thanks to Jeff Bailes <thepizzaking(a)gmail.com> for pointing this out. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3955858a2d75592ff3f7e2636b39841fc7269174 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Sep 17 19:04:54 2007 +0200 rankmirrors : add support for the $repo var in url. To keep working correctly with url like : ftp://ftp.archlinux.org/$repo/os/i686 rankmirrors will now replace $repo by core. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 708488f6fe8bf5e06ae724243381b40586301633 Merge: b0aa51059233849b0a7ef8d6a851750776ce6645 f131ee9c56b99429374dfcce583872ad9259ed96 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 16 21:10:44 2007 -0500 Merge branch 'asciidoc' into working We're getting close to release, so might as well do this now so people can actually update some of our documentation. commit f131ee9c56b99429374dfcce583872ad9259ed96 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Aug 16 13:41:57 2007 +0200 Update manpage with new query options. Dan: did a bit more updating and clarifying. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c9189f54cd9e57a4d66124d14467848db9fcc8f1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 16 12:57:02 2007 -0400 Man page revision time Spruce up the asciidoc formatting, fix a few issues that we had. Formatting now looks pretty good in both the manpage output and the XHTML output. Also added some options that we have changed since 3.0, and a few wording updates, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2613b97fa8173920ef7440cf291ca24a05b5b7c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 9 14:38:02 2007 -0400 Add asciidoc checking to configure.ac, make manpage generation optional Include manpages when we ship a package tarball, and allow them to be generated by the end user if they want by using the --enable-asciidoc option to ./configure. This will allow us to maintain manpages in an easier to modify format while still keeping the make dependencies to a minimum. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cd5b38a4b0e8cfe634b31fc730bddbc373eb17ce Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 9 14:22:01 2007 -0400 Add a manpage for repo-add We still need some work here- we should have a repo-remove manpage link to this one, and we should not have to struggle with asciidoc formatting to get it to work like any other multiple-command manpage works. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e412ac19f549afa26b58dbd2a2090ed95ca9cb95 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 16:54:18 2007 -0400 Asciidoc updates- make it pretty, fix build, etc. * Fix up the target so we rebuild the manpages when we edit the corresponding text file. * Add vim modelines to all of the asciidoc files ensureing the right syntax highlighting is used and we have expandtabs turned off. * Start making a few small changes to PKGBUILD.5 to make it pretty in both HTML and manpage format output. * Fix the manlink macro to include the manpage section in the link. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1fac6abfb676b081ee2d474ab3e15f6d07d0416 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jul 6 16:30:53 2007 +0100 Update PKGBUILD example. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit ab87657b937f3de392b1796e7f93c4008cc21f01 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jul 6 16:07:53 2007 +0100 Add Synopsis section to man 5 pages. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 499b750c2fbbedde27ad25d241f0c95566e5a0b7 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 6 09:59:46 2007 -0400 Make manpage generation depend on footer.txt If footer.txt is updated, we need to regenerate the manpages, this little fix should do this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe9a0de32edaf1db58e46a3fd3f1c05ad0b0e6c2 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Jul 6 06:56:11 2007 +0100 doc/Makefile.am: Set pacman version and date when man pages are generated. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit be0a472cb798f0bfd4a75d1cfe165b4005a8ca90 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Tue Jul 3 00:22:01 2007 +0100 Convert the remaining man pages to asciidoc. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 493e5fb7828793a8b834d5ecfd2e83050fcd920c Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Mon Jul 2 21:30:39 2007 +0100 Move common stuff into footer.txt and some formating tweaks. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 2f7d2485f5c23223dad2b827d5c384837c878c5a Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Sun Jul 1 17:58:46 2007 -0400 Add two asciidoc manpages to the doc/ dir Add the pacman.8 and pacman.conf.5 asciidoc manpages to the GIT tree, with the rest to follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 168b795f9eb12c08d70d05f2ee313165004564e3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 17:55:44 2007 -0400 Start addition of asciidoc stuff Add some asciidoc generation stuff to the doc/ Makefile.am so we can get some manpages up and working. Add necessary stuff to gitignore, and check in the asciidoc.conf file along with the footer for all of the manpages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 91f175270142aa8b03e4efc108a07ddf71f7080d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 1 10:14:08 2007 -0400 Remove old 'static' manpages in anticipation of the asciidoc switch Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 27 +- doc/.gitignore | 9 +- doc/Makefile.am | 49 +- doc/PKGBUILD-example.txt | 32 + doc/PKGBUILD.5 | 288 ------ doc/PKGBUILD.5.txt | 239 +++++ doc/asciidoc.conf | 64 ++ doc/footer.txt | 24 + doc/libalpm.3 | 53 -- doc/libalpm.3.txt | 39 + doc/makepkg.8 | 146 --- doc/makepkg.8.txt | 143 +++ doc/makepkg.conf.5 | 152 ---- doc/makepkg.conf.5.txt | 154 ++++ doc/pacman.8 | 293 ------ doc/pacman.8.txt | 312 +++++++ doc/pacman.conf.5 | 143 --- doc/pacman.conf.5.txt | 147 +++ doc/repo-add.8.txt | 51 ++ etc/pacman.d/mirrorlist.in | 1 + lib/libalpm/add.c | 4 +- lib/libalpm/handle.c | 183 ++++- po/en_GB.po | 2121 ++++++++++++++++++++++++++++++++------------ scripts/rankmirrors.py.in | 18 +- 24 files changed, 3018 insertions(+), 1674 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ b0aa51059233849b0a7ef8d6a851750776ce6645 \ 7325ebbc22091c698fd19140b7ed6986024ec6e8

6 11

[pacman-dev] Polish sunsite mirror fix
by Roman Kyrylych 18 Sep '07

18 Sep '07

I noticed this on Wiki and then checked mirrorlist.in Please change ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/ to ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/archlinux/ -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH] avoid segfaults whet calling alpm_option_get_* without previously calling alpm_initialize()
by Stefano Esposito 18 Sep '07

18 Sep '07

When calling a function of the alpm_option_get_* group, you get a segfault if you don't call alpm_initialize() first. With this patch those functions set pm_errno to PM_ERR_HANDLE_NULL and return an error value if handle == NULL. Patch attached Signed-off-by: Stefano Esposito <stefano.esposito87(a)gmail.com> --- lib/libalpm/handle.c | 165 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 146 insertions(+), 19 deletions(-) -- Stefano Esposito <stefano.esposito87(a)gmail.com>

2 1