util-vserver-pld.patch

   1 diff -urN util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.207-pld/distrib/Makefile.am
   2 --- util-vserver-0.30.207/distrib/Makefile.am   2005-04-08 21:12:09.000000000 +0200
   3 +++ util-vserver-0.30.207-pld/distrib/Makefile.am       2005-05-17 15:27:16.884625000 +0200
   4 @@ -43,7 +43,8 @@
   5                            fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \
   6                            $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \
   7                            suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
   8 -                          suse91/rpm/macros
   9 +                          suse91/rpm/macros \
  10 +                          pld2.0/pkgs/01 pld2.0/rpm/macros pld2.0/rpmlist.d/00.lst
  11
  12  nobase_confdistrib_DATA        =  rh9/apt/sources.list \
  13                            fc1/apt/sources.list \
  14 @@ -67,6 +68,7 @@
  15                                 ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
  16                                 ln -sf ../redhat/initpre  $(DESTDIR)$(distribdir)/$$i/; \
  17                         done
  18 +                       ln -sf pld2.0 $(DESTDIR)$(distribdir)/pld1.99
  19                         $(mkinstalldirs) $(DESTDIR)$(confdir) \
  20                                 $(DESTDIR)$(confdistribdir)/.common/pubkeys \
  21                                 $(DESTDIR)$(confdefaultsdir) \
  22 diff -urN util-vserver-0.30.207/distrib/pld2.0/pkgs/01 util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01
  23 --- util-vserver-0.30.207/distrib/pld2.0/pkgs/01        1970-01-01 01:00:00.000000000 +0100
  24 +++ util-vserver-0.30.207-pld/distrib/pld2.0/pkgs/01    2005-05-16 19:09:20.000000000 +0200
  25 @@ -0,0 +1,3 @@
  26 +vserver-basesystem
  27 +glibc
  28 +issue
  29 diff -urN util-vserver-0.30.207/distrib/pld2.0/rpm/macros util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros
  30 --- util-vserver-0.30.207/distrib/pld2.0/rpm/macros     1970-01-01 01:00:00.000000000 +0100
  31 +++ util-vserver-0.30.207-pld/distrib/pld2.0/rpm/macros 2005-05-17 15:23:04.279026888 +0200
  32 @@ -0,0 +1,3 @@
  33 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
  34 +# you have to use at least one language beside 'C'
  35 +%_install_langs                C:en:pl
  36 diff -urN util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst
  37 --- util-vserver-0.30.207/distrib/pld2.0/rpmlist.d/00.lst       1970-01-01 01:00:00.000000000 +0100
  38 +++ util-vserver-0.30.207-pld/distrib/pld2.0/rpmlist.d/00.lst   2005-05-17 15:15:56.643037440 +0200
  39 @@ -0,0 +1,8 @@
  40 +vserver-basesystem-*.rpm
  41 +vserver-dev-*.rpm
  42 +FHS-*.rpm
  43 +glibc-misc-*.rpm
  44 +glibc-[0-9]*.rpm
  45 +libgcc-[0-9]*.rpm
  46 +setup-*.rpm
  47 +issue-[0-9]*.rpm
  48 diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/functions util-vserver-0.30.207-poldek/scripts/functions
  49 --- util-vserver-0.30.207/scripts/functions     2005-05-20 18:33:27.361745984 +0200
  50 +++ util-vserver-0.30.207-poldek/scripts/functions      2005-05-20 18:33:06.191964280 +0200
  51 @@ -674,6 +674,8 @@
  52         style=redhat
  53      elif test -e "$_pgs_vdir"/etc/mandrake-release; then
  54         style=mandrake
  55 +    elif test -e "$_pgs_vdir"/etc/pld-release; then
  56 +       style=pld
  57      elif test -e "$_pgs_vdir"/etc/debian_version; then
  58         style=debian
  59      elif test -e "$_pgs_vdir"/etc/SuSE-release; then
  60 diff -urN util-vserver-0.30.207/scripts/vserver-build.functions util-vserver-0.30.207-pld/scripts/vserver-build.functions
  61 --- util-vserver-0.30.207/scripts/vserver-build.functions       2005-04-16 23:20:45.000000000 +0200
  62 +++ util-vserver-0.30.207-pld/scripts/vserver-build.functions   2005-05-17 15:13:49.646343872 +0200
  63 @@ -133,6 +133,9 @@
  64      elif test -e /etc/slackware-release; then
  65         set -- $(cat /etc/slackware-release)
  66         DISTRIBUTION=slackware$2
  67 +    elif test -e /etc/pld-release; then
  68 +       set -- $(cat /etc/pld-release)
  69 +       DISTRIBUTION=pld$1
  70      elif test -n "$1"; then
  71         DISTRIBUTION=$1
  72      else
  73 diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/vpkg util-vserver-0.30.207-poldek/scripts/vpkg
  74 --- util-vserver-0.30.207/scripts/vpkg  2005-03-21 21:03:30.000000000 +0100
  75 +++ util-vserver-0.30.207-poldek/scripts/vpkg   2005-05-20 18:22:18.745391120 +0200
  76 @@ -115,6 +115,44 @@
  77             fi
  78         fi
  79         ;;
  80 +    (pld)
  81 +       rpm_param=
  82 +       poldek_param=
  83 +       case "$tag" in
  84 +           ## rpm outputs sometimes '(contains no files)', so return
  85 +           ## only the valid output
  86 +           (get-conffiles)
  87 +               rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
  88 +           (install)
  89 +               rpm_param=( -Uvh "$@" )
  90 +               poldek_param=( --install -v "$@" )
  91 +               ;;
  92 +       esac
  93 +
  94 +       if test -n "$is_external"; then
  95 +           have_poldek=1
  96 +           test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
  97 +       else
  98 +           have_poldek=
  99 +           for i in /bin /usr/bin /usr/local/bin; do
 100 +               test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
 101 +           done
 102 +       fi
 103 +
 104 +       if test -n "$is_external"; then
 105 +           if test "$have_poldek" -a "$poldek_param"; then
 106 +               cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
 107 +           else
 108 +               cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
 109 +           fi
 110 +       else
 111 +           if test "$have_poldek" -a "$poldek_param"; then
 112 +               cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
 113 +           else
 114 +               cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
 115 +           fi
 116 +       fi
 117 +       ;;
 118      (debian)
 119         case "$tag" in
 120             (get-conffiles)