From 40303baa1ac602c25a7cd9e8427c664e22d5e0b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 12 Mar 2021 21:59:43 +0100 Subject: [PATCH] - rediff patches --- util-vserver-build-umask.patch | 9 +- util-vserver-dev.patch | 11 +- util-vserver-more-ip.patch | 20 +-- util-vserver-no-dynamic-ctx.patch | 18 +-- util-vserver-pld.patch | 243 ++++++++++++++++-------------- util-vserver-rpm5.patch | 55 +++---- util-vserver-rpmpath.patch | 9 +- util-vserver.spec | 1 + 8 files changed, 197 insertions(+), 169 deletions(-) diff --git a/util-vserver-build-umask.patch b/util-vserver-build-umask.patch index 487eedf..b293327 100644 --- a/util-vserver-build-umask.patch +++ b/util-vserver-build-umask.patch @@ -1,6 +1,7 @@ ---- util-vserver-0.30.208/scripts/vserver-build~ 2005-08-15 21:15:55.737388075 +0200 -+++ util-vserver-0.30.208.umask/scripts/vserver-build 2005-08-15 22:46:47.439347258 +0200 -@@ -127,6 +127,12 @@ +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 2021-03-12 21:50:26.901033782 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build 2021-03-12 21:50:26.994368768 +0100 +@@ -143,6 +143,12 @@ test -n "$VSERVER_NAME" || setup_setDefaults "$VSERVER_NAME" @@ -12,4 +13,4 @@ + case x"$method" in (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xpoldek) + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek) diff --git a/util-vserver-dev.patch b/util-vserver-dev.patch index bf58802..0114baf 100644 --- a/util-vserver-dev.patch +++ b/util-vserver-dev.patch @@ -1,7 +1,8 @@ ---- ./distrib/defaults/devs~ 2006-03-03 23:33:43.000000000 +0200 -+++ ./distrib/defaults/devs 2006-03-06 13:11:37.374244805 +0200 -@@ -5,3 +5,4 @@ - ptmx c 5 2 666 - fd l ../proc/self/fd 777 +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/distrib/defaults/devs util-vserver-0.30.216-pre3126/distrib/defaults/devs +--- util-vserver-0.30.216-pre3126.org/distrib/defaults/devs 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/distrib/defaults/devs 2021-03-12 21:50:27.467710498 +0100 +@@ -10,3 +10,4 @@ stdin l fd/0 777 + stdout l fd/1 777 + stderr l fd/2 777 shm d 1777 +tty0 c 4 0 660 diff --git a/util-vserver-more-ip.patch b/util-vserver-more-ip.patch index 769f64f..e0d6f51 100644 --- a/util-vserver-more-ip.patch +++ b/util-vserver-more-ip.patch @@ -1,20 +1,20 @@ -diff -urN util-vserver-0.30.210.org/kernel/network.h util-vserver-0.30.210/kernel/network.h ---- util-vserver-0.30.210.org/kernel/network.h 2006-01-02 23:16:34.000000000 +0100 -+++ util-vserver-0.30.210/kernel/network.h 2006-05-15 10:18:29.390612500 +0200 -@@ -8,7 +8,7 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/kernel/network.h util-vserver-0.30.216-pre3126/kernel/network.h +--- util-vserver-0.30.216-pre3126.org/kernel/network.h 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/kernel/network.h 2021-03-12 21:50:27.954385798 +0100 +@@ -6,7 +6,7 @@ - #define NX_DYNAMIC_ID ((uint32_t)-1) /* id for dynamic context */ + #define MAX_N_CONTEXT 65535 /* Arbitrary limit */ -#define NB_IPV4ROOT 16 +#define NB_IPV4ROOT 128 /* network flags */ -diff -urN util-vserver-0.30.210.org/src/chbind.c util-vserver-0.30.210/src/chbind.c ---- util-vserver-0.30.210.org/src/chbind.c 2006-01-22 19:17:24.000000000 +0100 -+++ util-vserver-0.30.210/src/chbind.c 2006-05-15 10:18:00.285703875 +0200 -@@ -322,7 +322,7 @@ - #endif +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/src/chbind.c util-vserver-0.30.216-pre3126/src/chbind.c +--- util-vserver-0.30.216-pre3126.org/src/chbind.c 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/src/chbind.c 2021-03-12 21:50:27.954385798 +0100 +@@ -262,7 +262,7 @@ int main (int argc, char *argv[]) + case CMD_NID : WRITE_MSG(2, "WARNING: --nid is not supported by this version\n"); break; case CMD_IP : if (nbaddrs>=nb_ipv4root) { - WRITE_MSG(2, "Too many IP numbers, max 16\n"); diff --git a/util-vserver-no-dynamic-ctx.patch b/util-vserver-no-dynamic-ctx.patch index 4d4f9d6..d747d10 100644 --- a/util-vserver-no-dynamic-ctx.patch +++ b/util-vserver-no-dynamic-ctx.patch @@ -1,7 +1,7 @@ -diff -ur util-vserver-0.30.210.orig/scripts/vserver-build util-vserver-0.30.210/scripts/vserver-build ---- util-vserver-0.30.210.orig/scripts/vserver-build 2006-04-18 18:10:30.000000000 +0200 -+++ util-vserver-0.30.210/scripts/vserver-build 2006-04-18 18:37:37.000000000 +0200 -@@ -122,6 +122,9 @@ +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 2021-03-12 21:50:27.621046552 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver-build 2021-03-12 21:50:27.707714756 +0100 +@@ -138,6 +138,9 @@ while true; do shift done @@ -11,10 +11,10 @@ diff -ur util-vserver-0.30.210.orig/scripts/vserver-build util-vserver-0.30.210/ test -n "$VSERVER_NAME" || panic $"Name of vserver not specified" -diff -ur util-vserver-0.30.210.orig/scripts/vserver.functions util-vserver-0.30.210/scripts/vserver.functions ---- util-vserver-0.30.210.orig/scripts/vserver.functions 2006-04-18 18:10:30.000000000 +0200 -+++ util-vserver-0.30.210/scripts/vserver.functions 2006-04-18 19:04:07.000000000 +0200 -@@ -365,6 +365,10 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vserver.functions util-vserver-0.30.216-pre3126/scripts/vserver.functions +--- util-vserver-0.30.216-pre3126.org/scripts/vserver.functions 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vserver.functions 2021-03-12 21:50:27.707714756 +0100 +@@ -455,6 +455,10 @@ function _generateChcontextOptions test -z "$S_CONTEXT" || ctx=$S_CONTEXT @@ -24,4 +24,4 @@ diff -ur util-vserver-0.30.210.orig/scripts/vserver.functions util-vserver-0.30. + _generateCapabilityOptions "$vdir" _generateFlagOptions "$vdir" - + _generateUMaskOptions "$vdir" diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 44c3c04..81700f0 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -1,20 +1,7 @@ ---- util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf 2009-06-22 17:48:26.000000000 +0200 -@@ -0,0 +1,11 @@ -+# poldek configuration file. -+ -+%includedir repos.d -+ -+[global] -+particle install = no -+choose equivalents manually = yes -+unique package names = yes -+ -+#hold = -+ignore = kernel* udev devfs ---- util-vserver-0.30.216-r2837.orig/distrib/Makefile.am 2009-06-22 17:36:52.000000000 +0200 -+++ util-vserver-0.30.216-r2837/distrib/Makefile.am 2009-06-22 17:49:36.000000000 +0200 -@@ -45,6 +45,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 \ @@ -22,7 +9,7 @@ template/initpost template/initpre \ rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ -@@ -85,7 +86,9 @@ +@@ -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 \ @@ -33,7 +20,7 @@ nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ -@@ -95,7 +99,9 @@ +@@ -106,7 +109,9 @@ nobase_confdistrib_DATA = rh9/apt/sourc fc5/apt/sources.list \ fc6/apt/sources.list \ f7/apt/sources.list \ @@ -44,8 +31,24 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01 2009-06-22 17:48:26.000000000 +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. ++ ++%includedir repos.d ++ ++[global] ++particle install = no ++choose equivalents manually = yes ++unique package names = yes ++ ++#hold = ++ignore = kernel* udev devfs +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 @@ -53,8 +56,9 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200 +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 . @@ -120,20 +124,23 @@ +type = group +name = ac +sources = ac-main ac-updates ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros 2009-06-22 17:48:26.000000000 +0200 +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 ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200 +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 ---- util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01 2009-06-22 17:48:26.000000000 +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 @@ -141,8 +148,9 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200 +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 . +# @@ -215,21 +223,66 @@ +path = %{_pld_main_prefix}/test/noarch/RPMS/ +auto = no +autoup = no ---- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros 2009-06-22 17:48:26.000000000 +0200 +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 ---- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros.lang 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200 +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 ---- util-vserver-0.30.216-r2837.orig/scripts/functions 2009-06-22 17:36:35.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/functions 2009-06-22 17:48:26.000000000 +0200 -@@ -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 } @@ -250,7 +303,7 @@ function _pkgMountBase { -@@ -476,6 +490,7 @@ +@@ -495,6 +509,7 @@ function pkgInit apt) _pkgSetVarsApt;; yum) _pkgSetVarsYum;; urpmi) _pkgSetVarsUrpmi;; @@ -258,7 +311,7 @@ *) echo "Unknown packaging flavor" >&2; exit 1;; esac done -@@ -770,6 +785,8 @@ +@@ -869,6 +884,8 @@ function pkgmgmt.guessStyle() style=redhat elif test -e "$_pgs_vdir"/etc/mandrake-release; then style=mandrake @@ -267,8 +320,8 @@ elif test -e "$_pgs_vdir"/etc/debian_version; then style=debian elif test -e "$_pgs_vdir"/etc/SuSE-release; then -@@ -837,6 +854,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 [] @@ -295,50 +348,10 @@ function vshelper.doSanityCheck { ---- util-vserver-0.30.216-r2837.orig/scripts/Makefile-files 2009-06-22 17:36:35.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/Makefile-files 2009-06-22 17:48:26.000000000 +0200 -@@ -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 \ -@@ -48,12 +49,14 @@ - 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 \ -@@ -66,6 +69,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 \ -@@ -89,6 +93,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.216-r2837.orig/scripts/pkgmgmt 2009-06-22 17:36:34.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/pkgmgmt 2009-06-22 17:48:26.000000000 +0200 -@@ -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 @@ -347,7 +360,7 @@ 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= } @@ -359,7 +372,7 @@ 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 } @@ -491,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";; @@ -499,9 +512,10 @@ (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";; (*) echo $"Vserver style '$style' is not supported for packagemanagment" >&2 ---- util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst 2009-06-22 17:36:34.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst 2009-06-22 17:48:26.000000000 +0200 -@@ -58,6 +58,7 @@ +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" @@ -509,7 +523,7 @@ _LISTDEVIP="$__LEGACYDIR/listdevip" _LOCKFILE="$__PKGLIBEXECDIR/lockfile" _MASK2PREFIX="$__PKGLIBEXECDIR/mask2prefix" -@@ -116,6 +117,8 @@ +@@ -116,6 +117,8 @@ _VURPM="$__SBINDIR/vurpm" _VURPM_WORKER="$__PKGLIBEXECDIR/vurpm-worker" _VYUM="$__SBINDIR/vyum" _VYUM_WORKER="$__PKGLIBEXECDIR/vyum-worker" @@ -518,9 +532,10 @@ _AWK="@AWK@" _BZIP2="@BZIP2@" ---- util-vserver-0.30.216-r2837.orig/scripts/vpkg 2009-06-22 17:36:34.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/vpkg 2009-06-22 17:48:26.000000000 +0200 -@@ -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 ;; @@ -565,8 +580,9 @@ (debian) case "$tag" in (get-conffiles) ---- util-vserver-0.30.216-r2837.orig/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/scripts/vpoldek 2009-06-22 17:48:26.000000000 +0200 +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$ @@ -642,8 +658,9 @@ + +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- ) +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@" ---- util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/scripts/vpoldek-worker 2009-06-22 17:48:26.000000000 +0200 +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$ @@ -690,9 +707,10 @@ + --conf=$POLDEK_CONFIG \ + --pmcmd=$RPM_BINARY \ + "$@" ---- util-vserver-0.30.216-r2837.orig/scripts/vserver-build 2009-06-22 17:36:34.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/vserver-build 2009-06-22 17:48:26.000000000 +0200 -@@ -57,6 +57,9 @@ +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 @@ -702,7 +720,7 @@ rpm ... -- [-d ] --empty|([--force] [--nodeps] )+ ... installs lists of rpm-packages skeleton ... -- [ *] -@@ -145,7 +145,7 @@ +@@ -142,7 +145,7 @@ setup_setDefaults "$VSERVER_NAME" case x"$method" in (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; @@ -711,9 +729,10 @@ . $__PKGDATADIR/vserver-build.$method ;; (x) panic $"No build-method specified";; ---- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions 2009-06-22 17:36:35.000000000 +0200 -+++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions 2009-06-22 17:48:26.000000000 +0200 -@@ -170,6 +170,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 @@ -726,8 +745,9 @@ elif test -n "$1"; then DISTRIBUTION=$1 else ---- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek 2009-06-22 17:48:26.000000000 +0200 +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 -*-- + @@ -812,8 +832,9 @@ + echo '%_check_dirname_deps 0' >> "$PKGCFGDIR"/rpm/etc/macros + fi +} ---- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/scripts/vserver-build.poldek 2009-06-22 17:48:26.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 -*-- + diff --git a/util-vserver-rpm5.patch b/util-vserver-rpm5.patch index 5ac07a2..f18aa27 100644 --- a/util-vserver-rpm5.patch +++ b/util-vserver-rpm5.patch @@ -1,8 +1,28 @@ ---- util-vserver-0.30.216-pre3034/scripts/vrpm.orig 2012-04-24 11:48:10.000000000 +0200 -+++ util-vserver-0.30.216-pre3034/scripts/vrpm 2012-10-12 18:44:57.137928223 +0200 -@@ -46,6 +46,9 @@ +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 2021-03-12 21:50:31.004440077 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/Makefile-files 2021-03-12 21:50:31.127775612 +0100 +@@ -20,6 +20,7 @@ + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + scripts/vapt-get-worker \ + scripts/vrpm-worker \ ++ scripts/vrpm-convertdb-worker \ + scripts/vyum-worker \ + scripts/vpoldek-worker \ + scripts/vrpm-preload \ +@@ -76,6 +77,7 @@ scripts_pkglib_src_SCRPTS = scripts/pkgm + scripts/vpkg \ + scripts/vpoldek-worker \ + scripts/vrpm-worker \ ++ scripts/vrpm-convertdb-worker \ + scripts/vrpm-preload \ + scripts/start-vservers \ + scripts/vprocunhide \ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vrpm util-vserver-0.30.216-pre3126/scripts/vrpm +--- util-vserver-0.30.216-pre3126.org/scripts/vrpm 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vrpm 2021-03-12 21:50:31.127775612 +0100 +@@ -46,6 +46,9 @@ the GNU General Public License. This pr exit 0 - } + } +rpmversion=$(awk '/^%_rpmversion/ { split($2,ver,/\./); print ver[1] }' /usr/lib/rpm/macros 2>/dev/null) +[ -z "$rpmversion" ] && rpmversion=5 @@ -10,7 +30,7 @@ tmp=$(getopt -o +q --long help,version,debug,quiet,$VS_ALLVSERVERS_ARGS -n "$0" -- "$@") || exit 1 eval set -- "$tmp" -@@ -70,4 +73,15 @@ +@@ -70,4 +73,15 @@ VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) @@ -26,9 +46,10 @@ + fi +fi exec $_VSOMETHING "${send_through[@]}" rpm "${vsomething_opts[@]}" "$@" ---- /dev/null 2012-04-24 11:48:10.000000000 +0200 -+++ util-vserver-0.30.216-pre3034/scripts/vrpm-convertdb-worker 2012-10-12 18:44:57.137928223 +0200 -@@ -0,0 +0,18 @@ +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vrpm-convertdb-worker util-vserver-0.30.216-pre3126/scripts/vrpm-convertdb-worker +--- util-vserver-0.30.216-pre3126.org/scripts/vrpm-convertdb-worker 1970-01-01 01:00:00.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vrpm-convertdb-worker 2021-03-12 21:50:31.127775612 +0100 +@@ -0,0 +1,18 @@ +#!/bin/bash + +set -e @@ -47,21 +68,3 @@ +pkgInit "$vserver" rpm + +exec /usr/lib/rpm/bin/dbupgrade.sh -r "$VDIR" "$@" ---- util-vserver-0.30.216-pre3034/scripts/Makefile-files.orig 2012-04-24 11:48:10.000000000 +0200 -+++ util-vserver-0.30.216-pre3034/scripts/Makefile-files 2012-10-12 18:44:57.137928223 +0200 -@@ -10,6 +10,7 @@ - AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ - scripts/vapt-get-worker \ - scripts/vrpm-worker \ -+ scripts/vrpm-convertdb-worker \ - scripts/vyum-worker \ - scripts/vpoldek-worker \ - scripts/vrpm-preload \ -@@ -74,6 +74,7 @@ - scripts/vpkg \ - scripts/vpoldek-worker \ - scripts/vrpm-worker \ -+ scripts/vrpm-convertdb-worker \ - scripts/vrpm-preload \ - scripts/start-vservers \ - scripts/vprocunhide \ diff --git a/util-vserver-rpmpath.patch b/util-vserver-rpmpath.patch index 100abc5..b0ae389 100644 --- a/util-vserver-rpmpath.patch +++ b/util-vserver-rpmpath.patch @@ -1,7 +1,8 @@ ---- util-vserver-0.30.212/scripts/vrpm-preload~ 2007-11-07 12:24:38.000000000 +0200 -+++ util-vserver-0.30.212/scripts/vrpm-preload 2007-11-07 12:25:09.260798172 +0200 -@@ -27,7 +27,7 @@ - . $__PKGLIBDIR/vserver.functions +diff -urNp -x '*.orig' util-vserver-0.30.216-pre3126.org/scripts/vrpm-preload util-vserver-0.30.216-pre3126/scripts/vrpm-preload +--- util-vserver-0.30.216-pre3126.org/scripts/vrpm-preload 2016-02-24 19:09:17.000000000 +0100 ++++ util-vserver-0.30.216-pre3126/scripts/vrpm-preload 2021-03-12 21:50:28.704399123 +0100 +@@ -26,7 +26,7 @@ test -e "$UTIL_VSERVER_VARS" || { + . "$UTIL_VSERVER_VARS" . "$_LIB_FUNCTIONS" -for bin in `which rpm` /bin/rpm /usr/lib/rpm/rpm${RPM_FLAVOR:-i} ""; do diff --git a/util-vserver.spec b/util-vserver.spec index 831753a..0c5fcfd 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -103,6 +103,7 @@ BuildRequires: doxygen >= 1:1.7.3 BuildRequires: graphviz BuildRequires: libxslt-progs BuildRequires: python-devel +BuildRequires: tex-latex-adjustbox %if "%{pld_release}" != "th" BuildRequires: tetex-fonts-jknappen BuildRequires: tetex-format-pdflatex -- 2.43.0