- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Print error on duplicated database entries
by Nagy Gabor 14 Nov '09

14 Nov '09

Some users reported duplicated database entries in /var/lib/pacman/local/, for example, both foo-1.0-1 and foo-2.0-1 subdirectories existed. (Bogus 3rd-party scripts, backup?) In this case pacman reported no error and its behaviour was mysterious. >From now on, pacman detects this situation and prints an error message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/be_files.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..feb71f8 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -348,6 +348,13 @@ int _alpm_db_populate(pmdb_t *db) continue; } + /* duplicated database entries are not allowed */ + if(_alpm_pkg_find(db->pkgcache, pkg->name)) { + _alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name); + _alpm_pkg_free(pkg); + continue; + } + /* explicitly read with only 'BASE' data, accessors will handle the rest */ if(_alpm_db_read(db, pkg, INFRQ_BASE) == -1) { _alpm_log(PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name); -- 1.6.5.2

3 4

[pacman-dev] [PATCH 2/2] Changing [ to [[ and ((
by Isaac Good 12 Nov '09

12 Nov '09

>From 6787be2ea0eacc919b5769c5ab7ef8add1fe35e2 Mon Sep 17 00:00:00 2001 From: Isaac Good <pacman(a)isaac.otherinbox.com> Date: Wed, 11 Nov 2009 17:54:42 -0500 Subject: [PATCH 2/2] Changing [ to [[ and (( Second half of makepkg This replaces any prior patches of mine Includes stuff like -o to || and -a to && etc if [ $(type .. were preserved due to a bash bug with [[ and set -e and ERR traps Signed-off-by: Isaac Good <pacman(a)isaac.otherinbox.com> --- scripts/makepkg.sh.in | 212 ++++++++++++++++++++++++------------------------- 1 files changed, 105 insertions(+), 107 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a80d6c..5535eb5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1095,9 +1095,9 @@ create_srcpackage() { } install_package() { - [ "$INSTALL" -eq 0 ] && return + (( ! INSTALL )) && return - if [ "$SPLITPKG" -eq 0 ]; then + if (( ! SPLITPKG )); then msg "$(gettext "Installing package ${pkgname} with pacman -U...")" else msg "$(gettext "Installing ${pkgbase} package group with pacman -U...")" @@ -1105,7 +1105,7 @@ install_package() { local pkglist for pkg in ${pkgname[@]}; do - if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then + if [[ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]]; then pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" else pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" @@ -1113,13 +1113,13 @@ install_package() { done local ret=0 - if [ "$ASROOT" -eq 0 ]; then + if (( ! ASROOT )); then sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? else pacman $PACMAN_OPTS -U ${pkglist} || ret=$? fi - if [ $ret -ne 0 ]; then + if (( ret )); then warning "$(gettext "Failed to install built package(s).")" return 0 fi @@ -1127,34 +1127,34 @@ install_package() { check_sanity() { # check for no-no's in the build script - if [ -z "$pkgname" ]; then + if [[ -z $pkgname ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" return 1 fi - if [ -z "$pkgver" ]; then + if [[ -z $pkgver ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" return 1 fi - if [ -z "$pkgrel" ]; then + if [[ -z $pkgrel ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" return 1 fi - if [ "${pkgname:0:1}" == "-" ]; then + if [[ ${pkgname:0:1} == "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" return 1 fi - if [ "$pkgver" != "${pkgver//-/}" ]; then + if [[ $pkgver != "${pkgver//-/}" ]]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" return 1 fi - if [ "$pkgrel" != "${pkgrel//-/}" ]; then + if [[ $pkgrel != "${pkgrel//-/}" ]]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" return 1 fi - if [ "$arch" != 'any' ]; then + if [[ $arch != 'any' ]]; then if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" -eq 0 ]; then + if (( ! IGNOREARCH )); then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" plain "$(gettext "such as arch=('%s').")" "$CARCH" @@ -1165,7 +1165,7 @@ check_sanity() { local provide for provide in ${provides[@]}; do - if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + if [[ $provide != ${provide//</} || $provide != ${provide//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi @@ -1173,7 +1173,7 @@ check_sanity() { local file for file in "${backup[@]}"; do - if [ "${file:0:1}" = "/" ]; then + if [[ "${file:0:1}" = "/" ]]; then error "$(gettext "Invalid backup entry : %s")" "$file" return 1 fi @@ -1187,12 +1187,12 @@ check_sanity() { fi done - if [ "$install" -a ! -f "$install" ]; then + if [[ "$install" && ! -f "$install" ]]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" return 1 fi - if [ -n "$changelog" -a ! -f "$changelog" ]; then + if [[ -n $changelog && ! -f $changelog ]]; then error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" return 1 fi @@ -1203,20 +1203,20 @@ check_sanity() { known=0 # check if option matches a known option or its inverse for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then + if [[ ${opt} = ${kopt} || ${opt} = "!${kopt}" ]]; then known=1 fi done - if [ $known -eq 0 ]; then + if (( ! known )); then error "$(gettext "options array contains unknown option '%s'")" "$opt" valid_options=0 fi done - if [ $valid_options -eq 0 ]; then + if (( ! valid_options )); then return 1 fi - if [ "${#pkgname[@]}" -gt "1" ]; then + if (( ${#pkgname[@]} > 1 )); then for pkg in ${pkgname[@]}; do if [ "$(type -t package_${pkg})" != "function" ]; then error "$(gettext "missing package function for split package '%s'")" "$pkg" @@ -1233,42 +1233,42 @@ devel_check() { # Do not update pkgver if --holdver is set, when building a source package, # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "$BUILDFILE" \ - -o ! -w "$BUILDFILE" ]; then + if (( HOLDVER || SOURCEONLY )) \ + || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi - if [ -z "$FORCE_VER" ]; then + if [[ -z $FORCE_VER ]]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent # calls to makepkg via fakeroot will explicitly pass the version # number to avoid having to determine the version number twice. # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver - if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then + if [[ -n ${_darcstrunk} && -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 + elif [[ -n ${_cvsroot} && -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 + elif [[ -n ${_gitroot} && -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 + elif [[ -n ${_svntrunk} && -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 + elif [[ -n ${_bzrtrunk} && -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 + elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then [ $(type -p hg) ] || return 0 msg "$(gettext "Determining latest hg revision...")" - if [ -d ./src/$_hgrepo ] ; then + if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo hg pull hg update @@ -1281,7 +1281,7 @@ devel_check() { cd ../../ fi - if [ -n "$newpkgver" ]; then + if [[ -n $newpkgver ]]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" fi @@ -1301,9 +1301,9 @@ devel_update() { # ... # _foo=pkgver # - if [ -n "$newpkgver" ]; then - if [ "$newpkgver" != "$pkgver" ]; then - if [ -f "$BUILDFILE" -a -w "$BUILDFILE" ]; then + if [[ -n $newpkgver ]]; then + if [[ $newpkgver != $pkgver ]]; then + if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" source "$BUILDFILE" @@ -1322,7 +1322,7 @@ backup_package_variables() { restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" - if [ -n "${!indirect}" ]; then + if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} @@ -1337,21 +1337,21 @@ parse_options() { local ret=0; local unused_options="" - while [ -n "$1" ]; do - if [ ${1:0:2} = '--' ]; then - if [ -n "${1:2}" ]; then + while [[ -n $1 ]]; do + if [[ ${1:0:2} = '--' ]]; then + if [[ -n "${1:2}" ]]; then local match="" for i in ${long_options//,/ }; do - if [ ${1:2} = ${i//:} ]; then + if [[ ${1:2} = ${i//:} ]]; then match=$i break fi done - if [ -n "$match" ]; then - if [ ${1:2} = $match ]; then + if [[ -n $match ]]; then + if [[ ${1:2} = $match ]]; then printf ' %s' "$1" else - if [ -n "$2" ]; then + if [[ -n $2 ]]; then printf ' %s' "$1" shift printf " '%s'" "$1" @@ -1368,15 +1368,15 @@ parse_options() { shift break fi - elif [ ${1:0:1} = '-' ]; then + elif [[ ${1:0:1} = '-' ]]; then for ((i=1; i<${#1}; i++)); do if [[ "$short_options" =~ "${1:i:1}" ]]; then if [[ "$short_options" =~ "${1:i:1}:" ]]; then - if [ -n "${1:$i+1}" ]; then + if [[ -n ${1:$i+1} ]]; then printf ' -%s' "${1:i:1}" printf " '%s'" "${1:$i+1}" else - if [ -n "$2" ]; then + if [[ -n $2 ]]; then printf ' -%s' "${1:i:1}" shift printf " '%s'" "${1}" @@ -1401,13 +1401,13 @@ parse_options() { done printf " --" - if [ -n "$unused_options" ]; then + if [[ -n $unused_options ]]; then for i in ${unused_options[@]}; do printf ' %s' "$i" done fi - if [ -n "$1" ]; then - while [ -n "$1" ]; do + if [[ -n $1 ]]; then + while [[ -n $1 ]]; do printf " '%s'" "${1}" shift done @@ -1540,7 +1540,7 @@ _SRCDEST=${SRCDEST} MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} # Source the config file; fail if it is not found -if [ -r "$MAKEPKG_CONF" ]; then +if [[ -r $MAKEPKG_CONF ]]; then source "$MAKEPKG_CONF" else error "$(gettext "%s not found.")" "$MAKEPKG_CONF" @@ -1549,13 +1549,13 @@ else fi # Source user-specific makepkg.conf overrides -if [ -r ~/.makepkg.conf ]; then +if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then +if [[ -t 2 && ! "$USE_COLOR" = "n" && "$(check_buildenv color)" = "y" ]]; then ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" @@ -1572,23 +1572,23 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined -if [ "$HOLDVER" -eq 1 -a -n "$FORCE_VER" ]; then +if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi -if [ "$CLEANCACHE" -eq 1 ]; then +if (( CLEANCACHE )); then #fix flyspray feature request #5223 - if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then + if [[ -n $SRCDEST && $SRCDEST != $startdir ]]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer answer="${answer^^}" - if [ "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then + if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then rm "$SRCDEST"/* - if [ $? -ne 0 ]; then + if (( $? )); then error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" exit 1 else @@ -1609,40 +1609,39 @@ if [ "$CLEANCACHE" -eq 1 ]; then fi fi -if [ "$INFAKEROOT" -eq 0 ]; then - if [ $EUID -eq 0 -a "$ASROOT" -eq 0 ]; then +if (( ! INFAKEROOT )); then + if (( EUID == 0 && ! ASROOT )); then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" plain "$(gettext "wish to run as root, please use the --asroot option.")" exit 1 # $E_USER_ABORT - elif [ $EUID -gt 0 -a "$ASROOT" -eq 1 ]; then + elif (( EUID > 0 && ASROOT )); then # Warn those who try to use the --asroot option when they are not root error "$(gettext "The --asroot option is meant for the root user only.")" plain "$(gettext "Please rerun makepkg without the --asroot flag.")" exit 1 # $E_USER_ABORT - elif [ "$(check_buildenv fakeroot)" = "y" -a $EUID -gt 0 ]; then + elif [[ "$(check_buildenv fakeroot)" = "y" ]] && (( EUID > 0 )); then if [ ! $(type -p fakeroot) ]; then error "$(gettext "Fakeroot must be installed if using the 'fakeroot' option")" plain "$(gettext "in the BUILDENV array in %s.")" "$MAKEPKG_CONF" exit 1 fi - elif [ $EUID -gt 0 ]; then + elif (( EUID > 0 )); then warning "$(gettext "Running makepkg as an unprivileged user will result in non-root")" plain "$(gettext "ownership of the packaged files. Try using the fakeroot environment by")" plain "$(gettext "placing 'fakeroot' in the BUILDENV array in %s.")" "$MAKEPKG_CONF" sleep 1 fi else - if [ -z "$FAKEROOTKEY" ]; then + if [[ -z $FAKEROOTKEY ]]; then error "$(gettext "Do not use the '-F' option. This option is only for use by makepkg.")" exit 1 # TODO: error code fi fi # check for sudo if we will need it during makepkg execution -if [ "$ASROOT" -eq 0 \ - -a $ "$DEP_BIN" -eq 1 -o "$RMDEPS" -eq 1 -o "$INSTALL" -eq 1 $ ]; then +if (( ! ASROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then if [ ! "$(type -p sudo)" ]; then error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" @@ -1656,8 +1655,8 @@ unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} -if [ ! -f "$BUILDFILE" ]; then - if [ -t 0 ]; then +if [[ ! -f $BUILDFILE ]]; then + if [[ -t 0 ]]; then error "$(gettext "%s does not exist.")" "$BUILDFILE" exit 1 else @@ -1667,18 +1666,18 @@ if [ ! -f "$BUILDFILE" ]; then fi else crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) - if [ -n "$crlftest" ]; then + if [[ -n $crlftest ]]; then error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDFILE" exit 1 fi - if [ "${BUILDFILE:0:1}" != "/" ]; then + if [[ "${BUILDFILE:0:1}" != "/" ]]; then BUILDFILE="$startdir/$BUILDFILE" fi source "$BUILDFILE" fi -if [ "$GENINTEG" -eq 1 ]; then +if (( GENINTEG )); then mkdir -p "$srcdir" cd "$srcdir" download_sources @@ -1700,17 +1699,17 @@ check_sanity || exit 1 devel_check devel_update -if [ "${#pkgname[@]}" -gt "1" ]; then +if (( ${#pkgname[@]} > 1 )); then SPLITPKG=1 fi pkgbase=${pkgbase:-${pkgname[0]}} -if [ "$SPLITPKG" -eq 0 ]; then - if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ - -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then - if [ "$INSTALL" -eq 1 ]; then +if (( ! SPLITPKG )); then + if [[ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + || -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" ]] \ + && ! (( FORCE || SOURCEONLY || NOBUILD )); then + if (( INSTALL )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? @@ -1723,16 +1722,16 @@ else allpkgbuilt=1 somepkgbuilt=0 for pkg in ${pkgname[@]}; do - if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + if [[ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + || -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" ]]; then somepkgbuilt=1 else allpkgbuilt=0 fi done - if [ "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then - if [ "$allpkgbuilt" -eq 1 ]; then - if [ "$INSTALL" -eq 1 ]; then + if ! (( FORCE || SOURCEONLY || NOBUILD )); then + if (( allpkgbuilt )); then + if (( INSTALL )); then warning "$(gettext "The package group has already been built, installing existing packages...")" install_package exit $? @@ -1741,7 +1740,7 @@ else exit 1 fi fi - if [ "$somepkgbuilt" -eq 1 ]; then + if (( somepkgbuilt )); then error "$(gettext "Part of the package group has already been built. (use -f to overwrite)")" exit 1 fi @@ -1750,10 +1749,10 @@ else fi # Run the bare minimum in fakeroot -if [ "$INFAKEROOT" -eq 1 ]; then - if [ "$SPLITPKG" -eq 0 ]; then - if [ "$PKGFUNC" -eq 0 ]; then - if [ "$REPKG" -eq 0 ]; then +if (( INFAKEROOT )); then + if (( ! SPLITPKG )); then + if (( ! PKGFUNC )); then + if (( ! REPKG )); then run_build tidy_install fi @@ -1782,9 +1781,9 @@ fi msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" -ne 0 ]; then - if [ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" \ - -a "$FORCE" -eq 0 ]; then +if (( SOURCEONLY )); then + if [[ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] \ + && (( ! FORCE )); then error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 fi @@ -1794,9 +1793,9 @@ if [ "$SOURCEONLY" -ne 0 ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" -eq 1 -o "$NOBUILD" -eq 1 -o "$REPKG" -eq 1 ]; then +if (( NODEPS || NOBUILD || REPKG )); then # no warning message needed for nobuild, repkg - if [ "$NODEPS" -eq 1 ]; then + if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p pacman) ]; then @@ -1809,7 +1808,7 @@ elif [ $(type -p pacman) ]; then msg "$(gettext "Checking Buildtime Dependencies...")" resolve_deps ${makedepends[@]} || deperr=1 - if [ $deperr -eq 1 ]; then + if (( deperr )); then error "$(gettext "Could not resolve all dependencies.")" exit 1 fi @@ -1824,19 +1823,19 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$NOEXTRACT" -eq 1 ]; then +if (( NOEXTRACT )); then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" warning "$(gettext "Skipping source extraction -- using existing src/ tree")" - if [ "$NOEXTRACT" -eq 1 -a -z "$(ls "$srcdir" 2>/dev/null)" ]; then + if (( NOEXTRACT )) && [[ -z "$(ls "$srcdir" 2>/dev/null)" ]]; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi -elif [ "$REPKG" -eq 1 ]; then - if [ "$PKGFUNC" -eq 0 -a "$SPLITPKG" -eq 0 \ - -a $ ! -d "$pkgdir" -o -z "$(ls "$pkgdir" 2>/dev/null)" $ ]; then +elif (( REPKG )); then + if (( ! PKGFUNC && ! SPLITPKG )) \ + && [[ ! -d $pkgdir || -z "$(ls "$pkgdir" 2>/dev/null)" ]]; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" exit 1 @@ -1847,13 +1846,12 @@ else extract_sources fi -if [ "$NOBUILD" -eq 1 ]; then +if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [ -d "$pkgdir" \ - -a $ "$REPKG" -eq 0 -o "$PKGFUNC" -eq 1 -o "$SPLITPKG" -eq 1 $ ]; then + if [[ -d $pkgdir ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi @@ -1861,16 +1859,16 @@ else cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then - if [ "$REPKG" -eq 0 ]; then + if [[ "$(check_buildenv fakeroot)" != "y" ]] || (( EUID == 0 )); then + if (( ! REPKG )); then devel_update run_build fi - if [ "$SPLITPKG" -eq 0 ]; then - if [ "$PKGFUNC" -eq 1 ]; then + if (( ! SPLITPKG )); then + if (( PKGFUNC )); then run_package tidy_install - elif [ "$REPKG" -eq 0 ]; then + elif (( ! REPKG )); then tidy_install fi create_package @@ -1887,7 +1885,7 @@ else done fi else - if [ "$REPKG" -eq 0 -a $ "$PKGFUNC" -eq 1 -o "$SPLITPKG" -eq 1 $ ]; then + if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update run_build cd "$startdir" @@ -1895,7 +1893,7 @@ else msg "$(gettext "Entering fakeroot environment...")" - if [ -n "$newpkgver" ]; then + if [[ -n $newpkgver ]]; then fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $? else fakeroot -- $0 -F "${ARGLIST[@]}" || exit $? -- 1.6.5.2

2 2

[pacman-dev] apt-get style information for users in pacman
by Bhargav Prasanna 12 Nov '09

12 Nov '09

Hi, Lets say you are downloading a package with x dependencies. i.e. x+1 packages in all: Pacman tells you that you have x+1 targets. But if x+1 is a large number, which is usually the case when the system is being set up or updated, the user loses track of the number of packages that have been downloaded and the number remaining a short while after the downloads commence. Debian's apt-get has a really good feature. If the nth package (n<=x+1) is being downloaded, you'll see that in every line: "[n/x+1]" which tells you how many you've downloaded and how many you are yet to is present. This will help the user keep track. =) If someone can guide me here, I guess we can add this feature to pacman -- Bhargav Prasanna http://muftmukt.wordpress.com/

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-82-g7ae1576
by dan＠archlinux.org 11 Nov '09

11 Nov '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 7ae15768e5558def8bdf88fe6c5c49fa6c9b08ad (commit) via e09253d15b879f3375d57efd656e687a984ebc36 (commit) via db756ed9316648c8ba6a82a0f0818515421f8a94 (commit) via 133a39e2bb78f2be1a60094a5a398f04315df64a (commit) from 3f7cc83e0df79f24c545924d7b38e9fa22302b2a (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 7ae15768e5558def8bdf88fe6c5c49fa6c9b08ad Merge: 3f7cc83e0df79f24c545924d7b38e9fa22302b2a e09253d15b879f3375d57efd656e687a984ebc36 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 10 18:21:19 2009 -0600 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 9 +++++++++ configure.ac | 4 ++-- doc/index.txt | 1 + lib/libalpm/util.c | 3 ++- scripts/makepkg.sh.in | 9 ++------- src/pacman/util.c | 3 ++- 6 files changed, 18 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.3.3, created. v3.3.3
by dan＠archlinux.org 11 Nov '09

11 Nov '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 annotated tag, v3.3.3 has been created at 85ce4cdbfe8340a6bfb85eea11cdd7262802e79e (tag) tagging e09253d15b879f3375d57efd656e687a984ebc36 (commit) replaces v3.3.2 tagged by Dan McGee on Tue Nov 10 16:18:15 2009 -0600 - Log ----------------------------------------------------------------- 3.3.3 monthly maint release I bet we'll find 6 more issues tomorrow that just missed this release. :) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkr55r8ACgkQXC5GoPU6du2LSQCdHheWSguRuMQ29GLVG3dWwf7B AOcAn03OIFkhO0V6ES7KTlXneFSfzXu7 =mat7 -----END PGP SIGNATURE----- Allan McRae (2): Fix Greek short Y/N translation makepkg: allow passing arguments with spaces Cedric Staniewski (2): makepkg: change preselected option for cleaning the cache from Y to N makepkg: quote arrays in order to preserve spaces in array items Christos Nouskas (1): Minor fix to Greek translation Dan McGee (2): Fix opendir error condition checks Necessary updates for 3.3.3 release Gan Lu (1): fix for zh_CN Xavier Chantry (1): alpm_list : fix a bug in alpm_list_remove 甘露(Lu.Gan) (1): Update Chinese translation ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.2-10-ge09253d
by dan＠archlinux.org 11 Nov '09

11 Nov '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 e09253d15b879f3375d57efd656e687a984ebc36 (commit) via db756ed9316648c8ba6a82a0f0818515421f8a94 (commit) via 133a39e2bb78f2be1a60094a5a398f04315df64a (commit) from fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 (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 e09253d15b879f3375d57efd656e687a984ebc36 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 10 11:55:38 2009 -0600 Necessary updates for 3.3.3 release Should cover everything worth mentioning in NEWS, plus the version number bumps as usual. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit db756ed9316648c8ba6a82a0f0818515421f8a94 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Nov 5 23:14:09 2009 +0000 makepkg: quote arrays in order to preserve spaces in array items Fixes FS#16871 and makes the pkgdesc workaround obsolete. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 133a39e2bb78f2be1a60094a5a398f04315df64a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 27 21:11:29 2009 -0500 Fix opendir error condition checks Thanks to Laszlo Papp <djszapi(a)archlinux.us> for the following catch: opendir(path)) == (DIR *)-1; is maybe the result of misunderstanding the manpage. If an opendir() call isn't successful it returns NULL rather than '(DIR *)-1'. Noticed-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 9 +++++++++ configure.ac | 4 ++-- doc/index.txt | 1 + lib/libalpm/util.c | 3 ++- scripts/makepkg.sh.in | 9 ++------- src/pacman/util.c | 3 ++- 6 files changed, 18 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: allow the use of only a package() function
by Cedric Staniewski 10 Nov '09

10 Nov '09

For some packages, generally the 'any' arch ones, a build step is not required and therefore can be skipped. In these cases, a package() function without a build() one is sufficient. As a side effect, this commit makes meta packages without any function at all in the PKGBUILD possible. Fixes FS#15147. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- doc/PKGBUILD.5.txt | 12 ++++++------ scripts/makepkg.sh.in | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 28dd8c7..2d6589b 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -233,10 +233,10 @@ name. The syntax is: `source=('filename::url')`. build() Function ---------------- -In addition to the above directives, the build() bash function comprises the -remainder of the PKGBUILD. This is directly sourced and executed by makepkg, so -anything that bash or the system has available is available for use here. Be -sure any exotic commands used are covered by `makedepends`. +In addition to the above directives, the optional build() bash function usually +comprises the remainder of the PKGBUILD. This is directly sourced and executed by +makepkg, so anything that bash or the system has available is available for use +here. Be sure any exotic commands used are covered by `makedepends`. All of the above variables such as `pkgname` and `pkgver` are available for use in the build function. In addition, makepkg defines three variables for your @@ -263,8 +263,8 @@ package() Function An optional package() function can be specified in addition to the build() function. This function is run immediately after the build() function. When specified in combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot -usage will be limited to running the packaging stage. The build() function will be -run as the user calling makepkg. +usage will be limited to running the packaging stage. An existing build() function +will be run as the user calling makepkg. Package Splitting ----------------- diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a6780d7..2b540b4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -72,6 +72,7 @@ LOGGING=0 SOURCEONLY=0 IGNOREARCH=0 HOLDVER=0 +BUILDFUNC=0 PKGFUNC=0 SPLITPKG=0 PKGLIST="" @@ -140,7 +141,9 @@ clean_up() { rm -rf "$pkgdir" "$srcdir" if [ -n "$pkgbase" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* + if (( BUILDFUNC )); then + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* + fi if [ "$PKGFUNC" -eq 1 ]; then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif [ "$SPLITPKG" -eq 1 ]; then @@ -1754,6 +1757,12 @@ if [ "${#pkgname[@]}" -gt "1" ]; then SPLITPKG=1 fi +# test for available PKGBUILD functions +# The exclamation mark is required here to avoid triggering the ERR trap when +# a tested function does not exist. +if [[ $(! type -t build) = "function" ]]; then + BUILDFUNC=1 +fi if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then @@ -1814,7 +1823,7 @@ fi if [ "$INFAKEROOT" -eq 1 ]; then if [ "$SPLITPKG" -eq 0 ]; then if [ "$PKGFUNC" -eq 0 ]; then - if [ "$REPKG" -eq 0 ]; then + if (( BUILDFUNC && ! REPKG )); then run_build tidy_install fi @@ -1928,7 +1937,7 @@ else if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then if [ "$REPKG" -eq 0 ]; then devel_update - run_build + (( BUILDFUNC )) && run_build fi if [ "$SPLITPKG" -eq 0 ]; then if [ "$PKGFUNC" -eq 1 ]; then @@ -1953,7 +1962,7 @@ else else if [ "$REPKG" -eq 0 -a $ "$PKGFUNC" -eq 1 -o "$SPLITPKG" -eq 1 $ ]; then devel_update - run_build + (( BUILDFUNC )) && run_build cd "$startdir" fi -- 1.6.5.2

3 6

[pacman-dev] Patch makepkg to use more [[ and (( bash syntax
by Isaac Good 10 Nov '09

10 Nov '09

See http://bugs.archlinux.org/task/16623 too >From d71c1f120351c0ab7396f5aabbe9cf0497621782 Mon Sep 17 00:00:00 2001 From: Isaac Good <arch(a)isaac.otherinbox.com> Date: Sun, 25 Oct 2009 19:19:18 -0400 Subject: [PATCH] Signed-off-by: Isaac Good <arch(a)isaac.otherinbox.com> Modified makepkg to use more of [[ ]] and (( )) bash constructs Added quotes to variables in a few places that were missing them or had {} instead --- scripts/makepkg.sh.in | 594 ++++++++++++++++++++++++------------------------- 1 files changed, 296 insertions(+), 298 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9cd7f2e..16a4f76 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -82,22 +82,25 @@ PACMAN_OPTS= ### SUBROUTINES ### plain() { - local mesg=$1; shift + local mesg="$1"; shift printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg() { - local mesg=$1; shift +} + +msg() { + local mesg="$1"; shift printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } msg2() { - local mesg=$1; shift + local mesg="$1"; shift printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } warning() { - local mesg=$1; shift + local mesg="$1"; shift printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } @@ -112,7 +115,7 @@ error() { # the fakeroot call, the error message will be printed by the main call. ## trap_exit() { - if [ "$INFAKEROOT" -eq 0 ]; then + if (( ! INFAKEROOT )); then echo error "$@" fi @@ -126,22 +129,22 @@ trap_exit() { clean_up() { local EXIT_CODE=$? - if [ "$INFAKEROOT" -eq 1 ]; then + if (( INFAKEROOT )); then # Don't clean up when leaving fakeroot, we're not done yet. return fi - if [ $EXIT_CODE -eq 0 -a "$CLEANUP" -eq 1 ]; then + if (( ! EXIT_CODE && CLEANUP )); then # If it's a clean exit and -c/--clean has been passed... msg "$(gettext "Cleaning up...")" rm -rf "$pkgdir" "$srcdir" - if [ -n "$pkgbase" ]; then + if [[ -n $pkgbase ]]; then # Can't do this unless the BUILDSCRIPT has been sourced. rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"* - if [ "$PKGFUNC" -eq 1 ]; then + if (( PKGFUNC )); then rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* - elif [ "$SPLITPKG" -eq 1 ]; then - for pkg in ${pkgname[@]}; do + elif (( SPLITPKG )); then + for pkg in "${pkgname[@]}"; do rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* done fi @@ -189,15 +192,15 @@ get_url() { # ? - not found ## check_option() { - local ret=$(in_opt_array "$1" ${options[@]}) - if [ "$ret" != '?' ]; then + local ret=$(in_opt_array "$1" "${options[@]}") + if [[ $ret != '?' ]]; then echo $ret return fi # fall back to makepkg.conf options - ret=$(in_opt_array "$1" ${OPTIONS[@]}) - if [ "$ret" != '?' ]; then + ret=$(in_opt_array "$1" "${OPTIONS[@]}") + if [[ $ret != '?' ]]; then echo $ret return fi @@ -215,7 +218,7 @@ check_option() { # ? - not found ## check_buildenv() { - echo $(in_opt_array "$1" ${BUILDENV[@]}) + echo $(in_opt_array "$1" "${BUILDENV[@]}") } @@ -234,7 +237,7 @@ in_opt_array() { if [ "$opt" = "$needle" ]; then echo 'y' # Enabled return - elif [ "$opt" = "!$needle" ]; then + elif [[ $opt = "!$needle" ]]; then echo 'n' # Disabled return fi @@ -250,11 +253,11 @@ in_opt_array() { # 1 - not found ## in_array() { - local needle=$1; shift - [ -z "$1" ] && return 1 # Not Found + local needle="$1"; shift + [[ ! $1 ]] && return 1 # Not Found local item for item in "$@"; do - [ "$item" = "$needle" ] && return 0 # Found + [[ $item = $needle ]] && return 0 # Found done return 1 # Not Found } @@ -268,14 +271,14 @@ get_downloadclient() { local i for i in "${DLAGENTS[@]}"; do local handler="${i%%::*}" - if [ "$proto" = "$handler" ]; then + if [[ $proto = $handler ]]; then agent="${i##*::}" break fi done # if we didn't find an agent, return an error - if [ -z "$agent" ]; then + if [[ ! $agent ]]; then error "$(gettext "There is no agent set up to handle %s URLs. Check %s.")" "$proto" "$MAKEPKG_CONF" plain "$(gettext "Aborting...")" exit 1 # $E_CONFIG_ERROR @@ -283,7 +286,7 @@ get_downloadclient() { # ensure specified program is installed local program="${agent%% *}" - if [ ! -x "$program" ]; then + if [[ ! -x $program ]]; then local baseprog=$(basename $program) error "$(gettext "The download program %s is not installed.")" "$baseprog" plain "$(gettext "Aborting...")" @@ -317,25 +320,25 @@ download_file() { local ret=0 eval "$dlcmd || ret=\$?" - if [ $ret -gt 0 ]; then + if (( ret )); then [ ! -s "$dlfile" ] && rm -f -- "$dlfile" return $ret fi # rename the temporary download file to the final destination - if [ "$dlfile" != "$file" ]; then + if [[ $dlfile != $file ]]; then mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file" fi } check_deps() { - [ $# -gt 0 ] || return + (( $# )) || return pmout=$(pacman $PACMAN_OPTS -T "$@") ret=$? - if [ $ret -eq 127 ]; then #unresolved deps + if (( ret == 127 )); then #unresolved deps echo "$pmout" - elif [ $ret -ne 0 ]; then + elif (( $ret )); then error "$(gettext "Pacman returned a fatal error (%i): %s")" "$ret" "$pmout" exit 1 fi @@ -345,26 +348,26 @@ handle_deps() { local R_DEPS_SATISFIED=0 local R_DEPS_MISSING=1 - [ $# -eq 0 ] && return $R_DEPS_SATISFIED + (( $# )) || return $R_DEPS_SATISFIED local deplist="$*" - if [ "$DEP_BIN" -eq 0 ]; then + if (( ! DEP_BIN )); then return $R_DEPS_MISSING fi - if [ "$DEP_BIN" -eq 1 ]; then + if (( DEP_BIN )); then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" local ret=0 - if [ "$ASROOT" -eq 0 ]; then + if (( ! ASROOT )); then sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? else pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? fi - if [ $ret -ne 0 ]; then + if (( ret )); then error "$(gettext "Pacman failed to install missing dependencies.")" exit 1 # TODO: error code fi @@ -385,7 +388,7 @@ resolve_deps() { local R_DEPS_MISSING=1 local deplist="$(check_deps $*)" - if [ -z "$deplist" ]; then + if [[ ! $deplist ]]; then return $R_DEPS_SATISFIED fi @@ -393,8 +396,8 @@ resolve_deps() { pkgdeps="$pkgdeps $deplist" # check deps again to make sure they were resolved deplist="$(check_deps $*)" - [ -z "$deplist" ] && return $R_DEPS_SATISFIED - elif [ "$DEP_BIN" -eq 1 ]; then + [[ ! $deplist ]] && return $R_DEPS_SATISFIED + elif (( DEP_BIN )); then error "$(gettext "Failed to install all missing dependencies.")" fi @@ -410,8 +413,8 @@ resolve_deps() { # fix flyspray bug #5923 remove_deps() { # $pkgdeps is a GLOBAL variable, set by resolve_deps() - [ "$RMDEPS" -eq 0 ] && return - [ -z "$pkgdeps" ] && return + (( ! RMDEPS )) && return + [[ ! $pkgdeps ]] && return local dep depstrip deplist deplist="" @@ -422,14 +425,14 @@ remove_deps() { msg "Removing installed dependencies..." local ret=0 - if [ "$ASROOT" -eq 0 ]; then + if (( ! ASROOT )); then sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? else pacman $PACMAN_OPTS -Rns $deplist || ret=$? fi # Fixes FS#10039 - exit cleanly as package has built successfully - if [ $ret -ne 0 ]; then + if (( ret )); then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -438,7 +441,7 @@ remove_deps() { download_sources() { msg "$(gettext "Retrieving Sources...")" - if [ ! -w "$SRCDEST" ] ; then + if [[ ! -w $SRCDEST ]] ; then error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" plain "$(gettext "Aborting...")" exit 1 @@ -450,12 +453,12 @@ download_sources() { for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") local url=$(get_url "$netfile") - if [ -f "$startdir/$file" ]; then + if [[ -f $startdir/$file ]]; then msg2 "$(gettext "Found %s in build dir")" "$file" rm -f "$srcdir/$file" ln -s "$startdir/$file" "$srcdir/" continue - elif [ -f "$SRCDEST/$file" ]; then + elif [[ -f $SRCDEST/$file ]]; then msg2 "$(gettext "Using cached copy of %s")" "$file" rm -f "$srcdir/$file" ln -s "$SRCDEST/$file" "$srcdir/" @@ -463,7 +466,7 @@ download_sources() { fi # if we get here, check to make sure it was a URL, else fail - if [ "$file" = "$url" ]; then + if [[ $file = $url ]]; then error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file" exit 1 # $E_MISSING_FILE fi @@ -475,7 +478,7 @@ download_sources() { # fix flyspray bug #3289 local ret=0 download_file "$dlclient" "$url" "$file" || ret=$? - if [ $ret -gt 0 ]; then + if (( ret )); then error "$(gettext "Failure while downloading %s")" "$file" plain "$(gettext "Aborting...")" exit 1 @@ -491,13 +494,13 @@ generate_checksums() { msg "$(gettext "Generating checksums for source files...")" plain "" - if [ ! $(type -p openssl) ]; then + if ! type -p openssl >/dev/null ; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi local integ - for integ in ${INTEGRITY_CHECK[@]}; do + for integ in "${INTEGRITY_CHECK[@]}"; do integ="${integ,,}" case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; @@ -512,17 +515,16 @@ generate_checksums() { local i=0; local indent='' - while [ $i -lt $((${#integ}+6)) ]; do + for ((i=0; i < ${#integ} + 6; i++ )); do indent="$indent " - i=$(($i+1)) done local netfile for netfile in "${source[@]}"; do local file="$(get_filename "$netfile")" - if [ ! -f "$file" ] ; then - if [ ! -f "$SRCDEST/$file" ] ; then + if [[ ! -f $file ]] ; then + if [[ ! -f $SRCDEST/$file ]] ; then error "$(gettext "Unable to find source file %s to generate checksum.")" "$file" plain "$(gettext "Aborting...")" exit 1 @@ -531,12 +533,12 @@ generate_checksums() { fi fi - local sum="$(openssl dgst -${integ} "$file")" - sum=${sum##* } - [ $ct -gt 0 ] && echo -n "$indent" + local sum="$(openssl dgst -"$integ" "$file")" + sum="${sum##* }" + (( ct )) && echo -n "$indent" echo -n "'$sum'" - ct=$(($ct+1)) - [ $ct -lt $numsrc ] && echo + ct=$((ct+1)) + (( ct < numsrc )) && echo done echo ")" @@ -544,9 +546,9 @@ generate_checksums() { } check_checksums() { - [ ${#source[@]} -eq 0 ] && return 0 + (( ! ${#source[@]} )) && return 0 - if [ ! $(type -p openssl) ]; then + if ! type -p openssl >/dev/null; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi @@ -555,7 +557,7 @@ check_checksums() { local integ required for integ in md5 sha1 sha256 sha384 sha512; do local integrity_sums=($(eval echo "\${${integ}sums[@]}")) - if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then + if (( ${#integrity_sums[@]} == ${#source[@]} )); then msg "$(gettext "Validating source files with %s...")" "${integ}sums" correlation=1 local errors=0 @@ -566,8 +568,8 @@ check_checksums() { file="$(get_filename "$file")" echo -n " $file ... " >&2 - if [ ! -f "$file" ] ; then - if [ ! -f "$SRCDEST/$file" ] ; then + if [[ ! -f $file ]] ; then + if [[ ! -f $SRCDEST/$file ]] ; then echo "$(gettext "NOT FOUND")" >&2 errors=1 found=0 @@ -576,11 +578,11 @@ check_checksums() { fi fi - if [ $found -gt 0 ] ; then + if (( found )) ; then local expectedsum="${integrity_sums[$idx],,}" - local realsum="$(openssl dgst -${integ} "$file")" + local realsum="$(openssl dgst -"$integ" "$file")" realsum="${realsum##* }" - if [ "$expectedsum" = "$realsum" ]; then + if [[ $expectedsum = $realsum ]]; then echo "$(gettext "Passed")" >&2 else echo "$(gettext "FAILED")" >&2 @@ -591,18 +593,18 @@ check_checksums() { idx=$((idx + 1)) done - if [ $errors -gt 0 ]; then + if (( errors )); then error "$(gettext "One or more files did not pass the validity check!")" exit 1 # TODO: error code fi - elif [ ${#integrity_sums[@]} -gt 0 ]; then + elif (( ${#integrity_sums[@]} )); then error "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" exit 1 # TODO: error code fi done - if [ $correlation -eq 0 ]; then - if [ $SKIPINTEG -eq 1 ]; then + if (( ! correlation )); then + if (( SKIPINTEG )); then warning "$(gettext "Integrity checks are missing.")" else error "$(gettext "Integrity checks are missing.")" @@ -616,14 +618,14 @@ extract_sources() { local netfile for netfile in "${source[@]}"; do file=$(get_filename "$netfile") - if in_array "$file" ${noextract[@]}; then + if in_array "$file" "${noextract[@]}"; then #skip source files in the noextract=() array # these are marked explicitly to NOT be extracted continue fi - if [ ! -f "$file" ] ; then - if [ ! -f "$SRCDEST/$file" ] ; then + if [[ ! -f $file ]] ; then + if [[ ! -f $SRCDEST/$file ]] ; then error "$(gettext "Unable to find source file %s for extraction.")" "$file" plain "$(gettext "Aborting...")" exit 1 @@ -634,7 +636,7 @@ extract_sources() { # fix flyspray #6246 local file_type=$(file -bizL "$file") - local ext=${file##*.} + local ext="${file##*.}" local cmd='' case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) @@ -662,31 +664,31 @@ extract_sources() { local ret=0 msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" - if [ "$cmd" = "bsdtar" ]; then + if [[ $cmd = "bsdtar" ]]; then $cmd -xf "$file" || ret=? else rm -f "${file%.*}" $cmd -dcf "$file" > "${file%.*}" || ret=? fi - if [ $ret -ne 0 ]; then + if (( ret )); then error "$(gettext "Failed to extract %s")" "$file" plain "$(gettext "Aborting...")" exit 1 fi done - if [ $EUID -eq 0 ]; then + if (( EUID == 0 )); then # change perms of all source files to root user & root group chown -R 0:0 "$srcdir" fi } error_function() { - if [ -p "$logpipe" ]; then + if [[ -p $logpipe ]]; then rm "$logpipe" fi # first exit all subshells, then print the error - if [ $BASH_SUBSHELL -eq 0 ]; then + if (( ! BASH_SUBSHELL )); then plain "$(gettext "Aborting...")" remove_deps fi @@ -694,13 +696,13 @@ error_function() { } run_function() { - if [ -z "$1" ]; then + if [[ ! $1 ]]; then return 1 fi pkgfunc="$1" # clear user-specified makeflags if requested - if [ "$(check_option makeflags)" = "n" ]; then + if [[ $(check_option makeflags) = n ]]; then MAKEFLAGS="" fi @@ -710,15 +712,15 @@ run_function() { # ensure all necessary build variables are exported export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST # save our shell options so pkgfunc() can't override what we need - local shellopts=$(shopt -p) + local shellopts="$(shopt -p)" local ret=0 - if [ "$LOGGING" -eq 1 ]; then + if (( LOGGING )); then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" - if [ -f "$BUILDLOG" ]; then + if [[ -f $BUILDLOG ]]; then local i=1 while true; do - if [ -f "$BUILDLOG.$i" ]; then + if [[ -f $BUILDLOG.$i ]]; then i=$(($i +1)) else break @@ -735,16 +737,16 @@ run_function() { exec 1>"$logpipe" 2>"$logpipe" restoretrap=$(trap -p ERR) trap 'error_function' ERR - $pkgfunc 2>&1 - eval $restoretrap + "$pkgfunc" 2>&1 + eval "$restoretrap" sync exec 1>&3 2>&3 3>&- rm "$logpipe" else - restoretrap=$(trap -p ERR) + restoretrap="$(trap -p ERR)" trap 'error_function' ERR - $pkgfunc 2>&1 - eval $restoretrap + "$pkgfunc" 2>&1 + eval "$restoretrap" fi # reset our shell options eval "$shellopts" @@ -752,24 +754,24 @@ run_function() { run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH="/usr/lib/distcc/bin:$PATH" + if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != n ]]; then + [[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH" export DISTCC_HOSTS - elif [ "$(check_option distcc)" = "n" ]; then + elif [[ $(check_option distcc) = "n" ]]; then # if it is not wanted, clear the makeflags too MAKEFLAGS="" fi # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH="/usr/lib/ccache/bin:$PATH" + if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then + [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi run_function "build" } run_package() { - if [ -z "$1" ]; then + if [[ ! $1 ]]; then pkgfunc="package" else pkgfunc="package_$1" @@ -782,35 +784,35 @@ tidy_install() { cd "$pkgdir" msg "$(gettext "Tidying install...")" - if [ "$(check_option docs)" = "n" -a -n "${DOC_DIRS[*]}" ]; then + if [[ $(check_option docs) = "n" && -n "${DOC_DIRS[@]}" ]; then msg2 "$(gettext "Removing doc files...")" - rm -rf ${DOC_DIRS[@]} + rm -rf "${DOC_DIRS[@]}" fi - if [ "$(check_option purge)" = "y" -a -n "${PURGE_TARGETS[*]}" ]; then + if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[@]} ]]; then msg2 "$(gettext "Purging other files...")" local pt for pt in "${PURGE_TARGETS[@]}"; do - if [ "${pt}" = "${pt//\/}" ]; then + if [[ ${pt} = ${pt//\/} ]]; then find . -type f -name "${pt}" -exec rm -f -- '{}' \; else - rm -f ${pt} + rm -f "$pt" fi done fi - if [ "$(check_option zipman)" = "y" -a -n "${MAN_DIRS[*]}" ]; then + if [[ $(check_option zipman) = y && -n ${MAN_DIRS[@]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" local manpage ext file link hardlinks hl - find ${MAN_DIRS[@]} -type f 2>/dev/null | + find "${MAN_DIRS[@]}" -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) - if [ -f ${manpage} ]; then + if [[ -f $manpage ]]; then ext="${manpage##*.}" file="${manpage##*/}" - if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then + if [[ $ext != gz && $ext != bz2 ]]; then # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | + find "${MAN_DIRS[@]}" -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" ln -sf "${file}.gz" "${link}.gz" @@ -819,25 +821,25 @@ tidy_install() { # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist hardlinks="$(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true - for hl in ${hardlinks}; do - rm -f "${hl}"; + for hl in "$hardlinks"; do + rm -f "$hl"; done # compress the original gzip -9 "$manpage" # recreate hard links removed earlier - for hl in ${hardlinks}; do + for hl in "$hardlinks"; do ln "${manpage}.gz" "${hl}.gz" - chmod 644 ${hl}.gz + chmod 644 "${hl}.gz" done fi fi done fi - if [ "$(check_option strip)" = "y" -a -n "${STRIP_DIRS[*]}" ]; then + if [[ $(check_option strip) = y && -n $STRIP_DIRS ]]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" local binary - find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do + find "${STRIP_DIRS[@]}" -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *compressed-encoding*) # Skip compressed binaries ;; @@ -851,12 +853,12 @@ tidy_install() { done fi - if [ "$(check_option libtool)" = "n" ]; then + if [[ $(check_option libtool) = n ]]; then msg2 "$(gettext "Removing libtool .la files...")" find . ! -type d -name "*.la" -exec rm -f -- '{}' \; fi - if [ "$(check_option emptydirs)" = "n" ]; then + if [[ $(check_option emptydirs) = n ]]; then msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi @@ -864,7 +866,7 @@ tidy_install() { write_pkginfo() { local builddate=$(date -u "+%s") - if [ -n "$PACKAGER" ]; then + if [[ -n $PACKAGER ]]; then local packager="$PACKAGER" else local packager="Unknown Packager" @@ -874,12 +876,12 @@ write_pkginfo() { msg2 "$(gettext "Generating .PKGINFO file...")" echo "# Generated by makepkg $myver" >.PKGINFO - if [ "$INFAKEROOT" -eq 1 ]; then + if (( INFAKEROOT )); then echo "# using $(fakeroot -v)" >>.PKGINFO fi echo "# $(LC_ALL=C date -u)" >>.PKGINFO echo "pkgname = $1" >>.PKGINFO - [ "$SPLITPKG" -eq 1 ] && echo "pkgbase = $pkgbase" >>.PKGINFO + (( SPLITPKG )) && echo pkgbase = $pkgbase >>.PKGINFO echo "pkgver = $pkgver-$pkgrel" >>.PKGINFO echo "pkgdesc = $pkgdesc" >>.PKGINFO echo "url = $url" >>.PKGINFO @@ -887,7 +889,7 @@ write_pkginfo() { echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO echo "arch = $PKGARCH" >>.PKGINFO - if [ "$(check_option force)" = "y" ]; then + if [[ $(check_option force) = y ]]; then echo "force = true" >> .PKGINFO fi @@ -918,8 +920,8 @@ write_pkginfo() { done for it in "${packaging_options[@]}"; do local ret="$(check_option $it)" - if [ "$ret" != "?" ]; then - if [ "$ret" = "y" ]; then + if [[ $ret != ? ]]; then + if [[ $ret = y ]]; then echo "makepkgopt = $it" >>.PKGINFO else echo "makepkgopt = !$it" >>.PKGINFO @@ -929,7 +931,7 @@ write_pkginfo() { # TODO maybe remove this at some point # warn if license array is not present or empty - if [ -z "$license" ]; then + if [[ -z $license ]]; then warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" fi @@ -941,14 +943,14 @@ check_package() { # check existence of backup files local file for file in "${backup[@]}"; do - if [ ! -f "$file" ]; then + if [[ ! -f $file ]]; then warning "$(gettext "Invalid backup entry : %s")" "$file" fi done } create_package() { - if [ ! -d "$pkgdir" ]; then + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing pkg/ directory.")" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PKGDIR @@ -959,16 +961,16 @@ create_package() { cd "$pkgdir" msg "$(gettext "Creating package...")" - if [ -z "$1" ]; then + if [[ -z $1 ]]; then nameofpkg="$pkgname" else nameofpkg="$1" fi - if [ "$arch" = "any" ]; then + if [[ $arch = "any" ]]; then PKGARCH="any" else - PKGARCH=$CARCH + PKGARCH="$CARCH" fi write_pkginfo $nameofpkg @@ -976,14 +978,14 @@ create_package() { local comp_files=".PKGINFO" # check for an install script - if [ -n "$install" ]; then + if [[ -n $install ]]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL comp_files="$comp_files .INSTALL" fi # do we have a changelog? - if [ -n "$changelog" ]; then + if [[ -n $changelog ]]; then msg2 "$(gettext "Adding package changelog...")" cp "$startdir/$changelog" .CHANGELOG comp_files="$comp_files .CHANGELOG" @@ -1009,7 +1011,7 @@ create_package() { bsdtar -cf - $comp_files * > "$pkg_file" || ret=$? shopt -u nullglob - if [ $ret -eq 0 ]; then + if (( ! ret )); then case "$PKGEXT" in *tar.gz) gzip -f -n "$pkg_file" ;; *tar.bz2) bzip2 -f "$pkg_file" ;; @@ -1018,7 +1020,7 @@ create_package() { ret=$? fi - if [ $ret -ne 0 ]; then + if (( ret )); then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi @@ -1042,8 +1044,8 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" - if [ -n "$install" ]; then - if [ -f $install ]; then + if [[ -n $install ]]; then + if [[ -f $install ]]; then msg2 "$(gettext "Adding install script...")" ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" else @@ -1051,8 +1053,8 @@ create_srcpackage() { fi fi - if [ -n "$changelog" ]; then - if [ -f "$changelog" ]; then + if [[ -n $changelog ]]; then + if [[ -f $changelog ]]; then msg2 "$(gettext "Adding package changelog...")" ln -s "${startdir}/$changelog" "${srclinks}/${pkgbase}/" else @@ -1086,7 +1088,7 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" "${pkgbase}"; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi @@ -1095,17 +1097,17 @@ create_srcpackage() { } install_package() { - [ "$INSTALL" -eq 0 ] && return + (( ! INSTALL )) && return - if [ "$SPLITPKG" -eq 0 ]; then + if (( ! SPLITPKG )); then msg "$(gettext "Installing package ${pkgname} with pacman -U...")" else msg "$(gettext "Installing ${pkgbase} package group with pacman -U...")" fi local pkglist - for pkg in ${pkgname[@]}; do - if [ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]; then + for pkg in "${pkgname[@]}"; do + if [[ -f $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} ]]; then pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" else pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" @@ -1113,13 +1115,13 @@ install_package() { done local ret=0 - if [ "$ASROOT" -eq 0 ]; then + if (( ! ASROOT )); then sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? else - pacman $PACMAN_OPTS -U ${pkglist} || ret=$? + pacman "$PACMAN_OPTS" -U "$pkglist" || ret=$? fi - if [ $ret -ne 0 ]; then + if (( ret )); then warning "$(gettext "Failed to install built package(s).")" return 0 fi @@ -1127,45 +1129,44 @@ install_package() { check_sanity() { # check for no-no's in the build script - if [ -z "$pkgname" ]; then + if [[ -z $pkgname ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" return 1 fi - if [ -z "$pkgver" ]; then + if [[ -z $pkgver ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" return 1 fi - if [ -z "$pkgrel" ]; then + if [[ -z $pkgrel ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" return 1 fi - if [ "${pkgname:0:1}" == "-" ]; then + if [[ ${pkgname:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" return 1 fi - if [ "$pkgver" != "${pkgver//-/}" ]; then + if [[ $pkgver != ${pkgver//-/} ]]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" return 1 fi - if [ "$pkgrel" != "${pkgrel//-/}" ]; then + if [[ $pkgrel != ${pkgrel//-/} ]]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" return 1 fi - if [ "$arch" != 'any' ]; then - if ! in_array $CARCH ${arch[@]}; then - if [ "$IGNOREARCH" -eq 0 ]; then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as arch=('%s').")" "$CARCH" - return 1 - fi + if [[ $arch != 'any' ]]; then + if ! in_array "$CARCH" "${arch[@]}"; then + if (( ! IGNOREARCH )); then + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as arch=('%s').")" "$CARCH" + return 1 fi fi local provide - for provide in ${provides[@]}; do - if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + for provide in "${provides[@]}"; do + if [[ $provide != ${provide//</} || $provide != ${provide//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" return 1 fi @@ -1173,7 +1174,7 @@ check_sanity() { local file for file in "${backup[@]}"; do - if [ "${file:0:1}" = "/" ]; then + if [[ ${file:0:1} = "/" ]]; then error "$(gettext "Invalid backup entry : %s")" "$file" return 1 fi @@ -1181,44 +1182,44 @@ check_sanity() { local optdepend for optdepend in "${optdepends[@]}"; do - pkg=${optdepend%%:*} + pkg="${optdepend%%:*}" if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]*$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$optdepend" fi done - if [ "$install" -a ! -f "$install" ]; then + if [[ -n $install && ! -f $install ]]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" return 1 fi - if [ -n "$changelog" -a ! -f "$changelog" ]; then + if [[ -n $changelog && ! -f $changelog ]]; then error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" return 1 fi local valid_options=1 local opt known kopt - for opt in ${options[@]}; do + for opt in "${options[@]}"; do known=0 # check if option matches a known option or its inverse - for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then + for kopt in "${packaging_options[@]}" "${other_options[@]}"; do + if [[ ${opt} = ${kopt} || ${opt} = !${kopt} ]]; then known=1 fi done - if [ $known -eq 0 ]; then + if (( ! known )); then error "$(gettext "options array contains unknown option '%s'")" "$opt" valid_options=0 fi done - if [ $valid_options -eq 0 ]; then + if (( ! valid_options )); then return 1 fi - if [ "${#pkgname[@]}" -gt "1" ]; then - for pkg in ${pkgname[@]}; do - if [ "$(type -t package_${pkg})" != "function" ]; then + if (( ${#pkgname[@]} > 1 )); then + for pkg in "${pkgname[@]}"; do + if [[ $(type -t package_${pkg}) != function ]]; then error "$(gettext "missing package function for split package '%s'")" "$pkg" return 1 fi @@ -1233,42 +1234,42 @@ devel_check() { # Do not update pkgver if --holdver is set, when building a source package, # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "$BUILDFILE" \ - -o ! -w "$BUILDFILE" ]; then + if (( HOLDVER || SOURCEONLY )) || \ + [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi - if [ -z "$FORCE_VER" ]; then + if [[ -z $FORCE_VER ]]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent # calls to makepkg via fakeroot will explicitly pass the version # number to avoid having to determine the version number twice. # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver - if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then - [ $(type -p darcs) ] || return 0 + if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then + type -p darcs >/dev/null || 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 + elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then + type -p cvs >/dev/null || 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 + elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then + type -p git >/dev/null || 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 + elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then + type -p svn >/dev/null || 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 + elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then + type -p bzr >/dev/null || return 0 msg "$(gettext "Determining latest bzr revision...")" - newpkgver=$(bzr revno ${_bzrtrunk}) - elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then - [ $(type -p hg) ] || return 0 + newpkgver=$(bzr revno "${_bzrtrunk}") + elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then + type -p hg >/dev/null || return 0 msg "$(gettext "Determining latest hg revision...")" - if [ -d ./src/$_hgrepo ] ; then + if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo hg pull hg update @@ -1281,13 +1282,13 @@ devel_check() { cd ../../ fi - if [ -n "$newpkgver" ]; then + if [[ -n $newpkgver ]]; then msg2 "$(gettext "Version found: %s")" "$newpkgver" fi else # Version number retrieved from fakeroot->makepkg argument - newpkgver=$FORCE_VER + newpkgver="$FORCE_VER" fi } @@ -1301,9 +1302,9 @@ devel_update() { # ... # _foo=pkgver # - if [ -n "$newpkgver" ]; then - if [ "$newpkgver" != "$pkgver" ]; then - if [ -f "$BUILDFILE" -a -w "$BUILDFILE" ]; then + if [[ -n $newpkgver ]]; then + if [[ $newpkgver != $pkgver ]]; then + if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" source "$BUILDFILE" @@ -1313,16 +1314,16 @@ devel_update() { } backup_package_variables() { - for var in ${splitpkg_overrides[@]}; do + for var in "${splitpkg_overrides[@]}"; do indirect="${var}_backup" - eval "${indirect}=(\${$var[@]})" + eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { - for var in ${splitpkg_overrides[@]}; do + for var in "${splitpkg_overrides[@]}"; do indirect="${var}_backup" - if [ -n "${!indirect}" ]; then + if [[ -n ${!indirect} ]]; then eval "${var}=(\${$indirect[@]})" else unset ${var} @@ -1332,31 +1333,31 @@ restore_package_variables() { # pkgdesc gets restored as an array - convert back to a string local pkgdesc_backup="${pkgdesc[@]}" unset pkgdesc - pkgdesc=${pkgdesc_backup} + pkgdesc="${pkgdesc_backup}" } # getopt like parser parse_options() { - local short_options=$1; shift; - local long_options=$1; shift; + local short_options="$1"; shift; + local long_options="$1"; shift; local ret=0; - local unused_options="" + local unused_options=() - while [ -n "$1" ]; do - if [ ${1:0:2} = '--' ]; then - if [ -n "${1:2}" ]; then + while [[ -n $1 ]]; do + if [[ ${1:0:2} = '--' ]]; then + if [[ -n ${1:2} ]]; then local match="" - for i in ${long_options//,/ }; do - if [ ${1:2} = ${i//:} ]; then + for i in "${long_options//,/ }"; do + if [[ ${1:2} = ${i//:} ]]; then match=$i break fi done - if [ -n "$match" ]; then - if [ ${1:2} = $match ]; then + if [[ -n $match ]]; then + if [[ ${1:2} = $match ]]; then printf ' %s' "$1" else - if [ -n "$2" ]; then + if [[ -n $2 ]]; then printf ' %s' "$1" shift printf " '%s'" "$1" @@ -1373,15 +1374,15 @@ parse_options() { shift break fi - elif [ ${1:0:1} = '-' ]; then + elif [[ ${1:0:1} = '-' ]]; then for ((i=1; i<${#1}; i++)); do if [[ "$short_options" =~ "${1:i:1}" ]]; then if [[ "$short_options" =~ "${1:i:1}:" ]]; then - if [ -n "${1:$i+1}" ]; then + if [[ -n ${1:$i+1} ]]; then printf ' -%s' "${1:i:1}" printf " '%s'" "${1:$i+1}" else - if [ -n "$2" ]; then + if [[ -n $2 ]]; then printf ' -%s' "${1:i:1}" shift printf " '%s'" "${1}" @@ -1400,20 +1401,18 @@ parse_options() { fi done else - unused_options="${unused_options} '$1'" + unused_options+=("$1") fi shift done printf " --" - if [ -n "$unused_options" ]; then - for i in ${unused_options[@]}; do - printf ' %s' "$i" - done - fi - if [ -n "$1" ]; then - while [ -n "$1" ]; do - printf " '%s'" "${1}" + for i in "${unused_options[@]}"; do + printf ' %s' "$i" + done + if [[ -n $1 ]]; then + while [[ -n $1 ]]; do + printf " '%s'" "$1" shift done fi @@ -1472,13 +1471,13 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # PROGRAM START # determine whether we have gettext; make it a no-op if we do not -if [ ! $(type -t gettext) ]; then +if ! type -t gettext >/dev/null; then gettext() { echo "$@" } fi -ARGLIST=$@ +ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcCdefFghiLmop:rRsV" @@ -1538,14 +1537,14 @@ while true; do done #preserve environment variables -_PKGDEST=${PKGDEST} -_SRCDEST=${SRCDEST} +_PKGDEST="$PKGDEST" +_SRCDEST="$SRCDEST" # default config is makepkg.conf -MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} +MAKEPKG_CONF="${MAKEPKG_CONF:-$confdir/makepkg.conf}" # Source the config file; fail if it is not found -if [ -r "$MAKEPKG_CONF" ]; then +if [[ -r $MAKEPKG_CONF ]]; then source "$MAKEPKG_CONF" else error "$(gettext "%s not found.")" "$MAKEPKG_CONF" @@ -1554,13 +1553,13 @@ else fi # Source user-specific makepkg.conf overrides -if [ -r ~/.makepkg.conf ]; then +if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW -if [ -t 2 -a ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then +if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" @@ -1577,23 +1576,23 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined -if [ "$HOLDVER" -eq 1 -a -n "$FORCE_VER" ]; then +if (( HOLDVER )) && [[ $FORCE_VER ]]; then # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi -if [ "$CLEANCACHE" -eq 1 ]; then +if (( CLEANCACHE )); then #fix flyspray feature request #5223 - if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then + if [[ -n $SRCDEST && $SRCDEST != $startdir ]]; then msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST" echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer answer="${answer^^}" - if [ "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then + if [[ $answer = $(gettext "YES") || $answer = $(gettext "Y") ]]; then rm "$SRCDEST"/* - if [ $? -ne 0 ]; then + if (( $? )); then error "$(gettext "Problem removing files; you may not have correct permissions in %s")" "$SRCDEST" exit 1 else @@ -1614,41 +1613,40 @@ if [ "$CLEANCACHE" -eq 1 ]; then fi fi -if [ "$INFAKEROOT" -eq 0 ]; then - if [ $EUID -eq 0 -a "$ASROOT" -eq 0 ]; then +if (( ! INFAKEROOT )); then + if (( EUID == 0 && ! ASROOT )); then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" plain "$(gettext "wish to run as root, please use the --asroot option.")" exit 1 # $E_USER_ABORT - elif [ $EUID -gt 0 -a "$ASROOT" -eq 1 ]; then + elif (( EUID > 0 && ASROOT )); then # Warn those who try to use the --asroot option when they are not root error "$(gettext "The --asroot option is meant for the root user only.")" plain "$(gettext "Please rerun makepkg without the --asroot flag.")" exit 1 # $E_USER_ABORT - elif [ "$(check_buildenv fakeroot)" = "y" -a $EUID -gt 0 ]; then - if [ ! $(type -p fakeroot) ]; then + elif [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then + if ! type -p fakeroot >/dev/null; then error "$(gettext "Fakeroot must be installed if using the 'fakeroot' option")" plain "$(gettext "in the BUILDENV array in %s.")" "$MAKEPKG_CONF" exit 1 fi - elif [ $EUID -gt 0 ]; then + elif (( EUID > 0 )); then warning "$(gettext "Running makepkg as an unprivileged user will result in non-root")" plain "$(gettext "ownership of the packaged files. Try using the fakeroot environment by")" plain "$(gettext "placing 'fakeroot' in the BUILDENV array in %s.")" "$MAKEPKG_CONF" sleep 1 fi else - if [ -z "$FAKEROOTKEY" ]; then + if [[ -z $FAKEROOTKEY ]]; then error "$(gettext "Do not use the '-F' option. This option is only for use by makepkg.")" exit 1 # TODO: error code fi fi # check for sudo if we will need it during makepkg execution -if [ "$ASROOT" -eq 0 \ - -a $ "$DEP_BIN" -eq 1 -o "$RMDEPS" -eq 1 -o "$INSTALL" -eq 1 $ ]; then - if [ ! "$(type -p sudo)" ]; then +if (( ! ASROOT )) && (( DEP_BIN || RMDEPS || INSTALL )); then + if ! type -p sudo >/dev/null; then error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")" @@ -1660,9 +1658,9 @@ unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} -if [ ! -f "$BUILDFILE" ]; then - if [ -t 0 ]; then +BUILDFILE="${BUILDFILE:-$BUILDSCRIPT}" +if [[ ! -f $BUILDFILE ]]; then + if [[ -t 0 ]]; then error "$(gettext "%s does not exist.")" "$BUILDFILE" exit 1 else @@ -1672,18 +1670,18 @@ if [ ! -f "$BUILDFILE" ]; then fi else crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) - if [ -n "$crlftest" ]; then + if [[ -n $crlftest ]]; then error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDFILE" exit 1 fi - if [ "${BUILDFILE:0:1}" != "/" ]; then + if [[ ${BUILDFILE:0:1} != "/" ]]; then BUILDFILE="$startdir/$BUILDFILE" fi source "$BUILDFILE" fi -if [ "$GENINTEG" -eq 1 ]; then +if (( GENINTEG )); then mkdir -p "$srcdir" cd "$srcdir" download_sources @@ -1691,7 +1689,7 @@ if [ "$GENINTEG" -eq 1 ]; then exit 0 # $E_OK fi -if [ "$(type -t package)" = "function" ]; then +if [[ $(type -t package) = function ]]; then PKGFUNC=1 fi @@ -1705,17 +1703,17 @@ check_sanity || exit 1 devel_check devel_update -if [ "${#pkgname[@]}" -gt "1" ]; then +if (( ${#pkgname[@]} > 1 )); then SPLITPKG=1 fi -pkgbase=${pkgbase:-${pkgname[0]}} +pkgbase="${pkgbase:-${pkgname[0]}}" -if [ "$SPLITPKG" -eq 0 ]; then - if [ $ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" $ \ - -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then - if [ "$INSTALL" -eq 1 ]; then +if (( ! $SPLITPKG )); then + if [[ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + || -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" ]] \ + && (( ! FORCE && ! SOURCEONLY && ! NOBUILD )); then + if (( INSTALL )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package exit $? @@ -1727,17 +1725,17 @@ if [ "$SPLITPKG" -eq 0 ]; then else allpkgbuilt=1 somepkgbuilt=0 - for pkg in ${pkgname[@]}; do - if [ $ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" $ ]; then + for pkg in "${pkgname[@]}"; do + if [[ -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ + || -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" ]]; then somepkgbuilt=1 else allpkgbuilt=0 fi done - if [ "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then - if [ "$allpkgbuilt" -eq 1 ]; then - if [ "$INSTALL" -eq 1 ]; then + if (( FORCE == 0 && ! SOURCEONLY && ! NOBUILD )); then + if (( allpkgbuilt )); then + if (( INSTALL )); then warning "$(gettext "The package group has already been built, installing existing packages...")" install_package exit $? @@ -1746,7 +1744,7 @@ else exit 1 fi fi - if [ "$somepkgbuilt" -eq 1 ]; then + if (( somepkgbuilt )); then error "$(gettext "Part of the package group has already been built. (use -f to overwrite)")" exit 1 fi @@ -1755,10 +1753,10 @@ else fi # Run the bare minimum in fakeroot -if [ "$INFAKEROOT" -eq 1 ]; then - if [ "$SPLITPKG" -eq 0 ]; then - if [ "$PKGFUNC" -eq 0 ]; then - if [ "$REPKG" -eq 0 ]; then +if (( INFAKEROOT )); then + if (( ! SPLITPKG )); then + if (( ! PKGFUNC )); then + if (( ! REPKG )); then run_build tidy_install fi @@ -1768,13 +1766,13 @@ if [ "$INFAKEROOT" -eq 1 ]; then fi create_package else - for pkg in ${pkgname[@]}; do + for pkg in "${pkgname[@]}"; do pkgdir="$pkgdir/$pkg" mkdir -p "$pkgdir" backup_package_variables - run_package $pkg + run_package "$pkg" tidy_install - create_package $pkg + create_package "$pkg" restore_package_variables pkgdir="${pkgdir%/*}" done @@ -1787,9 +1785,9 @@ fi msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" -ne 0 ]; then - if [ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" \ - -a "$FORCE" -eq 0 ]; then +if (( SOURCEONLY )); then + if [[ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] \ + && (( ! FORCE )); then error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 fi @@ -1799,22 +1797,22 @@ if [ "$SOURCEONLY" -ne 0 ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" -eq 1 -o "$NOBUILD" -eq 1 -o "$REPKG" -eq 1 ]; then +if (( NODEPS || NOBUILD || REPKG )); then # no warning message needed for nobuild, repkg - if [ "$NODEPS" -eq 1 ]; then + if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi -elif [ $(type -p pacman) ]; then +elif type -p pacman >/dev/null ; then unset pkgdeps # Set by resolve_deps() and used by remove_deps() deperr=0 msg "$(gettext "Checking Runtime Dependencies...")" - resolve_deps ${depends[@]} || deperr=1 + resolve_deps "${depends[@]}" || deperr=1 msg "$(gettext "Checking Buildtime Dependencies...")" - resolve_deps ${makedepends[@]} || deperr=1 + resolve_deps "${makedepends[@]}" || deperr=1 - if [ $deperr -eq 1 ]; then + if (( deperr )); then error "$(gettext "Could not resolve all dependencies.")" exit 1 fi @@ -1829,19 +1827,19 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$NOEXTRACT" -eq 1 ]; then +if (( NOEXTRACT )); then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" warning "$(gettext "Skipping source extraction -- using existing src/ tree")" - if [ "$NOEXTRACT" -eq 1 -a -z "$(ls "$srcdir" 2>/dev/null)" ]; then + if (( NOEXTRACT )) && [[ -z $(ls $srcdir 2>/dev/null) ]]; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 fi -elif [ "$REPKG" -eq 1 ]; then - if [ "$PKGFUNC" -eq 0 -a "$SPLITPKG" -eq 0 \ - -a $ ! -d "$pkgdir" -o -z "$(ls "$pkgdir" 2>/dev/null)" $ ]; then +elif (( REPKG )); then + if (( ! PKGFUNC && ! SPLITPKG )) \ + && [[ ! -d $pkgdir || -z $(ls "$pkgdir" 2>/dev/null) ]]; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" plain "$(gettext "Aborting...")" exit 1 @@ -1852,13 +1850,13 @@ else extract_sources fi -if [ "$NOBUILD" -eq 1 ]; then +if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else # check for existing pkg directory; don't remove if we are repackaging - if [ -d "$pkgdir" \ - -a $ "$REPKG" -eq 0 -o "$PKGFUNC" -eq 1 -o "$SPLITPKG" -eq 1 $ ]; then + if [[ -d $pkgdir ]] \ + && (( ! REPKG || PKGFUNC || SPLITPKG )); then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi @@ -1866,33 +1864,33 @@ else cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it - if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then - if [ "$REPKG" -eq 0 ]; then + if [[ $(check_buildenv fakeroot) != "y" ]] || (( EUID == 0 )); then + if (( ! REPKG )); then devel_update run_build fi - if [ "$SPLITPKG" -eq 0 ]; then - if [ "$PKGFUNC" -eq 1 ]; then + if (( ! SPLITPKG )); then + if (( PKGFUNC )); then run_package tidy_install - elif [ "$REPKG" -eq 0 ]; then + elif (( ! REPKG )); then tidy_install fi create_package else - for pkg in ${pkgname[@]}; do + for pkg in "${pkgname[@]}"; do pkgdir="$pkgdir/$pkg" mkdir -p "$pkgdir" backup_package_variables - run_package $pkg + run_package "$pkg" tidy_install - create_package $pkg + create_package "$pkg" restore_package_variables pkgdir="${pkgdir%/*}" done fi else - if [ "$REPKG" -eq 0 -a $ "$PKGFUNC" -eq 1 -o "$SPLITPKG" -eq 1 $ ]; then + if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then devel_update run_build cd "$startdir" @@ -1900,10 +1898,10 @@ else msg "$(gettext "Entering fakeroot environment...")" - if [ -n "$newpkgver" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + if [[ -n $newpkgver ]]; then + fakeroot -- "$0" --forcever "$newpkgver" -F "${ARGLIST[@]}" || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- "$0" -F "${ARGLIST[@]}" || exit $? fi fi fi -- 1.6.5.1

4 12

[pacman-dev] [PATCH 3/4] makepkg: Clarified error message when a sourceball exist already
by Eric Bélanger 10 Nov '09

10 Nov '09

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8fd5b27..8fc7c82 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1808,7 +1808,7 @@ msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" if [ "$SOURCEONLY" -ne 0 ]; then if [ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" \ -a "$FORCE" -eq 0 ]; then - error "$(gettext "A package has already been built. (use -f to overwrite)")" + error "$(gettext "A source package has already been built. (use -f to overwrite)")" exit 1 fi create_srcpackage -- 1.6.5.2

3 3

[pacman-dev] [PATCH] Fix copying of arrays in makepkg.
by Loui Chang 09 Nov '09

09 Nov '09

Arrays were being converted to strings, then back to arrays rather than being copied directly as arrays. This closes FS#16871 Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..8ca89e1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1315,7 +1315,7 @@ devel_update() { backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" - eval "${indirect}=(\${$var[@]})" + eval "${indirect}=(\"\${$var[@]}\")" done } @@ -1323,7 +1323,7 @@ restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [ -n "${!indirect}" ]; then - eval "${var}=(\${$indirect[@]})" + eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} fi -- 1.6.5.2

2 3

[pacman-dev] [PATCH 4/4] makepkg: Fixed sourceball creation of split packages
by Eric Bélanger 09 Nov '09

09 Nov '09

In some case, the install script of split packages was not included in the sourceballs. This was due because split packages can specify their install script in the package functions. They also can use several install scripts. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8fc7c82..b77cc68 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1060,14 +1060,25 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" - if [ -n "$install" ]; then - if [ -f $install ]; then - msg2 "$(gettext "Adding install script...")" - ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" - else - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" + local install_files + install_files=$(grep "install=" "$BUILDSCRIPT") + for pkg in ${pkgname[@]}; do + install_files+=' ' + install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/") + install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq) + done + + for f in $install_files; do + install="${f#"install="}" + if [[ -n "$install" ]]; then + if [[ -f $install ]]; then + msg2 "$(gettext "Adding install script...")" + ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" + else + error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" + fi fi - fi + done if [ -n "$changelog" ]; then if [ -f "$changelog" ]; then -- 1.6.5.2

5 9

[pacman-dev] proof of concept code with bsd db4
by solsTiCe d'Hiver 09 Nov '09

09 Nov '09

hi. i wanted to make a new bsd db4 back-end for alpm. but i never reached my goal. and will not all i have is a proof of concept code that use bsd db4 api to store pmpkg_t and wanted to share it with anyone (interested ?) i have coded 3 utilities: - one that converts pacman's db into a bsd db4 file for each repo - one that reads that new db format to perform query as pacman does - one that converts directly a tarball db (taken from a sync mirror) into a bsd db4 file if this proves useful for someone, great. More info at http://pagesperso-orange.fr/solstice.dhiver/alpmdb4.html and in the README of http://pagesperso-orange.fr/solstice.dhiver/data/readdb.tar.gz

3 3

[pacman-dev] logging pacman command line
by Xavier 09 Nov '09

09 Nov '09

I have a lot of spam in my pacman.log now. I guess the main problem is that it logs everything, including all operations which are canceled and not executed. See for example the last part of my log , where I was just checking the effect of remove flags. [2009-11-07 16:50] Running 'pacman -R epiphany' [2009-11-07 16:50] Running 'pacman -Rs epiphany' [2009-11-07 16:50] Running 'pacman -Rcs epiphany' [2009-11-07 16:50] Running 'pacman -Rcss epiphany' [2009-11-07 16:50] Running 'pacman -Rcs epiphany' [2009-11-07 16:51] Running 'pacman -Rs gstreamer0.10-plugins' [2009-11-07 16:51] Running 'pacman -Rsu gstreamer0.10-plugins' And imagine the output when I was testing some commands like the ones mentioned there : http://wiki.archlinux.org/index.php/Redownloading_all_installed_packages pacman -Sdw --noconfirm `pacman -Q | awk '{ print $1 }'` I have the whole list of installed packages several times in my log. ahah

2 1

[pacman-dev] [PATCH] makepkg: rework --skip-integ
by Allan McRae 07 Nov '09

07 Nov '09

The current --skip-integ isa bit weird. It does not skip integrity checks, but instead does them and prints a warning. Change this behaviour to actually skipping the checks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.8.txt | 3 +-- scripts/makepkg.sh.in | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 198aa95..ec02875 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -87,8 +87,7 @@ Options PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`". *--skipinteg*:: - Do not fail when the PKGBUILD does not contain any integrity checks, just - print a warning instead. + Do not perform any integrity checks, just print a warning instead. *-h, \--help*:: Output syntax and command line options. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d85f858..f1788b9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -615,12 +615,8 @@ check_checksums() { done if [ $correlation -eq 0 ]; then - if [ $SKIPINTEG -eq 1 ]; then - warning "$(gettext "Integrity checks are missing.")" - else - error "$(gettext "Integrity checks are missing.")" - exit 1 # TODO: error code - fi + error "$(gettext "Integrity checks are missing.")" + exit 1 # TODO: error code fi } @@ -1848,7 +1844,11 @@ elif [ "$REPKG" -eq 1 ]; then fi else download_sources - check_checksums + if [ $SKIPINTEG -eq 0 ]; then + check_checksums + else + warning "$(gettext "Skipping integrity checks.")" + fi extract_sources fi -- 1.6.4.4

7 26

[pacman-dev] [PATCH] makepkg: quote arrays in order to preserve spaces in array items
by Cedric Staniewski 06 Nov '09

06 Nov '09

Fixes FS#16871. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..8ca89e1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1315,7 +1315,7 @@ devel_update() { backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" - eval "${indirect}=(\${$var[@]})" + eval "${indirect}=(\"\${$var[@]}\")" done } @@ -1323,7 +1323,7 @@ restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [ -n "${!indirect}" ]; then - eval "${var}=(\${$indirect[@]})" + eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} fi -- 1.6.5.2

3 9

[pacman-dev] [PATCH] makepkg: Place packages symlinks in build dir when DESTDIR is used
by Eric Bélanger 06 Nov '09

06 Nov '09

When DESTDIR is used, symlinks to the packages will be put in the build directory. This combines the convenience of a global package cache with the ease of having a package (i.e. a symlink) in the build directory for testing and installation purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..dc9124b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,6 +1000,8 @@ create_package() { "$PKGEXT" ; EXT=$PKGEXT ;; esac local pkg_file="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${EXT}" + local pkglinks_name="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" + local pkglinks_target="$PKGDEST/${nameofpkg}-${pkgver}-${pkgrel}-${PKGARCH}${PKGEXT}" local ret=0 @@ -1018,6 +1020,10 @@ create_package() { ret=$? fi + if [ $ret -eq 0 ]; then + [ ! -f "${pkglinks_name}" ] && ln -s "${pkglinks_target}" "${pkglinks_name}" && ret=$? + fi + if [ $ret -ne 0 ]; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code -- 1.6.5.2

7 30

[pacman-dev] [PATCH 2/2] makepkg: Fixed logging for split packages
by Eric Bélanger 04 Nov '09

04 Nov '09

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e2b28c1..180e128 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -142,7 +142,7 @@ clean_up() { rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"* elif [ "$SPLITPKG" -eq 1 ]; then for pkg in ${pkgname[@]}; do - rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"* + rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package_${pkg}.log"* done fi fi @@ -707,6 +707,8 @@ run_function() { msg "$(gettext "Starting %s()...")" "$pkgfunc" cd "$srcdir" + local _pkgbase=$pkgbase + # ensure all necessary build variables are exported export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST # save our shell options so pkgfunc() can't override what we need @@ -714,7 +716,7 @@ run_function() { local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" + BUILDLOG="${startdir}/${_pkgbase}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do -- 1.6.5.2

2 3

[pacman-dev] gnupg package signing
by Xavier 02 Nov '09

02 Nov '09

Just to let you know that I resurrected the gpg branch there : http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=gpg I took Dan's newgpg branch (with a few changes) : http://code.toofishes.net/cgit/dan/pacman.git/commit/?h=newgpg then merged the pending patches we had : http://archlinux.org/pipermail/pacman-dev/2008-December/007808.html http://archlinux.org/pipermail/pacman-dev/2008-December/007836.html http://archlinux.org/pipermail/pacman-dev/2008-December/007837.html and rebased it all on master. Actually I don't see what else needs to be done on the implementation side, it looks almost complete to me. Now the big remaining problem is everything related to key administration still needs to be figured out, and this is critical in term of security. But it might not need additional tool support.

3 7

[pacman-dev] [PATCH] makepkg: extend test for hyphen prefixes to pkgbase and all pkgnames
by Cedric Staniewski 01 Nov '09

01 Nov '09

Since commit fb97d32, which brought in this test, support for split PKGBUILDs was added, and therefore, all values of pkgname and also pkgbase have to be checked now. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- Last patch before the big freeze... scripts/makepkg.sh.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9cd7f2e..c451a36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1139,8 +1139,8 @@ check_sanity() { error "$(gettext "%s is not allowed to be empty.")" "pkgrel" return 1 fi - if [ "${pkgname:0:1}" == "-" ]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + if [[ ${pkgbase:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" return 1 fi if [ "$pkgver" != "${pkgver//-/}" ]; then @@ -1152,6 +1152,14 @@ check_sanity() { return 1 fi + local name + for name in "${pkgname[@]}"; do + if [[ ${name:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + return 1 + fi + done + if [ "$arch" != 'any' ]; then if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" -eq 0 ]; then -- 1.6.5.1

2 6

[pacman-dev] [PATCH 3/3] Remove rmrf function from frontend
by Laszlo Papp 28 Oct '09

28 Oct '09

* The alpm_rmrf function is available from the frontend, which does the same as this function did. * It was worth to modify _alpm_rmrf to alpm_rmrf for pacman frontend to be able to use it in the future or for other frontend, so the function declaration was moved into the api header file, named alpm.h, and the definition of this function got a SYMEXPORT attribute. * The rmrf funtion calling was changed in ./src/pacman/sync.c for alpm_rmrf * The _alpm_rmrf functions were changed in api for alpm_rmrf Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/alpm.h | 3 +++ lib/libalpm/be_files.c | 4 ++-- lib/libalpm/dload.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 4 ++-- lib/libalpm/util.h | 1 - src/pacman/sync.c | 2 +- src/pacman/util.c | 43 ------------------------------------------- src/pacman/util.h | 1 - 9 files changed, 10 insertions(+), 52 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c433b73..666a84f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -467,6 +467,9 @@ const char *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict); /* checksums */ char *alpm_compute_md5sum(const char *name); +/* does the same thing as 'rm -rf' */ +int alpm_rmrf(const char *path); + /* * Errors */ diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..70625ed 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -230,7 +230,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) } else { const char *syncdbpath = _alpm_db_path(db); /* remove the old dir */ - if(_alpm_rmrf(syncdbpath) != 0) { + if(alpm_rmrf(syncdbpath) != 0) { _alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename); RET_ERR(PM_ERR_DB_REMOVE, -1); } @@ -919,7 +919,7 @@ int _alpm_db_remove(pmdb_t *db, pmpkg_t *info) pkgpath = get_pkgpath(db, info); - ret = _alpm_rmrf(pkgpath); + ret = alpm_rmrf(pkgpath); free(pkgpath); if(ret != 0) { ret = -1; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a4c9f1f..218a87b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -182,7 +182,7 @@ static int download_internal(const char *url, const char *localpath, } if(localf == NULL) { - _alpm_rmrf(tempfile); + alpm_rmrf(tempfile); fileurl->offset = (off_t)0; dl_thisfile = 0; localf = fopen(tempfile, "wb"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index aea71db..3eac9b0 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -401,7 +401,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, retval = _alpm_run_chroot(root, cmdline); cleanup: - if(clean_tmpdir && _alpm_rmrf(tmpdir)) { + if(clean_tmpdir && alpm_rmrf(tmpdir)) { _alpm_log(PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index ad3dc2c..6b0cf34 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -370,7 +370,7 @@ cleanup: } /* does the same thing as 'rm -rf' */ -int _alpm_rmrf(const char *path) +int SYMEXPORT alpm_rmrf(const char *path) { int errflag = 0; struct dirent *dp; @@ -397,7 +397,7 @@ int _alpm_rmrf(const char *path) if(dp->d_ino) { sprintf(name, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { - errflag += _alpm_rmrf(name); + errflag += alpm_rmrf(name); } } } diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 37893c8..2e783c3 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -66,7 +66,6 @@ int _alpm_lckmk(); int _alpm_lckrm(); int _alpm_unpack_single(const char *archive, const char *prefix, const char *fn); int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int breakfirst); -int _alpm_rmrf(const char *path); int _alpm_logaction(int usesyslog, FILE *f, const char *fmt, va_list args); int _alpm_run_chroot(const char *root, const char *cmd); int _alpm_ldconfig(const char *root); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..0164ca9 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -90,7 +90,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) { continue; } - if(rmrf(path)) { + if(alpm_rmrf(path)) { pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove repository directory\n")); closedir(dir); diff --git a/src/pacman/util.c b/src/pacman/util.c index e3dbfbb..9adc0e5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -99,49 +99,6 @@ int getcols(void) return 0; } -/* does the same thing as 'rm -rf' */ -int rmrf(const char *path) -{ - int errflag = 0; - struct dirent *dp; - DIR *dirp; - - if(!unlink(path)) { - return(0); - } else { - if(errno == ENOENT) { - return(0); - } else if(errno == EPERM) { - /* fallthrough */ - } else if(errno == EISDIR) { - /* fallthrough */ - } else if(errno == ENOTDIR) { - return(1); - } else { - /* not a directory */ - return(1); - } - - if((dirp = opendir(path)) == NULL) { - return(PM_ERR_NOT_A_DIR); - } - for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { - if(dp->d_ino) { - char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); - if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { - errflag += rmrf(name); - } - } - } - closedir(dirp); - if(rmdir(path)) { - errflag++; - } - return(errflag); - } -} - /** Parse the basename of a program from a path. * Grabbed from the uClibc source. * @param path path to parse basename from diff --git a/src/pacman/util.h b/src/pacman/util.h index 7a8c39d..30e5996 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -41,7 +41,6 @@ int trans_init(pmtransflag_t flags); int trans_release(void); int needs_root(void); int getcols(void); -int rmrf(const char *path); char *mbasename(const char *path); char *mdirname(const char *path); void indentprint(const char *str, int indent); -- 1.6.5

6 10

[pacman-dev] [PATCH] makepkg: Add fallback to package function
by Allan McRae 28 Oct '09

28 Oct '09

makepkg looks for a package() function when building a single package but package_$pkgname() style package functions when building a split package. This patch allows the use of a package_$pkgname() function when building a single package for consistency. This is achieved by having makepkg consider a non-split package with a package_$pkgname() function as a split package (creating just the one package). Fixes FS#16622. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd5f951..a576c52 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1742,10 +1742,6 @@ if [ "$GENINTEG" -eq 1 ]; then exit 0 # $E_OK fi -if [ "$(type -t package)" = "function" ]; then - PKGFUNC=1 -fi - # check the PKGBUILD for some basic requirements check_sanity || exit 1 @@ -1760,6 +1756,12 @@ if [ "${#pkgname[@]}" -gt "1" ]; then SPLITPKG=1 fi +if [ "$(type -t package)" = "function" ]; then + PKGFUNC=1 +elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then + SPLITPKG=1 +fi + pkgbase=${pkgbase:-${pkgname[0]}} if [ -n "${PKGLIST[@]}" ]; then -- 1.6.5.1

2 1

[pacman-dev] [PATCH 2/2] Fix some errors that cppcheck gave back
by Laszlo Papp 28 Oct '09

28 Oct '09

Fix some warning that cppcheck gave back * opendir(path)) == (DIR *)-1 is maybe the result of miss understanding of the man page, if the opendir wasn't successful it gives back NULL instead of '(DIR *)-1'. * return(PM_ERR_NOT_A_DIR); was established instead of hard coding numbers for return statement. * The ambiguity while cycle with EINTR condition was refactored for a do {} while () cycle to be easier to read/understand Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/util.c | 11 ++++++----- src/pacman/util.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..ad3dc2c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -212,8 +212,9 @@ int _alpm_lckmk() _alpm_makepath(dir); FREE(dir); - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 - && errno == EINTR); + do { + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); + } while(fd == -1 && errno == EINTR); if(fd > 0) { FILE *f = fdopen(fd, "w"); fprintf(f, "%ld\n", (long)getpid()); @@ -315,7 +316,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -389,8 +390,8 @@ int _alpm_rmrf(const char *path) } } } else { - if((dirp = opendir(path)) == (DIR *)-1) { - return(1); + if((dirp = opendir(path)) == NULL) { + return(PM_ERR_NOT_A_DIR); } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 1143bef..e3dbfbb 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -122,8 +122,8 @@ int rmrf(const char *path) return(1); } - if((dirp = opendir(path)) == (DIR *)-1) { - return(1); + if((dirp = opendir(path)) == NULL) { + return(PM_ERR_NOT_A_DIR); } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { -- 1.6.5

4 8

[pacman-dev] About makepkg dlagents
by Ciprian Dorin, Craciun 27 Oct '09

27 Oct '09

About download-agents for makepkg. (This is why I've bothered the developers of pacman this morning with compilation issues... :)) So I wanted to be able to make PKGBUILD and makepkg extract sources for Git repositories. And after asking on the arch-general, I was pointed to the following bug: http://bugs.archlinux.org/task/7816 As a consequence I've started hacking and commed up with the following patches (put at the end). (I've ended up with four pathes from git format-patch... Should I put only the diff between maint branch and my branch?) Also below is the description on the bug-tracker: ~~~~ I've made some hacking staring from pacman Git repository. My work is available at (branch patches/git-dlagent): http://gitorious.org/~ciprian.craciun/pacman/ciprian-craciun-patches In summary: * added a script: /usr/bin/git-dlagent that takes exactly two arguments: URL and output. * updated /etc/makepkg.conf to include the following URL's: git://, git+file://, git+http://, git+https://, git+ssh://, git+rsync; * a Git url looks-like: git+git://projects.archlinux.org/pacman.git#master##pacman.tar where: * what is before the first `#` is the URL used to (maybe) clone the Git repository. * what is after the first `#` and before `##` is the refspec (head / tag / etc.) to export; * what is after `##` (optional this part is) it can be used to make the file-part of the URL look like a tar file; How git-dlagent it works: * in case git+file:// is given `git --git-dir=... archive` is done; * else it tries to do `git archive --remote=...`; (usually this doesn't work unless the repository is git and the barkend is enabled); * but anyway it fallbacks to `git clone ...`, and then a local git archive; ~~~~ (My approach just uses the Git / SVN / etc tools to create a .tar or .zip file, and leave the rest up to makepkg. I've also patched makepkg to ignore those hashes that are equal to `--`.) ~~~~ I would say it integrated prety nice with the whole makepkg, and also does not impact the source code by much. An example of an URL used in PKGBUILD would be the following: git+file:///stores/erebus-1/ciprian/workbench/pacman/.git#patches/master##/$pkgname-$pkgver.tar git://projects.archlinux.org/pacman.git#maint#/pacman-v3.3.2.tar Is anyone interested in adopting this patch? Any comments? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From c08594be518814646f7e9d9224a0068e9e4d6f34 Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 22:53:06 +0300 Subject: [PATCH 1/4] Added option to ignore a source integrity hash. (We just replace the hash with `--`.) Added makepkg download-agent for git. (git-dlagent.bash) --- scripts/git-dlagent.sh.in | 78 +++++++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 14 +++++--- 2 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 scripts/git-dlagent.sh.in diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in new file mode 100644 index 0000000..a2240a7 --- /dev/null +++ b/scripts/git-dlagent.sh.in @@ -0,0 +1,78 @@ +#!/bin/bash + +set -e -u -o pipefail || exit 1 +test "${#}" -eq 2 + +uri="${1}" +output="${2}" + +git_archive_method=unknown + + +if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + + git_archive_method=remote + +elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+file:\/\/}" + + git_archive_method=local + +elif [[ "${uri}" =~ ^(git\+)?(ssh|http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+}" + + git_archive_method=remote + +else + echo "[ee] \`${uri}\` is not a Git URI." >&2 + exit 1 +fi + + +case "${git_archive_method}" in + + ( local ) + + git --git-dir="${uri}" archive --format=tar --output="${output}" "${reference}" + + exit 0 + ;; + + ( remote ) + + git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + && exit 0 + + echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + + clone="$( mktemp -d )" + + git clone --bare "${uri}" "${clone}" + + git --git-dir="${clone}" archive --format=tar --output="${output}" "${reference}" + + find "${clone}" -delete + + exit 0 + ;; + + ( * ) + echo "[ee] unknown git-archive-method." >&2 + exit 1 + ;; + +esac + +exit 1 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3662228..3cdf2aa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -591,12 +591,16 @@ check_checksums() { if [ $found -gt 0 ] ; then local expectedsum="$(echo ${integrity_sums[$idx]} | tr '[A-F]' '[a-f]')" - local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" - if [ "$expectedsum" = "$realsum" ]; then - echo "$(gettext "Passed")" >&2 + if [ "$expectedsum" = '--' ]; then + echo "$(gettext "Skipped")" >&2 else - echo "$(gettext "FAILED")" >&2 - errors=1 + local realsum="$(openssl dgst -${integ} "$file" | awk '{print $NF}')" + if [ "$expectedsum" = "$realsum" ]; then + echo "$(gettext "Passed")" >&2 + else + echo "$(gettext "FAILED")" >&2 + errors=1 + fi fi fi -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 47c0d7fef2eefa69081c809dd285fa2fcf88eb36 Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 22:57:53 +0300 Subject: [PATCH 2/4] Integrated git-dlagent into the build system. --- etc/makepkg.conf.in | 8 +++++++- scripts/Makefile.am | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1368ff1..29f6e4e 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -12,7 +12,13 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') + 'scp::/usr/bin/scp -C %u %o' + 'git::/usr/bin/git-dlagent %u %o' + 'git+file::/usr/bin/git-dlagent %u %o' + 'git+http::/usr/bin/git-dlagent %u %o' + 'git+https::/usr/bin/git-dlagent %u %o' + 'git+ssh::/usr/bin/git-dlagent %u %o' + 'git+rsync::/usr/bin/git-dlagent %u %o') # Other common tools: # /usr/bin/snarf diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5d65653..524710c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -10,14 +10,16 @@ OURSCRIPTS = \ pacman-optimize \ pkgdelta \ rankmirrors \ - repo-add + repo-add \ + git-dlagent EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ pkgdelta.sh.in \ rankmirrors.py.in \ - repo-add.sh.in + repo-add.sh.in \ + git-dlagent.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -67,5 +69,6 @@ repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in rm -f repo-remove $(LN_S) repo-add repo-remove +git-dlagent: $(srcdir)/git-dlagent.sh.in # vim:set ts=2 sw=2 noet: -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 8fc53a663e7b7521133a05b8e28d9fd3f15efaea Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Mon, 19 Oct 2009 23:48:51 +0300 Subject: [PATCH 3/4] Updated git-dlagent. git-archive is usable only for file:// or git:// or git+ssh:// repositories. --- scripts/git-dlagent.sh.in | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in index a2240a7..993c7b5 100644 --- a/scripts/git-dlagent.sh.in +++ b/scripts/git-dlagent.sh.in @@ -26,7 +26,7 @@ then git_archive_method=local -elif [[ "${uri}" =~ ^(git\+)?(ssh|http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] then uri="${uri/%##*}" reference="${uri/#*#}" @@ -35,6 +35,15 @@ then git_archive_method=remote +elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +then + uri="${uri/%##*}" + reference="${uri/#*#}" + uri="${uri/%#*}" + uri="${uri/#git+}" + + git_archive_method=remote-force + else echo "[ee] \`${uri}\` is not a Git URI." >&2 exit 1 @@ -50,12 +59,14 @@ case "${git_archive_method}" in exit 0 ;; - ( remote ) - - git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ - && exit 0 + ( remote | remote-force ) - echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + if test "${git_archive_method}" == remote + then + git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + && exit 0 + echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 + fi clone="$( mktemp -d )" -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >From 31a684f8fc561d3b4ef6dc20ec05b6089e771bbd Mon Sep 17 00:00:00 2001 From: Ciprian Dorin, Craciun <ciprian(a)volution.ro> Date: Tue, 20 Oct 2009 09:03:23 +0300 Subject: [PATCH 4/4] Fixed git-dlagent (failure to work without the `git+` prefix). Modified the way the URL is interpretted: git+<url-part>#refspec##/<name>.tar And now the archive should contain a folder with the name <name>. (The `##/<name>.tar` is optional.) --- scripts/git-dlagent.sh.in | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/scripts/git-dlagent.sh.in b/scripts/git-dlagent.sh.in index 993c7b5..7b7ec24 100644 --- a/scripts/git-dlagent.sh.in +++ b/scripts/git-dlagent.sh.in @@ -9,25 +9,35 @@ output="${2}" git_archive_method=unknown -if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +if [[ "${uri}" =~ ^git://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" git_archive_method=remote -elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?file:///[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" - uri="${uri/#git+file:\/\/}" + uri="${uri/#git+}" + uri="${uri/#file:\/\/}" git_archive_method=local -elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?ssh://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" @@ -35,8 +45,11 @@ then git_archive_method=remote -elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##[a-zA-Z0-9_.-]+\.tar)?$ ]] +elif [[ "${uri}" =~ ^(git\+)?(http|https|rsync)://[^/#]+[^#]+#[^#]+(##/[a-zA-Z0-9_.-]+\.tar)?$ ]] then + + prefix="${uri/#*##\/}" + prefix="${prefix/%.tar}" uri="${uri/%##*}" reference="${uri/#*#}" uri="${uri/%#*}" @@ -54,7 +67,7 @@ case "${git_archive_method}" in ( local ) - git --git-dir="${uri}" archive --format=tar --output="${output}" "${reference}" + git --git-dir="${uri}" archive --format=tar --output="${output}" --prefix="${prefix}/" "${reference}" exit 0 ;; @@ -63,7 +76,7 @@ case "${git_archive_method}" in if test "${git_archive_method}" == remote then - git archive --format=tar --output="${output}" --remote="${uri}" "${reference}" \ + git archive --format=tar --output="${output}" --remote="${uri}" --prefix="${prefix}/" "${reference}" \ && exit 0 echo "[ww] \`${uri}\` does not support git-archive; going after clone." >&2 fi @@ -72,7 +85,7 @@ case "${git_archive_method}" in git clone --bare "${uri}" "${clone}" - git --git-dir="${clone}" archive --format=tar --output="${output}" "${reference}" + git --git-dir="${clone}" archive --format=tar --output="${output}" --prefix="${prefix}/" "${reference}" find "${clone}" -delete -- 1.6.3.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

4 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.2-88-g3f7cc83
by dan＠archlinux.org 27 Oct '09

27 Oct '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 3f7cc83e0df79f24c545924d7b38e9fa22302b2a (commit) via 361a25c0861a74d6b35500955ae12e6b1bbadc5b (commit) via fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 (commit) from 7f0f319a3e7c471a41482ba620f74423ef3f9a94 (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 3f7cc83e0df79f24c545924d7b38e9fa22302b2a Merge: 361a25c0861a74d6b35500955ae12e6b1bbadc5b fff6d9dc2e6c61f67d6a50e2dde655f388c173a8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 26 21:07:29 2009 -0500 Merge branch 'maint' commit 361a25c0861a74d6b35500955ae12e6b1bbadc5b Author: Laszlo Papp <djszapi2(a)gmail.com> Date: Fri Oct 23 14:01:17 2009 +0200 Fix a small typo in alpm_list.c Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm_list.c | 2 +- scripts/makepkg.sh.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Change strdup function using for strndup
by Laszlo Papp 24 Oct '09

24 Oct '09

* Size examined str* function usage is a common coding practice, * because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- Is there any MAX value for these variables? *grp, package name, version, arch, license, replaces, backup, opt.depends, conflict, provide, xfercommand lib/libalpm/backup.c | 6 ++-- lib/libalpm/be_package.c | 6 ++-- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/package.c | 6 ++-- lib/libalpm/sync.c | 10 ++++---- lib/libalpm/util.c | 14 +++++----- src/pacman/callback.c | 2 +- src/pacman/conf.c | 4 +- src/pacman/pacman.c | 56 +++++++++++++++++++++++----------------------- src/pacman/util.c | 6 ++-- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index a0c6b7f..741f763 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -35,7 +35,7 @@ /* split a backup string "file\thash" into two strings : file and hash */ static int backup_split(const char *string, char **file, char **hash) { - char *str = strdup(string); + char *str = strndup(string, PATH_MAX); char *ptr; /* tab delimiter */ @@ -53,10 +53,10 @@ static int backup_split(const char *string, char **file, char **hash) ptr++; /* now str points to the filename and ptr points to the hash */ if(file) { - *file = strdup(str); + *file = strndup(str, PATH_MAX); } if(hash) { - *hash = strdup(ptr); + *hash = strndup(ptr, PATH_MAX); } FREE(str); return(1); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c1a4343..63fdb8b 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -169,7 +169,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) RET_ERR(PM_ERR_MEMORY, NULL); } - newpkg->filename = strdup(pkgfile); + newpkg->filename = strndup(pkgfile, PATH_MAX); newpkg->size = st.st_size; /* If full is false, only read through the archive until we find our needed @@ -202,7 +202,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) * already been handled (for future possibilities) */ } else { /* Keep track of all files for filelist generation */ - newpkg->files = alpm_list_add(newpkg->files, strdup(entry_name)); + newpkg->files = alpm_list_add(newpkg->files, strndup(entry_name, PATH_MAX)); } if(archive_read_data_skip(archive)) { @@ -234,7 +234,7 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) /* internal fields for package struct */ newpkg->origin = PKG_FROM_FILE; - newpkg->origin_data.file = strdup(pkgfile); + newpkg->origin_data.file = strndup(pkgfile, PATH_MAX); if(full) { /* "checking for conflicts" requires a sorted list, ensure that here */ diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e934c01..d063859 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -516,7 +516,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, /* skip removal of file, but not add. this will prevent a second * package from removing the file when it was already installed * by its new owner (whether the file is in backup array or not */ - trans->skip_remove = alpm_list_add(trans->skip_remove, strdup(filestr)); + trans->skip_remove = alpm_list_add(trans->skip_remove, strndup(filestr, PATH_MAX)); _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s\n", filestr); resolved_conflict = 1; } diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index dca5452..7f44759 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -189,7 +189,7 @@ int SYMEXPORT alpm_db_setserver(pmdb_t *db, const char *url) len = strlen(url); } if(len) { - newurl = strdup(url); + newurl = strndup(url, len); /* strip the trailing slash if one exists */ if(newurl[len - 1] == '/') { newurl[len - 1] = '\0'; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5cbf363..9e28527 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -431,7 +431,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) return(-1); } - handle->logfile = strdup(logfile); + handle->logfile = strndup(logfile, PATH_MAX); /* free the old logfile path string, and close the stream so logaction * will reopen a new stream on the new logfile */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 572b863..658b737 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -618,8 +618,8 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) /* easy comparison to see if versions are identical */ if(strcmp(a, b) == 0) return(0); - str1 = strdup(a); - str2 = strdup(b); + str1 = strndup(a, PATH_MAX); + str2 = strndup(b, PATH_MAX); one = str1; two = str2; @@ -805,7 +805,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) /* internal */ newpkg->origin = pkg->origin; if(newpkg->origin == PKG_FROM_FILE) { - newpkg->origin_data.file = strdup(pkg->origin_data.file); + newpkg->origin_data.file = strndup(pkg->origin_data.file, PATH_MAX); } else { newpkg->origin_data.db = pkg->origin_data.db; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2cdcd47..e16374c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -830,7 +830,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(d->download_size != 0) { /* add the delta filename to the download list if needed */ - files = alpm_list_add(files, strdup(d->delta)); + files = alpm_list_add(files, strndup(d->delta, PATH_MAX)); } /* keep a list of all the delta files for md5sums */ @@ -841,7 +841,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) /* not using deltas */ if(spkg->download_size != 0) { /* add the filename to the download list if needed */ - files = alpm_list_add(files, strdup(fname)); + files = alpm_list_add(files, strndup(fname, PATH_MAX)); } } @@ -881,7 +881,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(test_md5sum(trans, filename, md5sum) != 0) { errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); } } if(errors) { @@ -916,7 +916,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(test_md5sum(trans, filename, md5sum) != 0) { errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); continue; } /* load the package file and replace pkgcache entry with it in the target list */ @@ -927,7 +927,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(alpm_pkg_load(filepath, 1, &pkgfile) != 0) { _alpm_pkg_free(pkgfile); errors++; - *data = alpm_list_add(*data, strdup(filename)); + *data = alpm_list_add(*data, strndup(filename, PATH_MAX)); FREE(filepath); continue; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..906cb03 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -97,7 +97,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) mode_t oldmask = umask(0000); int ret = 0; - orig = strdup(path); + orig = strndup(path, PATH_MAX); incr = calloc(strlen(orig) + 1, sizeof(char)); str = orig; while((ptr = strsep(&str, "/"))) { @@ -204,7 +204,7 @@ int _alpm_lckmk() const char *file = alpm_option_get_lockfile(); /* create the dir of the lockfile first */ - dir = strdup(file); + dir = strndup(file, PATH_MAX); ptr = strrchr(dir, '/'); if(ptr) { *ptr = '\0'; @@ -315,7 +315,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -324,7 +324,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int /* If specific files were requested, skip entries that don't match. */ if(list) { - char *prefix = strdup(entryname); + char *prefix = strndup(entryname, PATH_MAX); char *p = strstr(prefix,"/"); if(p) { *(p+1) = '\0'; @@ -575,7 +575,7 @@ char *_alpm_filecache_find(const char* filename) snprintf(path, PATH_MAX, "%s%s", (char*)alpm_list_getdata(i), filename); if(access(path, R_OK) == 0) { - retpath = strdup(path); + retpath = strndup(path, PATH_MAX); _alpm_log(PM_LOG_DEBUG, "found cached pkg: %s\n", retpath); return(retpath); } @@ -612,7 +612,7 @@ const char *_alpm_filecache_setup(void) } /* we didn't find a valid cache directory. use /tmp. */ - tmp = alpm_list_add(NULL, strdup("/tmp/")); + tmp = alpm_list_add(NULL, strndup("/tmp/", PATH_MAX)); alpm_option_set_cachedirs(tmp); _alpm_log(PM_LOG_DEBUG, "using cachedir: %s", "/tmp/\n"); _alpm_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n")); @@ -629,7 +629,7 @@ const char *_alpm_filecache_setup(void) int _alpm_lstat(const char *path, struct stat *buf) { int ret; - char *newpath = strdup(path); + char *newpath = strndup(path, PATH_MAX); int len = strlen(newpath); /* strip the trailing slash if one exists */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 858bfdf..f6444ed 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -553,7 +553,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) eta_m = eta_s / 60; eta_s -= eta_m * 60; - fname = strdup(filename); + fname = strndup(filename, PATH_MAX); /* strip package or DB extension for cleaner look */ if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) { *p = '\0'; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 92c6f4e..d118dd0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <stdio.h> -#include <string.h> /* strdup */ +#include <string.h> /* strndup */ /* pacman */ #include "conf.h" @@ -44,7 +44,7 @@ config_t *config_new(void) newconfig->op = PM_OP_MAIN; newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING; /* CONFFILE is defined at compile-time */ - newconfig->configfile = strdup(CONFFILE); + newconfig->configfile = strndup(CONFFILE, PATH_MAX); return(newconfig); } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f4f8044..cd6dc9f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -295,12 +295,12 @@ static void setlibpaths(void) if(!config->dbpath) { /* omit leading slash from our static DBPATH, root handles it */ snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), DBPATH + 1); - config->dbpath = strdup(path); + config->dbpath = strndup(path, PATH_MAX); } if(!config->logfile) { /* omit leading slash from our static LOGFILE path, root handles it */ snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE + 1); - config->logfile = strdup(path); + config->logfile = strndup(path, PATH_MAX); } } /* Set other paths if they were configured. Note that unless rootdir @@ -477,7 +477,7 @@ static int parseargs(int argc, char *argv[]) case 'U': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); break; case 'V': config->version = 1; break; case 'b': - config->dbpath = strdup(optarg); + config->dbpath = strndup(optarg, PATH_MAX); break; case 'c': (config->op_s_clean)++; @@ -494,26 +494,26 @@ static int parseargs(int argc, char *argv[]) case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break; case 'g': (config->group)++; break; case 'h': config->help = 1; break; - case 'i': (config->op_q_info)++; (config->op_s_info)++; break; - case 'k': - config->flags |= PM_TRANS_FLAG_DBONLY; - config->op_q_check = 1; - break; - case 'l': config->op_q_list = 1; break; - case 'm': config->op_q_foreign = 1; break; - case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break; - case 'o': config->op_q_owns = 1; break; - case 'p': - config->op_q_isfile = 1; - config->op_s_printuris = 1; - config->flags |= PM_TRANS_FLAG_NOCONFLICTS; - config->flags |= PM_TRANS_FLAG_NOLOCK; - break; - case 'q': - config->quiet = 1; - break; - case 'r': - config->rootdir = strdup(optarg); + case 'i': (config->op_q_info)++; (config->op_s_info)++; break; + case 'k': + config->flags |= PM_TRANS_FLAG_DBONLY; + config->op_q_check = 1; + break; + case 'l': config->op_q_list = 1; break; + case 'm': config->op_q_foreign = 1; break; + case 'n': config->flags |= PM_TRANS_FLAG_NOSAVE; break; + case 'o': config->op_q_owns = 1; break; + case 'p': + config->op_q_isfile = 1; + config->op_s_printuris = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + config->flags |= PM_TRANS_FLAG_NOLOCK; + break; + case 'q': + config->quiet = 1; + break; + case 'r': + config->rootdir = strndup(optarg, PATH_MAX); break; case 's': config->op_s_search = 1; @@ -723,7 +723,7 @@ static int _parseconfig(const char *file, const char *givensection, /* if we are passed a section, use it as our starting point */ if(givensection != NULL) { - section = strdup(givensection); + section = strndup(givensection, PATH_MAX); } /* if we are passed a db, use it as our starting point */ if(givendb != NULL) { @@ -749,7 +749,7 @@ static int _parseconfig(const char *file, const char *givensection, if(section) { free(section); } - section = strdup(ptr); + section = strndup(ptr, PATH_MAX); section[strlen(section)-1] = '\0'; pm_printf(PM_LOG_DEBUG, "config: new section '%s'\n", section); if(!strlen(section)) { @@ -840,7 +840,7 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { - config->dbpath = strdup(ptr); + config->dbpath = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: dbpath: %s\n", ptr); } } else if(strcmp(key, "CacheDir") == 0) { @@ -854,12 +854,12 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "RootDir") == 0) { /* don't overwrite a path specified on the command line */ if(!config->rootdir) { - config->rootdir = strdup(ptr); + config->rootdir = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: rootdir: %s\n", ptr); } } else if (strcmp(key, "LogFile") == 0) { if(!config->logfile) { - config->logfile = strdup(ptr); + config->logfile = strndup(ptr, PATH_MAX); pm_printf(PM_LOG_DEBUG, "config: logfile: %s\n", ptr); } } else if (strcmp(key, "XferCommand") == 0) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 0e5e7f5..fc8822f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -176,10 +176,10 @@ char *mdirname(const char *path) /* null or empty path */ if(path == NULL || path == '\0') { - return(strdup(".")); + return(strndup(".", PATH_MAX)); } - ret = strdup(path); + ret = strndup(path, PATH_MAX); last = strrchr(ret, '/'); if(last != NULL) { @@ -189,7 +189,7 @@ char *mdirname(const char *path) } /* no slash found */ free(ret); - return(strdup(".")); + return(strndup(".", PATH_MAX)); } /* output a string, but wrap words properly with a specified indentation -- 1.6.4.4

4 6