util-vserver-rpm5.patch

   1 --- util-vserver-0.30.216-pre3034/scripts/vrpm.orig     2012-04-24 11:48:10.000000000 +0200
   2 +++ util-vserver-0.30.216-pre3034/scripts/vrpm  2012-10-12 18:44:57.137928223 +0200
   3 @@ -46,6 +46,9 @@
   4      exit 0
   5      }
   6
   7 +rpmversion=$(awk '/^%_rpmversion/ { split($2,ver,/\./); print ver[1] }' /usr/lib/rpm/macros 2>/dev/null)
   8 +[ -z "$rpmversion" ] && rpmversion=5
   9 +
  10  tmp=$(getopt -o +q --long help,version,debug,quiet,$VS_ALLVSERVERS_ARGS -n "$0" -- "$@") || exit 1
  11  eval set -- "$tmp"
  12
  13 @@ -70,4 +73,15 @@
  14  export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
  15
  16  test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
  17 +if [ "$rpmversion" -ge 5 ]; then
  18 +    declare -a rpm_opts
  19 +    [ ${#vsomething_opts[@]} -eq 0 ] && rpm_opts=( "$1" "--" )
  20 +    if [[ "$@" = *--initdb* ]]; then
  21 +       exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "${rpm_opts[@]}" -qa
  22 +    fi
  23 +    if [[ "$@" = *--convertdb* ]]; then
  24 +       VSOMETHING_WORKER=$__PKGLIBDIR/vrpm-convertdb-worker
  25 +       exec $_VSOMETHING "${send_through[@]}" /usr/lib/rpm/bin/dbupgrade.sh "${vsomething_opts[@]}" "${rpm_opts[@]}"
  26 +    fi
  27 +fi
  28  exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "$@"
  29 --- /dev/null   2012-04-24 11:48:10.000000000 +0200
  30 +++ util-vserver-0.30.216-pre3034/scripts/vrpm-convertdb-worker 2012-10-12 18:44:57.137928223 +0200
  31 @@ -0,0 +0,18 @@
  32 +#!/bin/bash
  33 +
  34 +set -e
  35 +
  36 +: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
  37 +test -e "$UTIL_VSERVER_VARS" || {
  38 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
  39 +    exit 1
  40 +}
  41 +. "$UTIL_VSERVER_VARS"
  42 +. "$_LIB_FUNCTIONS"
  43 +
  44 +vserver=$1
  45 +shift
  46 +
  47 +pkgInit "$vserver" rpm
  48 +
  49 +exec /usr/lib/rpm/bin/dbupgrade.sh -r "$VDIR" "$@"
  50 --- util-vserver-0.30.216-pre3034/scripts/Makefile-files.orig   2012-04-24 11:48:10.000000000 +0200
  51 +++ util-vserver-0.30.216-pre3034/scripts/Makefile-files        2012-10-12 18:44:57.137928223 +0200
  52 @@ -10,6 +10,7 @@
  53  AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
  54                                 scripts/vapt-get-worker \
  55                                 scripts/vrpm-worker \
  56 +                               scripts/vrpm-convertdb-worker \
  57                                 scripts/vyum-worker \
  58                                 scripts/vpoldek-worker \
  59                                 scripts/vrpm-preload \
  60 @@ -74,6 +74,7 @@
  61                                 scripts/vpkg \
  62                                 scripts/vpoldek-worker \
  63                                 scripts/vrpm-worker \
  64 +                               scripts/vrpm-convertdb-worker \
  65                                 scripts/vrpm-preload \
  66                                 scripts/start-vservers \
  67                                 scripts/vprocunhide \