X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=5ff6e65b364144f9074bbc4891ad84b57ca177e2;hb=f107a0ccee6998e7ba77d3125e08a3e65acc8358;hp=48bcfc168f41d6eebf5c8fb567cfc1a6d7a19438;hpb=e94d4df02eff0b2e4eade86fbd6f85bb9898616d;p=packages%2Futil-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 48bcfc1..5ff6e65 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,7 +1,18 @@ # TODO -# - somewhy empty /var/cache/vservers is needed when building pld vserver # - make build create /dev/std{in,out,err} links -# - reject install in %pre if /proc/virtual/info has incompatible version +# - reject install in %%pretrans if /proc/virtual/info has incompatible version +# - unpackaged +# /etc/rc.d/init.d/util-vserver -- # integrate to our initscript (util-vserver sets the path to vshelper and kills all guest processes) +# - move to main pkg: +# vserver initng delete +# /usr/lib64/util-vserver/vserver.delete: line 19: /usr/lib64/util-vserver/vserver-build.functions: No such file or directory +# /usr/lib64/util-vserver/vserver.delete: line 20: /usr/lib64/util-vserver/vserver-build.functions.pkgmgmt: No such file or directory +# or move the delete func to -build +# - make pkgmgmnt internalize modify poldek conf to unignore vserver-packages +# - service vservers stop should shutdown all running vservers (respecting +# configuration for order) otherwise on shutdown vservers are not nicely +# shutdown! +# - when building ac quest on th, the platform file for x8664 archidecture is wrong # # m68k and mips are the only not supported archs # @@ -11,19 +22,19 @@ %bcond_without no_dynamic_context # disable enforcement of disabled dynamic context %bcond_with xalan # use the xalan xslt processor # -%define _vproc_version 0.01 +%define vproc_version 0.01 # diet compile fails with ccache in %{__cc} %undefine with_ccache # Summary: Linux virtual server utilities Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver -Version: 0.30.214 -Release: 4 +Version: 0.30.215 +Release: 9.2 License: GPL Group: Applications/System Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2 -# Source0-md5: 8bad879e36a6a1b9b4858d0d6d3c8c76 +# Source0-md5: befd9b8e5311e87395b67ee381d83649 Source1: vprocunhide.init Source2: vservers.init Source3: vservers-legacy.init @@ -36,12 +47,17 @@ Source8: vrootdevices.sysconfig # http://www.paul.sladen.org/vserver/archives/200505/0078.html Source9: %{name}-pkgmgmt.txt Source10: %{name}-initpost.sh -Source11: http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_version}.tar.bz2 +Source11: http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{vproc_version}.tar.bz2 # Source11-md5: 1d030717bdbc958ea4b35fd2410dad85 Source12: %{name}-vhashify.cron +Source13: ftp://ftp.pld-linux.org/dists/ac/PLD-2.0-Ac-GPG-key.asc +# Source13-md5: 8e7574d1de2fa95c2c54cd2ee03364c1 +Source14: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc +# Source14-md5: 08b29584dd349aac9caa7610131a0a88 Patch0: %{name}-vsysvwrapper.patch Patch1: %{name}-pld.patch Patch4: %{name}-m4-diet.patch +Patch5: %{name}-yum-verb-nogpg.patch Patch6: %{name}-build-umask.patch Patch7: %{name}-utmpx.patch Patch8: %{name}-vprocunhide.patch @@ -50,6 +66,13 @@ Patch10: %{name}-no-dynamic-ctx.patch Patch11: %{name}-more-ip.patch Patch12: %{name}-rpm-fake-resolver-badperm-errorlogging.patch Patch13: %{name}-tmpdir.patch +Patch14: %{name}-rpmpath.patch +Patch15: %{name}-interfaces-ignore-cvs-dir.patch +Patch16: %{name}-personalitymachine.patch +Patch17: %{name}-backupfiles.patch +Patch18: %{name}-trunk_fixes.patch +Patch19: %{name}-vprocunhide-net.patch +Patch20: %{name}-more-caps.patch URL: http://savannah.nongnu.org/projects/util-vserver/ BuildRequires: autoconf BuildRequires: automake >= 1.9 @@ -78,6 +101,7 @@ BuildRequires: tetex-metafont %endif Requires(post,preun): /sbin/chkconfig Requires: %{name}-lib = %{version}-%{release} +Requires: diffutils Requires: issue Requires: mktemp >= 1.5-18 Requires: rc-scripts @@ -86,6 +110,11 @@ Requires: util-linux Obsoletes: util-vserver-core BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%if %{with dietlibc} +# binaries created with this option have broken segments when using dietlibc +%define filterout_ld -Wl,-z,relro +%endif + # for adapter %define _usrbin /usr/bin %define _usrsbin /usr/sbin @@ -173,12 +202,7 @@ Summary: Tools which can be used to build vservers Summary(pl.UTF-8): Narzędzia do budowania vserverów Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: /etc/pld-release -# for ar, used by debbootstrap -Requires: binutils -Requires: e2fsprogs -Requires: wget -Requires: which +Requires: vserver-distro-pld = %{version}-%{release} Conflicts: poldek < 0.18.8-10 %description build @@ -257,18 +281,17 @@ w interakcję z innymi ani z usługami na głównym serwerze. Ten pakiet zawiera narzędzia potrzebne do pracy z Vserwerami mającymi konfigurację w starym stylu. -%package -n vserver-distro-debian -Summary: VServer build templates for Debian -Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Debian +%package -n vserver-distro-alpine +Summary: VServer build template for Alpine Linux +Summary(pl.UTF-8): Szablon budowania VServerów dla dystrybucji Alpine Linux Group: Applications/System Requires: %{name}-build = %{version}-%{release} -Requires: dpkg -%description -n vserver-distro-debian -VServer build templates for Debian. +%description -n vserver-distro-alpine +VServer build template for Alpine Linux. -%description -n vserver-distro-debian -l pl.UTF-8 -Szablony do tworzenia VServerów dla dystrybucji Debian. +%description -n vserver-distro-alpine -l pl.UTF-8 +Szablon budowania VServerów dla dystrybucji Alpine Linux. %package -n vserver-distro-centos Summary: VServer build template for CentOS @@ -283,6 +306,19 @@ VServer build template for CentOS 4.2 and 5. %description -n vserver-distro-centos -l pl.UTF-8 Szablon budowania VServerów dla dystrybucji CentOS 4.2 i 5. +%package -n vserver-distro-debian +Summary: VServer build templates for Debian +Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Debian +Group: Applications/System +Requires: %{name}-build = %{version}-%{release} +Requires: dpkg + +%description -n vserver-distro-debian +VServer build templates for Debian. + +%description -n vserver-distro-debian -l pl.UTF-8 +Szablony do tworzenia VServerów dla dystrybucji Debian. + %package -n vserver-distro-fedora Summary: VServer build templates for Fedora Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Fedora @@ -292,6 +328,7 @@ Requires: binutils Requires: e2fsprogs Requires: rpm Requires: wget +Requires: yum %description -n vserver-distro-fedora VServer build templates for Fedora Core 1,2,3,4,5,6 and Fedora 7. @@ -312,6 +349,20 @@ VServer build template for Gentoo. %description -n vserver-distro-gentoo -l pl.UTF-8 Szablon budowania VServerów dla Gentoo. +%package -n vserver-distro-pld +Summary: VServer build templates for PLD Linux +Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji PLD Linux +Group: Applications/System +Requires: %{name}-build = %{version}-%{release} +Requires: /etc/pld-release +Requires: poldek >= 0.30 + +%description -n vserver-distro-pld +VServer build templates for PLD Linux. + +%description -n vserver-distro-pld -l pl.UTF-8 +Szablony do tworzenia VServerów dla dystrybucji PLD Linux. + %package -n vserver-distro-redhat Summary: VServer build template for Red Hat Linux 9 Summary(pl.UTF-8): Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9 @@ -357,17 +408,12 @@ VServer build templates for Ubuntu. %description -n vserver-distro-ubuntu -l pl.UTF-8 Szablony do tworzenia VServerów dla dystrybucji Ubuntu. -%ifarch amd64 -%define _x8664name amd64 -%else -%define _x8664name x86_64 -%endif - %prep %setup -q -a11 %patch0 -p1 %patch1 -p1 %patch4 -p1 +%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -376,6 +422,13 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu. %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 install %{SOURCE9} package-management.txt @@ -385,6 +438,7 @@ unset LD_SYMBOLIC_FUNCTIONS || : %if %{with dietlibc} CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__" %endif +%{__libtoolize} %{__aclocal} -I m4 %{__automake} %{__autoconf} @@ -409,7 +463,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__" %{__make} all %{?with_doc:%{__make} doc} -%{__make} -C vproc-%{_vproc_version} \ +%{__make} -C vproc-%{vproc_version} \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" @@ -447,62 +501,218 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices -install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost -install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost -install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost -install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir} +install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld +install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/initpost +ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost +ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost +%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 +ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost +%endif +install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir} install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF 02 2 * * 0 root %{_libdir}/%{name}/vhashify.cron EOF -ln -sf null $RPM_BUILD_ROOT/dev/initctl +install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys +cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys/pld-ac.asc + +install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys +cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc +# set arch for pld-ac in pld.conf +%ifarch i586 i686 ppc sparc alpha athlon +%define ftp_arch %{_target_cpu} +%endif %ifarch %{x8664} -# ac i686 -cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686 -echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpm/platform -echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686/rpm/platform -cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac \ - $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686 -sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf - -# th i686 -cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686 -echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/rpm/platform -echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686/rpm/platform -cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th \ - $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686 -sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf - -# titanium i686 -cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686 -echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/rpm/platform -echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686/rpm/platform -cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti \ - $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686 -sed -i 's/%{_x8664name}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf - -# ac x86_64 -sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pkgs/01 -sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpmlist.d/00.lst -sed -i 's/x86_64/amd64/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf +%define ftp_arch amd64 %endif %ifarch i486 -sed -i 's/i486/i386/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf +%define ftp_arch i386 +%endif +%ifarch pentium2 pentium3 pentium4 +%define ftp_arch i686 +%endif +%ifarch sparcv9 sparc64 +%define ftp_arch sparc %endif +%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/pld.conf -# XXX baggins check this: needed but seems unused -install -d $RPM_BUILD_ROOT/var/cache/vservers +# set arch for pld-th in pld.conf +%ifarch i486 i686 ppc sparc alpha athlon +%define ftp_arch %{_target_cpu} +%endif +%ifarch %{x8664} +%define ftp_arch x86_64 +%endif +%ifarch i586 +%define ftp_arch i486 +%endif +%ifarch pentium2 pentium3 pentium4 +%define ftp_arch i686 +%endif +%ifarch sparcv9 sparc64 +%define ftp_arch sparc +%endif +%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf + +%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 +# set arch for pld-ti in pld.conf +%ifarch i586 i686 +%define ftp_arch %{_target_cpu} +%endif +%ifarch %{x8664} +%define ftp_arch x86_64 +%endif +%ifarch athlon pentium2 pentium3 pentium4 +%define ftp_arch i686 +%endif +%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf +%endif + +cd $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm +# first platform file entry can't contain regexps +echo x86_64-%{_target_vendor}-linux > platform.x86_64 +echo amd64-%{_target_vendor}-linux > platform.amd64 +echo athlon-%{_target_vendor}-linux > platform.athlon +echo i686-%{_target_vendor}-linux > platform.i686 +echo i486-%{_target_vendor}-linux > platform.i486 +echo i386-%{_target_vendor}-linux > platform.i386 +echo alpha-%{_target_vendor}-linux > platform.alpha +echo ppc-%{_target_vendor}-linux > platform.ppc +echo sparc-%{_target_vendor}-linux > platform.sparc + +ifarch() { + local arch buf=$(cat); + for arch in $*; do + echo "$buf" | tee -a platform.$arch + done +} + +# x86_64 things +ifarch x86_64 <> $a +done +cd - + +# now create arch compat lists +cd $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions +# ac ftp archs +ln defaults/rpm/platform.amd64 pld-ac/rpm/platform.amd64 +ln defaults/rpm/platform.alpha pld-ac/rpm/platform.alpha +ln defaults/rpm/platform.athlon pld-ac/rpm/platform.athlon +ln defaults/rpm/platform.sparc pld-ac/rpm/platform.sparc +ln defaults/rpm/platform.ppc pld-ac/rpm/platform.ppc +ln defaults/rpm/platform.i686 pld-ac/rpm/platform.i686 +ln defaults/rpm/platform.i586 pld-ac/rpm/platform.i586 +ln defaults/rpm/platform.i486 pld-ac/rpm/platform.i486 +ln defaults/rpm/platform.i386 pld-ac/rpm/platform.i386 +# th ftp archs +ln defaults/rpm/platform.x86_64 pld-th/rpm/platform.x86_64 +ln defaults/rpm/platform.athlon pld-th/rpm/platform.athlon +ln defaults/rpm/platform.ppc pld-th/rpm/platform.ppc +ln defaults/rpm/platform.i686 pld-th/rpm/platform.i686 +ln defaults/rpm/platform.i486 pld-th/rpm/platform.i486 +# ti ftp archs +ln defaults/rpm/platform.x86_64 pld-ti/rpm/platform.x86_64 +ln defaults/rpm/platform.i686 pld-ti/rpm/platform.i686 +ln defaults/rpm/platform.i586 pld-ti/rpm/platform.i586 +cd - + +# and get rid of the original files +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm/platform.* + +# current debootstrap link +echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_all.deb" \ + > $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/debootstrap.uri + +install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek # we have our own initscript which does the same rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default +rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver +rm -rf $RPM_BUILD_ROOT/dev rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper -# probaly the part of them +rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-init.functions rm -f $RPM_BUILD_ROOT%{_sysconfdir}/vservers.conf %clean @@ -514,17 +724,6 @@ rm -rf $RPM_BUILD_ROOT %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig -%triggerpostun build -- %{name}-build < 0.30.210-5.2 -if [ -f /etc/vservers/.distributions/pld2.0/poldek/poldek.conf.rpmsave ]; then - mv -f /etc/vservers/.distributions/{pld2.0,pld-ac}/poldek/poldek.conf.rpmsave -fi - -# kill old vserver specific package ignores which are no longer needed -l=`egrep '^ignore.*(basesystem|SysVinit|rc-scripts)' /etc/vservers/*/apps/pkgmgmt/base/poldek/etc/poldek.conf -l 2>/dev/null` -if [ "$l" ]; then - %{__sed} -i -e '/^ignore/s, \(basesystem\|SysVinit\|rc-scripts\),,g' $l -fi - %post init /sbin/chkconfig --add vrootdevices /sbin/chkconfig --add vprocunhide @@ -567,6 +766,17 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del vservers-legacy fi +%triggerpostun -n vserver-distro-pld -- util-vserver-build < 0.30.215-1.1 +for D in ac th ti; do + P=%{_sysconfdir}/vservers/.distributions/pld-$D/poldek + + if [ -f $P/pld-source.conf.rpmsave ]; then + cp -f $P/repos.d/pld.conf{,.rpmnew} + mv -f $P/pld-source.conf.rpmsave $P/repos.d/pld.conf + fi +done +exit 0 + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt @@ -576,6 +786,7 @@ fi %dir %{_sysconfdir}/vservers/.defaults/apps %dir %{_sysconfdir}/vservers/.defaults/files %{_sysconfdir}/vservers/.defaults/vdirbase +%{_sysconfdir}/vservers/.defaults/cachebase %{_sysconfdir}/vservers/.defaults/run.rev /sbin/vshelper %attr(755,root,root) %{_sbindir}/chbind @@ -597,9 +808,12 @@ fi %attr(755,root,root) %{_sbindir}/vlimit %attr(755,root,root) %{_sbindir}/vdevmap %attr(755,root,root) %{_sbindir}/vdu +%attr(755,root,root) %{_sbindir}/vmemctrl +%attr(755,root,root) %{_sbindir}/vmount %attr(755,root,root) %{_sbindir}/vproc %attr(755,root,root) %{_sbindir}/vps %attr(755,root,root) %{_sbindir}/vpstree +%attr(755,root,root) %{_sbindir}/vspace %attr(755,root,root) %{_sbindir}/vrsetup %attr(755,root,root) %{_sbindir}/vsched %attr(755,root,root) %{_sbindir}/vserver @@ -614,7 +828,11 @@ fi %dir %{_libdir}/%{name}/defaults %{_libdir}/%{name}/FEATURES.txt %{_libdir}/%{name}/util-vserver-vars -%{_libdir}/%{name}/defaults/* +%{_libdir}/%{name}/defaults/context.start +%{_libdir}/%{name}/defaults/environment +%{_libdir}/%{name}/defaults/h2ext.desc +%{_libdir}/%{name}/defaults/mtab +%{_libdir}/%{name}/defaults/vprocunhide-files %attr(755,root,root) %{_libdir}/%{name}/capchroot %attr(755,root,root) %{_libdir}/%{name}/chain-echo %attr(755,root,root) %{_libdir}/%{name}/chbind-compat @@ -635,11 +853,10 @@ fi %attr(755,root,root) %{_libdir}/%{name}/secure-mount %attr(755,root,root) %{_libdir}/%{name}/sigexec %attr(755,root,root) %{_libdir}/%{name}/start-vservers +%attr(755,root,root) %{_libdir}/%{name}/tunctl %attr(755,root,root) %{_libdir}/%{name}/vprocunhide %{_libdir}/%{name}/vserver.* -%{_libdir}/%{name}/vserver-setup.* %attr(755,root,root) %{_libdir}/%{name}/vserver-build -%{_libdir}/%{name}/vserver-build.* %attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh %attr(755,root,root) %{_libdir}/%{name}/vhashify %attr(755,root,root) %{_libdir}/%{name}/vhashify.cron @@ -660,15 +877,17 @@ fi %dir %{_localstatedir}/run/vservers.rev %dir %{_localstatedir}/run/vshelper %dir /var/cache/vservers +%dir /var/cache/vservers/poldek %files lib %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so.*.*.* +%attr(755,root,root) %{_libdir}/libvserver.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libvserver.so.0 %files devel %defattr(644,root,root,755) %{?with_doc:%doc lib/apidoc/latex/refman.pdf lib/apidoc/html} -%attr(755,root,root) %{_libdir}/lib*.so +%attr(755,root,root) %{_libdir}/libvserver.so %{_libdir}/lib*.la %{_includedir}/vserver*.h %{_pkgconfigdir}/*.pc @@ -685,37 +904,20 @@ fi %dir %{_sysconfdir}/vservers/.distributions %dir %{_sysconfdir}/vservers/.distributions/.common %dir %{_sysconfdir}/vservers/.distributions/.common/pubkeys -%dir %{_sysconfdir}/vservers/.distributions/pld-ac -%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf -%ifarch %{x8664} -%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686 -%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf -%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686 -%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf -%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686 -%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf -%endif -%dir %{_sysconfdir}/vservers/.distributions/pld-th -%dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/*.conf -%dir %{_sysconfdir}/vservers/.distributions/pld-ti -%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/*.conf %attr(755,root,root) %{_libdir}/%{name}/rpm-fake* %dir %{_libdir}/%{name}/distributions -%attr(-,root,root) %{_libdir}/%{name}/distributions/defaults -%attr(-,root,root) %{_libdir}/%{name}/distributions/pld* +%{_libdir}/%{name}/distributions/defaults %dir %{_libdir}/%{name}/distributions/template -%attr(755,root,root) %{_libdir}/%{name}/distributions/template/init* -%attr(-,root,root) %{_libdir}/%{name}/distributions/redhat -%{_libdir}/%{name}/vserver-build.* +%attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpost +%attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpre +%dir %{_libdir}/%{name}/distributions/redhat +%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpost +%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpre +%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/rc.sysinit %{_libdir}/%{name}/vserver-setup.functions +%{_libdir}/%{name}/vserver-build.* %{_libdir}/%{name}/defaults/fstab -%{_libdir}/%{name}/defaults/debootstrap.uri +%{_libdir}/%{name}/defaults/debootstrap.* %{_libdir}/%{name}/defaults/vunify-exclude %attr(755,root,root) %{_libdir}/%{name}/pkgmgmt %attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker @@ -731,6 +933,7 @@ fi %attr(755,root,root) %{_sbindir}/vpoldek %attr(755,root,root) %{_sbindir}/vrpm %attr(755,root,root) %{_sbindir}/vyum +%{_mandir}/man8/vserver-build.8* %files init %defattr(644,root,root,755) @@ -757,6 +960,12 @@ fi %{_mandir}/man8/rebootmgr.8* %{_mandir}/man8/vserver-copy.8* +%files -n vserver-distro-alpine +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/distributions/alpine +%attr(755,root,root) %{_libdir}/%{name}/distributions/alpine/initpost +%attr(755,root,root) %{_libdir}/%{name}/distributions/alpine/initpre + %files -n vserver-distro-centos %defattr(644,root,root,755) %{_libdir}/util-vserver/distributions/centos* @@ -779,6 +988,7 @@ fi %dir %{_sysconfdir}/vservers/.distributions/fc*/apt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/fc*/apt/sources.list %{_libdir}/%{name}/distributions/f7 +%{_libdir}/%{name}/distributions/f8 %{_libdir}/%{name}/distributions/fc* %files -n vserver-distro-gentoo @@ -790,6 +1000,30 @@ fi %attr(755,root,root) %{_sbindir}/vesync %attr(755,root,root) %{_sbindir}/vupdateworld +%files -n vserver-distro-pld +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/distributions/pld +%attr(755,root,root) %{_libdir}/%{name}/distributions/pld/initpost +%dir %{_libdir}/%{name}/distributions/pld-* +%{_libdir}/%{name}/distributions/pld-*/pkgs +%{_libdir}/%{name}/distributions/pld-*/pubkeys +%{_libdir}/%{name}/distributions/pld-*/rpm +%attr(755,root,root) %{_libdir}/%{name}/distributions/pld-*/initpost +%dir %{_sysconfdir}/vservers/.distributions/pld-ac +%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek +%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/*.conf +%dir %{_sysconfdir}/vservers/.distributions/pld-th +%dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek +%dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/*.conf +%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 +%dir %{_sysconfdir}/vservers/.distributions/pld-ti +%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek +%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/*.conf +%endif + %files -n vserver-distro-redhat %defattr(644,root,root,755) %dir %{_sysconfdir}/vservers/.distributions/rh*