X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=util-vserver-pld.patch;h=81700f0d64d2cf7cec501c07ffd84f4f0626c835;hb=40303ba;hp=6d837055dd3adcd10a60f480f71f5ff67f8380d3;hpb=7ca29501e7b658e1ce8bbf23b960595f62514a18;p=packages%2Futil-vserver.git diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 6d83705..81700f0 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -1,6 +1,7 @@ ---- util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:59:35.515771366 +0200 -+++ util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 23:22:53.714374272 +0200 -@@ -42,6 +42,7 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/Makefile.am util-vserver-0.30.216-pre3126/distrib/Makefile.am +--- util-vserver-0.30.216-pre3126.org/distrib/Makefile.am 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/Makefile.am 2021-03-12 21:50:25.804347699 +0100 +@@ -45,6 +45,7 @@ nobase_distrib_DATA = defaults/devs \ defaults/apt.conf \ defaults/rpm/macros \ defaults/apt/apt.conf \ @@ -8,32 +9,31 @@ template/initpost template/initpre \ rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ -@@ -73,7 +74,10 @@ - breezy/debootstrap.script dapper/debootstrap.script \ - edgy/debootstrap.script feisty/debootstrap.script \ - gutsy/debootstrap.script hoary/debootstrap.script \ -- warty/debootstrap.script -+ warty/debootstrap.script \ -+ pld-ac/pkgs/01 pld-ac/rpm/macros \ -+ pld-th/pkgs/01 pld-th/rpm/macros \ -+ pld-ti/pkgs/01 pld-ti/rpm/macros +@@ -96,7 +97,9 @@ nobase_distrib_DATA = defaults/devs \ + suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ + suse91/rpm/macros \ + gentoo/init-vserver.sh gentoo/net.vserver \ +- gentoo/reboot.sh gentoo/shutdown.sh ++ gentoo/reboot.sh gentoo/shutdown.sh\ ++ pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpm/macros.lang \ ++ pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpm/macros.lang nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ -@@ -83,7 +87,10 @@ +@@ -106,7 +109,9 @@ nobase_confdistrib_DATA = rh9/apt/sourc fc5/apt/sources.list \ fc6/apt/sources.list \ f7/apt/sources.list \ - suse91/apt/sources.list + suse91/apt/sources.list \ + pld-ac/poldek/repos.d/pld.conf \ -+ pld-th/poldek/repos.d/pld.conf \ -+ pld-ti/poldek/repos.d/pld.conf ++ pld-th/poldek/repos.d/pld.conf AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) ---- /dev/null 2007-11-07 17:05:30.000000000 +0200 -+++ util-vserver-0.30.214/distrib/defaults/poldek/poldek.conf 2008-03-25 19:36:58.721331962 +0200 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/defaults/poldek/poldek.conf util-vserver-0.30.216-pre3126/distrib/defaults/poldek/poldek.conf +--- util-vserver-0.30.216-pre3126.org/distrib/defaults/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/defaults/poldek/poldek.conf 2021-03-12 21:50:25.804347699 +0100 @@ -0,0 +1,11 @@ +# poldek configuration file. + @@ -46,8 +46,9 @@ + +#hold = +ignore = kernel* udev devfs ---- util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2008-03-25 23:05:18.538916218 +0200 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.216-pre3126/distrib/pld-ac/pkgs/01 +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/pkgs/01 2021-03-12 21:50:25.804347699 +0100 @@ -0,0 +1,6 @@ +basesystem +filesystem @@ -55,11 +56,14 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2008-03-25 20:34:12.000000000 +0200 -@@ -0,0 +1,56 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/poldek/repos.d/pld.conf util-vserver-0.30.216-pre3126/distrib/pld-ac/poldek/repos.d/pld.conf +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/poldek/repos.d/pld.conf 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,64 @@ +# $Id$ +# PLD Linux Distribution . ++# ++# Main sources for PLD Linux 2.0 (Ac) + +# specify our packages architecture +_arch = %ARCH% @@ -71,20 +75,19 @@ +## You can use them if you have better connection there +# CI TASK: +#_prefix = ftp://ftp.task.pld-linux.org/dists/ac -+#_prefix = %{_pld_main_prefix} +_prefix = %{_pld_main_prefix} + +_type = pndir + -+# PLD 2.0 (Ac) ++# PLD Linux 2.0 (Ac) +[source] +type = %{_type} -+name = ac ++name = ac-main +path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/ +signed = yes -+# buggy deps -- use one from updates instead -+ignore = msmtp-sendmail* +pri = 1 ++# msmtp-sendmail is broken, yum noarch is older than in updates ++ignore = msmtp-sendmail* yum* + +[source] +type = %{_type} @@ -97,14 +100,15 @@ +type = %{_type} +name = ac-supported +path = %{_prefix}/supported/%{_arch}/ ++signed = yes +auto = no +autoup = no -+signed = yes + +[source] +type = %{_type} +name = ac-ready +path = %{_pld_main_prefix}/ready/%{_arch}/ ++#signed = yes +auto = no +autoup = no + @@ -114,171 +118,171 @@ +path = %{_pld_main_prefix}/test/%{_arch}/ +auto = no +autoup = no ---- util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2008-04-29 23:36:23.674175489 +0300 -@@ -0,0 +1,6 @@ ++ ++# ac-main + ac-updates ++[source] ++type = group ++name = ac ++sources = ac-main ac-updates +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros.lang util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros.lang +--- util-vserver-0.30.216-pre3126.org/distrib/pld-ac/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-ac/rpm/macros.lang 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 +# you have to use at least one language beside 'C' +%_install_langs C:en:pl -+%_netsharedpath /dev -+%_tmppath /tmp -+%_host_os %_os ---- util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2008-03-25 23:05:18.538916218 +0200 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/pkgs/01 util-vserver-0.30.216-pre3126/distrib/pld-th/pkgs/01 +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/pkgs/01 2021-03-12 21:50:25.804347699 +0100 @@ -0,0 +1,6 @@ +basesystem +filesystem -+glibc-misc ++glibc +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2008-03-26 00:27:05.335185240 +0200 -@@ -0,0 +1,65 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/poldek/repos.d/pld.conf util-vserver-0.30.216-pre3126/distrib/pld-th/poldek/repos.d/pld.conf +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/poldek/repos.d/pld.conf 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,71 @@ +# PLD Linux Distribution . ++# ++# Main sources for PLD Linux 3.0 (Th) + ++# specify our packages architecture +_arch = %ARCH% -+_prefix = ftp://ftp.th.pld-linux.org/dists/th ++ ++# main PLD-site for often changed things (test, ready): ++_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th ++ +## Some mirrors +## You can use them if you have better connection there +# CI TASK: +#_prefix = ftp://ftp.task.pld-linux.org/dists/th ++_prefix = %{_pld_main_prefix} + -+_type = pndir -+ -+# PLD 3.0 (Th) ++# PLD Linux 3.0 (Th): main sources +[source] -+type = %{_type} ++type = pndir +name = th +path = %{_prefix}/PLD/%{_arch}/RPMS/ + +[source] -+type = %{_type} ++type = pndir +name = th +path = %{_prefix}/PLD/noarch/RPMS/ + -+#[source] -+#type = %{_type} -+#name = th-updates -+#path = %{_prefix}/updates/%{_arch}/RPMS/ -+# -+#[source] -+#type = %{_type} -+#name = th-updates -+#path = %{_prefix}/updates/noarch/RPMS/ -+ -+#[source] -+#type = %{_type} -+#name = th-supported -+#path = %{_prefix}/supported/%{_arch}/ -+#auto = no -+ -+[source] -+type = %{_type} -+name = th-ready -+path = %{_prefix}/ready/%{_arch}/RPMS/ -+auto = no -+autoup = no -+ -+[source] -+type = %{_type} -+name = th-ready -+path = %{_prefix}/ready/noarch/RPMS/ -+auto = no -+autoup = no -+ ++# PLD Linux 3.0 (Th): obsolete sources (kde3, ...) +[source] -+type = %{_type} -+name = th-test -+path = %{_prefix}/test/%{_arch}/RPMS/ ++type = pndir ++name = th-obsolete ++path = %{_prefix}/obsolete/%{_arch}/RPMS/ +auto = no +autoup = no + +[source] -+type = %{_type} -+name = th-test -+path = %{_prefix}/test/noarch/RPMS/ ++type = pndir ++name = th-obsolete ++path = %{_prefix}/obsolete/noarch/RPMS/ +auto = no +autoup = no ---- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100 -@@ -0,0 +1,6 @@ -+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 -+# you have to use at least one language beside 'C' -+%_install_langs C:en:pl -+%_netsharedpath /dev -+%_tmppath /tmp -+%_host_os %_os ---- util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.181172125 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2008-03-25 23:05:18.538916218 +0200 -@@ -0,0 +1,6 @@ -+basesystem -+filesystem -+glibc-misc -+issue -+rpm-base -+vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/repos.d/pld.conf 2007-11-15 23:20:48.217840583 +0100 -@@ -0,0 +1,46 @@ -+# PLD Titanium -+# Unofficial version of PLD Linux Distribution -+# http://www.pld-linux.org/Titanium -+ -+_arch = %ARCH% -+_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium -+ -+_type = pndir -+ -+[source] -+type = %{_type} -+name = titanium -+path = %{_prefix}/PLD/%{_arch}/RPMS/ -+ -+[source] -+type = %{_type} -+name = titanium -+path = %{_prefix}/PLD/noarch/RPMS/ + ++# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main) +[source] -+type = %{_type} -+name = titanium-ready -+path = %{_prefix}/ready/%{_arch}/RPMS/ ++type = pndir ++name = th-ready ++path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/ +auto = no +autoup = no + +[source] -+type = %{_type} -+name = titanium-ready -+path = %{_prefix}/ready/noarch/RPMS/ ++type = pndir ++name = th-ready ++path = %{_pld_main_prefix}/ready/noarch/RPMS/ +auto = no +autoup = no + ++# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready) +[source] -+type = %{_type} -+name = titanium-test -+path = %{_prefix}/test/%{_arch}/RPMS/ ++type = pndir ++name = th-test ++path = %{_pld_main_prefix}/test/%{_arch}/RPMS/ +auto = no +autoup = no + +[source] -+type = %{_type} -+name = titanium-test -+path = %{_prefix}/test/noarch/RPMS/ ++type = pndir ++name = th-test ++path = %{_pld_main_prefix}/test/noarch/RPMS/ +auto = no +autoup = no ---- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100 -@@ -0,0 +1,6 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ ++%_netsharedpath /dev:/proc ++%_tmppath /tmp ++%_host_os %_os +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros.lang util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros.lang +--- util-vserver-0.30.216-pre3126.org/distrib/pld-th/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/pld-th/rpm/macros.lang 2021-03-12 21:50:25.804347699 +0100 +@@ -0,0 +1,3 @@ +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 +# you have to use at least one language beside 'C' +%_install_langs C:en:pl -+%_netsharedpath /dev -+%_tmppath /tmp -+%_host_os %_os ---- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100 -@@ -403,6 +403,20 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/Makefile-files util-vserver-0.30.216-pre3126/scripts/Makefile-files +--- util-vserver-0.30.216-pre3126.org/scripts/Makefile-files 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/Makefile-files 2021-03-12 21:50:25.804347699 +0100 +@@ -21,6 +21,7 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + scripts/vapt-get-worker \ + scripts/vrpm-worker \ + scripts/vyum-worker \ ++ scripts/vpoldek-worker \ + scripts/vrpm-preload \ + scripts/vurpm-worker \ + scripts/save_s_context \ +@@ -50,12 +51,14 @@ scripts_pkglib_src_DTA = scripts/functio + scripts/vserver-build.template \ + scripts/vserver-build.rsync \ + scripts/vserver-build.clone \ ++ scripts/vserver-build.poldek \ + scripts/vserver-build.functions \ + scripts/vserver-build.functions.apt \ + scripts/vserver-build.functions.pkgmgmt \ + scripts/vserver-build.functions.rpm \ + scripts/vserver-build.functions.urpmi \ + scripts/vserver-build.functions.yum \ ++ scripts/vserver-build.functions.poldek \ + scripts/vserver-setup.functions \ + scripts/vserver.functions \ + scripts/vserver.start \ +@@ -71,6 +74,7 @@ scripts_pkglib_gen_SCRPTS = scripts/vshe + scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ + scripts/vapt-get-worker \ + scripts/vpkg \ ++ scripts/vpoldek-worker \ + scripts/vrpm-worker \ + scripts/vrpm-preload \ + scripts/start-vservers \ +@@ -94,6 +98,7 @@ scripts_legacy_src_PRGS = scripts/legacy + scripts_sbin_src_PRGS = scripts/chbind \ + scripts/chcontext \ + scripts/vapt-get \ ++ scripts/vpoldek \ + scripts/vdispatch-conf \ + scripts/vemerge \ + scripts/vesync \ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/functions util-vserver-0.30.216-pre3126/scripts/functions +--- util-vserver-0.30.216-pre3126.org/scripts/functions 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/functions 2021-03-12 21:50:25.804347699 +0100 +@@ -411,6 +411,20 @@ function _pkgSetVarsUrpmi fi } @@ -299,15 +303,15 @@ function _pkgMountBase { -@@ -476,6 +490,7 @@ - rpm) _pkgSetVarsRPM;; +@@ -495,6 +509,7 @@ function pkgInit apt) _pkgSetVarsApt;; yum) _pkgSetVarsYum;; + urpmi) _pkgSetVarsUrpmi;; + poldek) _pkgSetVarsPoldek;; *) echo "Unknown packaging flavor" >&2; exit 1;; esac done -@@ -764,6 +779,8 @@ +@@ -869,6 +884,8 @@ function pkgmgmt.guessStyle() style=redhat elif test -e "$_pgs_vdir"/etc/mandrake-release; then style=mandrake @@ -316,8 +320,8 @@ elif test -e "$_pgs_vdir"/etc/debian_version; then style=debian elif test -e "$_pgs_vdir"/etc/SuSE-release; then -@@ -831,6 +848,27 @@ - test -n "$have_yum" && return 0 || return 1 +@@ -957,6 +974,27 @@ function pkgmgmt.isUrpmiAvailable + test -n "$have_urpmi" && return 0 || return 1 } +## Usage: pkgmgmt.isPoldekAvailable [] @@ -344,70 +348,31 @@ function vshelper.doSanityCheck { ---- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100 -@@ -21,6 +21,7 @@ - scripts/vapt-get-worker \ - scripts/vrpm-worker \ - scripts/vyum-worker \ -+ scripts/vpoldek-worker \ - scripts/vrpm-preload \ - scripts/save_s_context \ - scripts/vservers.grabinfo.sh \ -@@ -47,11 +48,13 @@ - scripts/vserver-build.template \ - scripts/vserver-build.rsync \ - scripts/vserver-build.clone \ -+ scripts/vserver-build.poldek \ - scripts/vserver-build.functions \ - scripts/vserver-build.functions.apt \ - scripts/vserver-build.functions.rpm \ - scripts/vserver-build.functions.pkgmgmt \ - scripts/vserver-build.functions.yum \ -+ scripts/vserver-build.functions.poldek \ - scripts/vserver-setup.functions \ - scripts/vserver.functions \ - scripts/vserver.start \ -@@ -65,6 +68,7 @@ - scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ - scripts/vapt-get-worker \ - scripts/vpkg \ -+ scripts/vpoldek-worker \ - scripts/vrpm-worker \ - scripts/vrpm-preload \ - scripts/start-vservers \ -@@ -88,6 +92,7 @@ - scripts_sbin_src_PRGS = scripts/chbind \ - scripts/chcontext \ - scripts/vapt-get \ -+ scripts/vpoldek \ - scripts/vdispatch-conf \ - scripts/vemerge \ - scripts/vesync \ ---- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100 -@@ -195,7 +195,7 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/pkgmgmt util-vserver-0.30.216-pre3126/scripts/pkgmgmt +--- util-vserver-0.30.216-pre3126.org/scripts/pkgmgmt 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/pkgmgmt 2021-03-12 21:50:25.804347699 +0100 +@@ -195,7 +195,7 @@ packagemanagement: " case $2 in -- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}") -+ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}") +- (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi "${YUM_RELEASEPKGS[@]}") ++ (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi poldek "${YUM_RELEASEPKGS[@]}") hasSubstring "$pkgs" ---rpm--- || { warning "$ERR * The vserver does not seem to have the 'rpm' package which is required -@@ -205,9 +205,9 @@ +@@ -205,9 +205,9 @@ packagemanagement: ERR= } -- hasSubstring "$pkgs" ---apt--- ---yum--- || { -+ hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || { +- hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- || { ++ hasSubstring "$pkgs" ---apt--- ---yum--- ---urpmi--- ---poldek--- || { warning "$ERR -* The vserver does not seem to have a depsolver like 'apt' or 'yum' +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek' installed. It is suggested to install such a program before setting up internal package management." res=1 -@@ -368,6 +368,131 @@ +@@ -381,6 +381,131 @@ Can not continue; use '--force' to overr fi } @@ -539,7 +504,7 @@ function processVserver_Debian() { local vserver=$1 -@@ -422,6 +547,7 @@ +@@ -435,6 +560,7 @@ function processVserver() case "$style" in (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";; @@ -547,28 +512,30 @@ (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";; (*) echo $"Vserver style '$style' is not supported for packagemanagment" >&2 ---- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100 -@@ -53,6 +53,7 @@ - _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm" - _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum" - _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt" -+_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek" +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.216-pre3126/scripts/util-vserver-vars.pathsubst +--- util-vserver-0.30.216-pre3126.org/scripts/util-vserver-vars.pathsubst 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/util-vserver-vars.pathsubst 2021-03-12 21:50:25.807681091 +0100 +@@ -58,6 +58,7 @@ _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKG + _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGDATADIR/vserver-build.functions.yum" + _LIB_VSERVER_BUILD_FUNCTIONS_URPMI="$__PKGDATADIR/vserver-build.functions.urpmi" + _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGDATADIR/vserver-build.functions.pkgmgmt" ++_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGDATADIR/vserver-build.functions.poldek" _LISTDEVIP="$__LEGACYDIR/listdevip" - _LOCKFILE="$__PKGLIBDIR/lockfile" - _MASK2PREFIX="$__PKGLIBDIR/mask2prefix" -@@ -105,6 +106,8 @@ - _VUNIFY="$__PKGLIBDIR/vunify" + _LOCKFILE="$__PKGLIBEXECDIR/lockfile" + _MASK2PREFIX="$__PKGLIBEXECDIR/mask2prefix" +@@ -116,6 +117,8 @@ _VURPM="$__SBINDIR/vurpm" + _VURPM_WORKER="$__PKGLIBEXECDIR/vurpm-worker" _VYUM="$__SBINDIR/vyum" - _VYUM_WORKER="$__PKGLIBDIR/vyum-worker" + _VYUM_WORKER="$__PKGLIBEXECDIR/vyum-worker" +_VPOLDEK="$__SBINDIR/vpoldek" -+_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker" ++_VPOLDEK_WORKER="$__PKGLIBEXECDIR/vpoldek-worker" _AWK="@AWK@" _BZIP2="@BZIP2@" ---- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100 -@@ -115,6 +115,44 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpkg util-vserver-0.30.216-pre3126/scripts/vpkg +--- util-vserver-0.30.216-pre3126.org/scripts/vpkg 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vpkg 2021-03-12 21:50:25.807681091 +0100 +@@ -115,6 +115,44 @@ case "$style" in fi fi ;; @@ -613,8 +580,9 @@ (debian) case "$tag" in (get-conffiles) ---- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpoldek util-vserver-0.30.216-pre3126/scripts/vpoldek +--- util-vserver-0.30.216-pre3126.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vpoldek 2021-03-12 21:50:25.807681091 +0100 @@ -0,0 +1,74 @@ +#! /bin/bash +# $Id$ @@ -634,7 +602,7 @@ +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + -+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} ++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 + exit 1 @@ -690,8 +658,9 @@ + +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- ) +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@" ---- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vpoldek-worker util-vserver-0.30.216-pre3126/scripts/vpoldek-worker +--- util-vserver-0.30.216-pre3126.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vpoldek-worker 2021-03-12 21:50:25.807681091 +0100 @@ -0,0 +1,45 @@ +#! /bin/bash +# $Id$ @@ -713,7 +682,7 @@ + +set -e + -+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} ++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 + exit 1 @@ -738,30 +707,32 @@ + --conf=$POLDEK_CONFIG \ + --pmcmd=$RPM_BINARY \ + "$@" ---- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100 -@@ -57,6 +57,9 @@ - yum ... -- -d +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build util-vserver-0.30.216-pre3126/scripts/vserver-build +--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build 2021-03-12 21:50:25.807681091 +0100 +@@ -60,6 +60,9 @@ Possible methods are: ... installs the base-packages of the given distribution with help of 'vyum' + urpmi ... -- -d -m + poldek ... -- -d + ... installs the base-packages of the given distribution with + help of 'vpoldek' rpm ... -- [-d ] --empty|([--force] [--nodeps] )+ ... installs lists of rpm-packages skeleton ... -- [ *] -@@ -136,7 +139,7 @@ +@@ -142,7 +145,7 @@ setup_setDefaults "$VSERVER_NAME" case x"$method" in (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; -- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone) -+ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek) - . $__PKGLIBDIR/vserver-build.$method +- (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi) ++ (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek) + . $__PKGDATADIR/vserver-build.$method ;; (x) panic $"No build-method specified";; ---- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200 -+++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100 -@@ -167,6 +167,12 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions util-vserver-0.30.216-pre3126/scripts/vserver-build.functions +--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.functions 2021-03-12 21:50:25.807681091 +0100 +@@ -173,6 +173,12 @@ function getDistribution elif test -e /etc/slackware-version; then set -- $(cat /etc/slackware-version) DISTRIBUTION=slackware$2 @@ -774,9 +745,10 @@ elif test -n "$1"; then DISTRIBUTION=$1 else ---- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200 -+++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200 -@@ -0,0 +1,81 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions.poldek util-vserver-0.30.216-pre3126/scripts/vserver-build.functions.poldek +--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.functions.poldek 2021-03-12 21:50:25.807681091 +0100 +@@ -0,0 +1,83 @@ +# $Id$ --*- sh -*-- + +# Copyright (C) 2003 Enrico Scholz @@ -855,11 +827,14 @@ + sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf + fi + -+# test -z "$POLDEKCONFDEFAULT" || \ -+# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/ ++ if [ "$DISTRIBUTION" = "pld-ac" ]; then ++ echo 'auto directory dependencies = no' >> "$PKGCFGDIR"/poldek/etc/poldek.conf ++ echo '%_check_dirname_deps 0' >> "$PKGCFGDIR"/rpm/etc/macros ++ fi +} ---- util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100 -+++ util-vserver-0.30.214/scripts/vserver-build.poldek 2008-03-25 20:25:23.000000000 +0200 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver-build.poldek util-vserver-0.30.216-pre3126/scripts/vserver-build.poldek +--- util-vserver-0.30.216-pre3126.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build.poldek 2021-03-12 21:50:25.807681091 +0100 @@ -0,0 +1,65 @@ +# $Id$ --*- sh -*-- +