- sync with AC-branch

Changed files:
    util-vserver-pld.patch -> 1.18

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index f7a69dec3d2d6b4c31e4b4c7ba02a1cea1aa07cb..bb1c68ea9b9f3dbe96b28fccd2cddd76a601aec6 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -1,4 +1,3 @@
-diff -urN util-vserver-0.30.212.org/distrib/Makefile.am util-vserver-0.30.212/distrib/Makefile.am
 --- util-vserver-0.30.212.org/distrib/Makefile.am      2006-12-09 17:15:33.000000000 +0100
 +++ util-vserver-0.30.212/distrib/Makefile.am  2007-02-04 19:00:38.703238500 +0100
 @@ -65,7 +65,9 @@
@@ -42,7 +41,6 @@ diff -urN util-vserver-0.30.212.org/distrib/Makefile.am util-vserver-0.30.212/di
                        $(mkinstalldirs) $(DESTDIR)$(confdir) \
                                $(DESTDIR)$(confdistribdir)/.common/pubkeys \
                                $(DESTDIR)$(confdefaultsdir) \
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.212/distrib/pld-ac/pkgs/01
 --- util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01   1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/pkgs/01       2007-02-04 18:20:38.633243500 +0100
 @@ -0,0 +1,5 @@
@@ -51,7 +49,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.212
 +issue
 +rpm-base
 +vserver-packages
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf
 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf       1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf   2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,30 @@
@@ -85,7 +82,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf util-vser
 +grep = !grep
 +awk  = !awk
 +
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf
 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf     2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,62 @@
@@ -151,10 +147,9 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf util-vserve
 +#cmd   = foo.sh %d %Pn
 + 
 +  
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf
 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf        2007-02-04 18:20:38.637243750 +0100
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,44 @@
 +# $Id$
 +# PLD <http://www.pld-linux.org/>
 +
@@ -173,23 +168,20 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf util-v
 +type  = %{_ac_idxtype}
 +name  = ac
 +path  = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
++#signed = yes
 +
 +[source]
 +type  = %{_ac_idxtype}
-+name  = ac-updates-security
-+path  = %{_pld_prefix}/updates/security/%{_pld_arch}/
-+
-+[source]
-+type  = %{_ac_idxtype}
-+name  = ac-updates-general
-+path  = %{_pld_prefix}/updates/general/%{_pld_arch}/
-+noauto        = yes
++name  = ac-updates
++path  = %{_pld_prefix}/updates/%{_pld_arch}/
++#signed = yes
 +
 +[source]
 +type  = %{_ac_idxtype}
 +name  = ac-supported
 +path  = %{_pld_prefix}/supported/%{_pld_arch}/
 +noauto        = yes
++#signed = yes
 +
 +[source]
 +type  = %{_ac_idxtype}
@@ -202,7 +194,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf util-v
 +name  = ac-test
 +path  = %{_pld_prefix}/test/%{_pld_arch}/
 +noauto        = yes
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf
 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf    2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,182 @@
@@ -388,7 +379,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf util-vserv
 +
 +# Taking into account package Conflicts.
 +#conflicts = yes
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf
 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf    2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,85 @@
@@ -477,7 +467,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf util-vserv
 +#ignore = kernel*-smp-*
 +#dscr   = pl_PL
 +  
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros util-vserver-0.30.212/distrib/pld-ac/rpm/macros
 --- util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/rpm/macros    2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,4 @@
@@ -485,7 +474,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros util-vserver-0.30.
 +# you have to use at least one language beside 'C'
 +%_install_langs               C:en:pl
 +%_netsharedpath               /dev
-diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst
 --- util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst  1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst      2007-02-04 18:20:38.637243750 +0100
 @@ -0,0 +1,10 @@
@@ -499,7 +487,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst util-vserver
 +issue-[0-9]*.rpm
 +rpm-base-*.rpm
 +vserver-packages-*.rpm
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 util-vserver-0.30.212/distrib/pld-th/pkgs/01
 --- util-vserver-0.30.212.org/distrib/pld-th/pkgs/01   1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/pkgs/01       2007-02-04 18:20:38.633243000 +0100
 @@ -0,0 +1,5 @@
@@ -508,7 +495,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 util-vserver-0.30.212
 +issue
 +rpm-base
 +vserver-packages
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf
 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf       1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf   2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,30 @@
@@ -542,7 +528,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf util-vser
 +grep = !grep
 +awk  = !awk
 +
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf
 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf     2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,62 @@
@@ -608,7 +593,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf util-vserve
 +#cmd   = foo.sh %d %Pn
 + 
 +  
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf
 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf        2007-02-04 18:25:33.175651250 +0100
 @@ -0,0 +1,51 @@
@@ -663,7 +647,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf util-v
 +name  = th-test
 +path  = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
 +noauto        = yes
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf
 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf    2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,182 @@
@@ -849,7 +832,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf util-vserv
 +
 +# Taking into account package Conflicts.
 +#conflicts = yes
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf util-vserver-0.30.212/distrib/pld-th/poldek/source.conf
 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/poldek/source.conf    2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,85 @@
@@ -938,7 +920,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf util-vserv
 +#ignore = kernel*-smp-*
 +#dscr   = pl_PL
 +  
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpm/macros util-vserver-0.30.212/distrib/pld-th/rpm/macros
 --- util-vserver-0.30.212.org/distrib/pld-th/rpm/macros        1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/rpm/macros    2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,4 @@
@@ -946,7 +927,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpm/macros util-vserver-0.30.
 +# you have to use at least one language beside 'C'
 +%_install_langs               C:en:pl
 +%_netsharedpath               /dev
-diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst
 --- util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst  1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst      2007-02-04 18:20:38.637243000 +0100
 @@ -0,0 +1,10 @@
@@ -960,7 +940,6 @@ diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst util-vserver
 +issue-[0-9]*.rpm
 +rpm-base-*.rpm
 +vserver-packages-*.rpm
-diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scripts/functions
 --- util-vserver-0.30.212.org/scripts/functions        2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/functions    2007-02-04 18:20:38.637243750 +0100
 @@ -394,6 +394,20 @@
@@ -1029,7 +1008,6 @@ diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scri
  
  function vshelper.doSanityCheck
  {
-diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212/scripts/Makefile-files
 --- util-vserver-0.30.212.org/scripts/Makefile-files   2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/Makefile-files       2007-02-04 18:20:38.669245750 +0100
 @@ -21,6 +21,7 @@
@@ -1070,7 +1048,6 @@ diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212
                                scripts/vdispatch-conf \
                                scripts/vemerge \
                                scripts/vesync \
-diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/scripts/pkgmgmt
 --- util-vserver-0.30.212.org/scripts/pkgmgmt  2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/pkgmgmt      2007-02-04 18:20:38.673246000 +0100
 @@ -195,7 +195,7 @@
@@ -1234,7 +1211,6 @@ diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/script
        (debian)                processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
        (*)
            echo $"Vserver style '$style' is not supported for packagemanagment" >&2
-diff -urN util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst
 --- util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst      2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst  2007-02-04 18:20:38.673246000 +0100
 @@ -51,6 +51,7 @@
@@ -1254,7 +1230,6 @@ diff -urN util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst util-vse
  
  _AWK="@AWK@"
  _BZIP2="@BZIP2@"
-diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/vpkg
 --- util-vserver-0.30.212.org/scripts/vpkg     2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vpkg 2007-02-04 18:20:38.673246000 +0100
 @@ -115,6 +115,44 @@
@@ -1302,7 +1277,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/v
      (debian)
        case "$tag" in
            (get-conffiles)
-diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/scripts/vpoldek
 --- util-vserver-0.30.212.org/scripts/vpoldek  1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vpoldek      2007-02-04 18:20:38.673246000 +0100
 @@ -0,0 +1,96 @@
@@ -1402,7 +1376,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/script
 +
 +test "$cnt" -ge 0 || echo "No vservers specified" >&2
 +exit $res
-diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212/scripts/vpoldek-worker
 --- util-vserver-0.30.212.org/scripts/vpoldek-worker   1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vpoldek-worker       2007-02-04 18:20:38.673246000 +0100
 @@ -0,0 +1,45 @@
@@ -1451,7 +1424,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212
 +      --conf=$POLDEK_CONFIG \
 +      --pmcmd=$RPM_BINARY \
 +      "$@"
-diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/scripts/vserver-build
 --- util-vserver-0.30.212.org/scripts/vserver-build    2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vserver-build        2007-02-04 18:20:38.673246000 +0100
 @@ -57,6 +57,9 @@
@@ -1473,7 +1445,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/
                . $__PKGLIBDIR/vserver-build.$method
                ;;
      (x)               panic $"No build-method specified";;
-diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver-0.30.212/scripts/vserver-build.functions
 --- util-vserver-0.30.212.org/scripts/vserver-build.functions  2006-12-09 17:15:24.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vserver-build.functions      2007-02-04 18:20:38.673246000 +0100
 @@ -167,6 +167,12 @@
@@ -1489,7 +1460,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver
        elif test -n "$1"; then
            DISTRIBUTION=$1
        else
-diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util-vserver-0.30.212/scripts/vserver-build.functions.poldek
 --- util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek   1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vserver-build.functions.poldek       2007-02-04 18:20:38.673246000 +0100
 @@ -0,0 +1,67 @@
@@ -1560,7 +1530,6 @@ diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util-
 +#    test -z "$POLDEKCONFDEFAULT" || \
 +#     $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
 +}
-diff -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0.30.212/scripts/vserver-build.poldek
 --- util-vserver-0.30.212.org/scripts/vserver-build.poldek     1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.212/scripts/vserver-build.poldek 2007-02-04 18:20:38.701247750 +0100
 @@ -0,0 +1,64 @@