From 02bf9f54b45f25447001f945b7c1850dd927779e Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 10 Dec 2006 17:22:44 +0000 Subject: [PATCH 01/55] - updated to 0.30.212 - updated URLs - requires 'rsync' for -build to support new 'rsync' build method - added graphviz + ghostscript BR --- sources | 4 ++-- util-vserver.spec | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sources b/sources index a21c847..4bd109f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b0e8d503ba1cf5a7014eb41a72ec8fe2 util-vserver-0.30.211.tar.bz2 -400c5fad81a029dc88fb03485a9a503e util-vserver-0.30.211.tar.bz2.asc +386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 +0355cedaa22fe51580a0d4dab6d4c1a9 util-vserver-0.30.212.tar.bz2.asc diff --git a/util-vserver.spec b/util-vserver.spec index ceac773..326147e 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -20,13 +20,13 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.211 -Release: %release_func 1 +Version: 0.30.212 +Release: %release_func 2 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2 -Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc +Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 +Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -37,9 +37,8 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel -BuildRequires: doxygen tetex-latex -## HACK; 'make check' fails there due to a kernel bug -## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389 +BuildRequires: doxygen tetex-latex graphviz ghostscript +## dietlibc is not available for PPC ExcludeArch: ppc Requires(post): %name-core Requires(pre): %pkglibdir @@ -59,7 +58,7 @@ Requires: util-linux %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm wget binutils tar e2fsprogs +Requires: rpm wget binutils tar e2fsprogs rsync Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir @@ -351,6 +350,14 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Dec 10 2006 Enrico Scholz - 0.30.212-1 +- updated to 0.30.212 +- updated URLs +- requires 'rsync' for -build to support new 'rsync' build method + +* Thu Oct 12 2006 Enrico Scholz - 0.30.211-2 +- added graphiz + ghostscript BR + * Thu Oct 12 2006 Enrico Scholz - 0.30.211-1 - updated to 0.30.211 From 3f8979a00682334275f8f2507d321731d7ed1f5a Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 19 Jan 2007 04:31:24 +0000 Subject: [PATCH 02/55] Build for PPC --- util-vserver.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 326147e..428c20b 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -38,8 +38,6 @@ BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex graphviz ghostscript -## dietlibc is not available for PPC -ExcludeArch: ppc Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -350,6 +348,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Jan 19 2007 David Woodhouse - 0.30.212-2 +- rebuilt with PPC support + * Sun Dec 10 2006 Enrico Scholz - 0.30.212-1 - updated to 0.30.212 - updated URLs From f64986a007cf14da2a5de39531c10fffd282e332 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 19 Jan 2007 05:36:29 +0000 Subject: [PATCH 03/55] Deal with 64KiB page size in sigbus test --- util-vserver-0.30.212-pagesize.patch | 11 +++++++++++ util-vserver.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 util-vserver-0.30.212-pagesize.patch diff --git a/util-vserver-0.30.212-pagesize.patch b/util-vserver-0.30.212-pagesize.patch new file mode 100644 index 0000000..d97bcc2 --- /dev/null +++ b/util-vserver-0.30.212-pagesize.patch @@ -0,0 +1,11 @@ +--- util-vserver-0.30.212/lib_internal/testsuite/sigbus.c~ 2006-12-10 03:15:34.000000000 +1100 ++++ util-vserver-0.30.212/lib_internal/testsuite/sigbus.c 2007-01-19 16:23:31.000000000 +1100 +@@ -33,7 +33,7 @@ + + int wrapper_exit_code = 1; + +-#define TEST_BLOCKSIZE 0x10000 ++#define TEST_BLOCKSIZE 0x20000 + static bool is_gremlin = false; + static int sync_p[2]; + diff --git a/util-vserver.spec b/util-vserver.spec index 428c20b..573de01 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -21,12 +21,13 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.212 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc +Patch0: util-vserver-0.30.212-pagesize.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -165,7 +166,7 @@ develop VServer related applications. %prep %setup -q - +%patch0 -p1 %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -348,6 +349,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Jan 19 2007 David Woodhouse - 0.30.212-3 +- Build with 64KiB page size + * Fri Jan 19 2007 David Woodhouse - 0.30.212-2 - rebuilt with PPC support From 9ac33cb066adf1f77ad8a3f759e92733c7da56f7 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 4 Feb 2007 16:32:21 +0000 Subject: [PATCH 04/55] TEST_BLOCKSIZE needs to be four times PAGE_SIZE --- util-vserver-0.30.212-pagesize.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver-0.30.212-pagesize.patch b/util-vserver-0.30.212-pagesize.patch index d97bcc2..ecba63c 100644 --- a/util-vserver-0.30.212-pagesize.patch +++ b/util-vserver-0.30.212-pagesize.patch @@ -5,7 +5,7 @@ int wrapper_exit_code = 1; -#define TEST_BLOCKSIZE 0x10000 -+#define TEST_BLOCKSIZE 0x20000 ++#define TEST_BLOCKSIZE 0x40000 static bool is_gremlin = false; static int sync_p[2]; From 22aa4f8441f6d6b19ad5e31c7d728cb004aabe84 Mon Sep 17 00:00:00 2001 From: ensc Date: Thu, 31 May 2007 20:40:16 +0000 Subject: [PATCH 05/55] - updated to 0.30.213 - disabled dietlibc build for PPC64 --- sources | 4 ++-- util-vserver.spec | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 4bd109f..744053d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 -0355cedaa22fe51580a0d4dab6d4c1a9 util-vserver-0.30.212.tar.bz2.asc +2a444e725f7789f751ade259a38553ed util-vserver-0.30.213.tar.bz2 +876de69ad4303e746052907867b7bb88 util-vserver-0.30.213.tar.bz2.asc diff --git a/util-vserver.spec b/util-vserver.spec index 573de01..7b44e36 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -5,7 +5,14 @@ ## --with xalan ... require/use the xalan xslt processor ## Fedora Extras specific customization below... + +%ifarch ppc64 +%bcond_with dietlibc +%else %bcond_without dietlibc +%endif + +%bcond_with xalan ## %global confdir %_sysconfdir/vservers @@ -20,14 +27,13 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.212 -Release: %release_func 3 +Version: 0.30.213 +Release: %release_func 1 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc -Patch0: util-vserver-0.30.212-pagesize.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -39,11 +45,12 @@ BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex graphviz ghostscript +BuildRequires: libxslt rsync dump Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir %{?with_dietlibc:BuildRequires: dietlibc} -%{?_with_xalan:BuildRequires: xalan-j} +%{?with_xalan:BuildRequires: xalan-j} %package lib Summary: Dynamic libraries for util-vserver @@ -166,7 +173,6 @@ develop VServer related applications. %prep %setup -q -%patch0 -p1 %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -349,6 +355,13 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Thu May 31 2007 Enrico Scholz - 0.30.213-1 +- updated to 0.30.213 +- disabled dietlibc build for PPC64 + +* Fri Apr 20 2007 Enrico Scholz - 0.30.212-4 +- BR some tools tested by ./configure + * Fri Jan 19 2007 David Woodhouse - 0.30.212-3 - Build with 64KiB page size From a06382990a678915cf2e6885ec16130f2a5e4b7d Mon Sep 17 00:00:00 2001 From: ensc Date: Thu, 31 May 2007 20:42:25 +0000 Subject: [PATCH 06/55] removed; not needed anymore --- util-vserver-0.30.212-pagesize.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 util-vserver-0.30.212-pagesize.patch diff --git a/util-vserver-0.30.212-pagesize.patch b/util-vserver-0.30.212-pagesize.patch deleted file mode 100644 index ecba63c..0000000 --- a/util-vserver-0.30.212-pagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util-vserver-0.30.212/lib_internal/testsuite/sigbus.c~ 2006-12-10 03:15:34.000000000 +1100 -+++ util-vserver-0.30.212/lib_internal/testsuite/sigbus.c 2007-01-19 16:23:31.000000000 +1100 -@@ -33,7 +33,7 @@ - - int wrapper_exit_code = 1; - --#define TEST_BLOCKSIZE 0x10000 -+#define TEST_BLOCKSIZE 0x40000 - static bool is_gremlin = false; - static int sync_p[2]; - From 5bc24085e9105d4ca28abc728f6626ddf4c27559 Mon Sep 17 00:00:00 2001 From: ensc Date: Fri, 1 Jun 2007 07:12:12 +0000 Subject: [PATCH 07/55] - enabled support for 'util-vserver' initscript --- util-vserver.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 7b44e36..276db04 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -223,7 +223,7 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || : %post sysv %chkconfig --add vservers-default %chkconfig --add vprocunhide - +%chkconfig --add util-vserver %preun sysv @@ -231,6 +231,7 @@ test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : test "$1" != 0 || %chkconfig --del vprocunhide test "$1" != 0 || %chkconfig --del vservers-default +test "$1" != 0 || %chkconfig --del util-vserver %postun sysv @@ -358,6 +359,7 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : * Thu May 31 2007 Enrico Scholz - 0.30.213-1 - updated to 0.30.213 - disabled dietlibc build for PPC64 +- enabled support for 'util-vserver' initscript * Fri Apr 20 2007 Enrico Scholz - 0.30.212-4 - BR some tools tested by ./configure From 7bfc46eaeec2fd9fc23226e4ef4f6e0a6bd37ea3 Mon Sep 17 00:00:00 2001 From: ensc Date: Fri, 1 Jun 2007 15:02:43 +0000 Subject: [PATCH 08/55] try whether ppc builds succeed when dietlibc is disabled --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 276db04..dc96efb 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -6,7 +6,7 @@ ## Fedora Extras specific customization below... -%ifarch ppc64 +%ifarch ppc64 ppc %bcond_with dietlibc %else %bcond_without dietlibc From 01afa8512b58abe3f4362289fa26eacd9371dc73 Mon Sep 17 00:00:00 2001 From: ensc Date: Fri, 1 Jun 2007 15:34:54 +0000 Subject: [PATCH 09/55] again... with dietlibc --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index dc96efb..276db04 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -6,7 +6,7 @@ ## Fedora Extras specific customization below... -%ifarch ppc64 ppc +%ifarch ppc64 %bcond_with dietlibc %else %bcond_without dietlibc From 716d92ca70c5edb1f066f9b69f404f9e4cffa40c Mon Sep 17 00:00:00 2001 From: ensc Date: Fri, 1 Jun 2007 16:44:01 +0000 Subject: [PATCH 10/55] added PPC workaround --- util-vserver.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 276db04..2fedee5 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -194,7 +194,16 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %check || : -%__make check +## REMOVE ME! Cause for the PPC workaround should be fixed by +## http://svn.linux-vserver.org/projects/util-vserver/changeset/2545 +## which is going into 0.30.214 +%ifarch ppc + rc=true +%else + rc=false +%endif + +%__make check || $rc %clean From dbd07520c6095cc666ed4948cc534a6f5d72550a Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 4 Aug 2007 10:51:59 +0000 Subject: [PATCH 11/55] added patch to make 'vyum' work with a patched yum-3.2 --- util-vserver-0.30.213-yum32.patch | 11 +++++++++++ util-vserver.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 util-vserver-0.30.213-yum32.patch diff --git a/util-vserver-0.30.213-yum32.patch b/util-vserver-0.30.213-yum32.patch new file mode 100644 index 0000000..f6dab44 --- /dev/null +++ b/util-vserver-0.30.213-yum32.patch @@ -0,0 +1,11 @@ +--- util-vserver-0.30.213/scripts/vyum-worker.yum32 ++++ util-vserver-0.30.213/scripts/vyum-worker +@@ -60,7 +60,7 @@ case $($yum --version|tail -n 1) in + (2.[012345]*) + check 'import yum,sys; sys.exit(not hasattr(yum.config.yumconf, "getRootedPath"))' + ;; +- (2.[6789]*|3.0*) ++ (2.[6789]*|3.[012]*) + check 'import yum,sys; sys.exit(not hasattr(yum.config.YumConf, "getRootedPath"))' + ;; + (*) diff --git a/util-vserver.spec b/util-vserver.spec index 2fedee5..c3b5c78 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,12 +28,14 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.213 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc +Patch0: util-vserver-0.30.213-yum32.patch + BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -173,6 +175,8 @@ develop VServer related applications. %prep %setup -q +%patch0 -p1 -b .yum32 + %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -365,6 +369,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Aug 4 2007 Enrico Scholz - 0.30.213-2 +- added patch to make 'vyum' work with a patched yum-3.2 + * Thu May 31 2007 Enrico Scholz - 0.30.213-1 - updated to 0.30.213 - disabled dietlibc build for PPC64 From 529328123941c08781b2852b33d65ab4caa52af2 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 2 Sep 2007 11:30:35 +0000 Subject: [PATCH 12/55] initial checkin --- lastver | 1 + verinfo | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 lastver create mode 100644 verinfo diff --git a/lastver b/lastver new file mode 100644 index 0000000..7c88ed1 --- /dev/null +++ b/lastver @@ -0,0 +1 @@ +0.30.213 diff --git a/verinfo b/verinfo new file mode 100644 index 0000000..b78fa74 --- /dev/null +++ b/verinfo @@ -0,0 +1,2 @@ +http://ftp.linux-vserver.org/pub/utils/util-vserver/ +util-vserver-(.*?)\.tar\.bz2 From 095ffeb3942d65601b3f1fa3af52895871e2174e Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 3 Sep 2007 07:57:42 +0000 Subject: [PATCH 13/55] updated to 0.30.214 --- lastver | 2 +- sources | 4 ++-- util-vserver-0.30.213-yum32.patch | 11 ----------- util-vserver-0.30.214-stat.patch | 14 ++++++++++++++ util-vserver.spec | 28 +++++++++------------------- 5 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 util-vserver-0.30.213-yum32.patch create mode 100644 util-vserver-0.30.214-stat.patch diff --git a/lastver b/lastver index 7c88ed1..c9fd43c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.30.213 +0.30.214 diff --git a/sources b/sources index 744053d..b7bc5b6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2a444e725f7789f751ade259a38553ed util-vserver-0.30.213.tar.bz2 -876de69ad4303e746052907867b7bb88 util-vserver-0.30.213.tar.bz2.asc +8bad879e36a6a1b9b4858d0d6d3c8c76 util-vserver-0.30.214.tar.bz2 +ce8fd758ce4d201791020f6f87f0bddf util-vserver-0.30.214.tar.bz2.asc diff --git a/util-vserver-0.30.213-yum32.patch b/util-vserver-0.30.213-yum32.patch deleted file mode 100644 index f6dab44..0000000 --- a/util-vserver-0.30.213-yum32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util-vserver-0.30.213/scripts/vyum-worker.yum32 -+++ util-vserver-0.30.213/scripts/vyum-worker -@@ -60,7 +60,7 @@ case $($yum --version|tail -n 1) in - (2.[012345]*) - check 'import yum,sys; sys.exit(not hasattr(yum.config.yumconf, "getRootedPath"))' - ;; -- (2.[6789]*|3.0*) -+ (2.[6789]*|3.[012]*) - check 'import yum,sys; sys.exit(not hasattr(yum.config.YumConf, "getRootedPath"))' - ;; - (*) diff --git a/util-vserver-0.30.214-stat.patch b/util-vserver-0.30.214-stat.patch new file mode 100644 index 0000000..c33ef4c --- /dev/null +++ b/util-vserver-0.30.214-stat.patch @@ -0,0 +1,14 @@ +Index: lib_internal/util-safechdir.h +=================================================================== +--- lib_internal/util-safechdir.h (revision 2605) ++++ lib_internal/util-safechdir.h (working copy) +@@ -19,7 +19,8 @@ + #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H + #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H + +-struct stat; ++#include ++ + int safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2)); + + #define EsafeChdir(PATH,EXP_STAT) \ diff --git a/util-vserver.spec b/util-vserver.spec index c3b5c78..63fcaf1 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -6,13 +6,9 @@ ## Fedora Extras specific customization below... -%ifarch ppc64 -%bcond_with dietlibc -%else %bcond_without dietlibc -%endif - %bcond_with xalan + ## %global confdir %_sysconfdir/vservers @@ -27,14 +23,14 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.213 -Release: %release_func 2 +Version: 0.30.214 +Release: %release_func 1 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc -Patch0: util-vserver-0.30.213-yum32.patch +Patch0: util-vserver-0.30.214-stat.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) @@ -175,7 +171,7 @@ develop VServer related applications. %prep %setup -q -%patch0 -p1 -b .yum32 +%patch0 -p0 -b .stat %build @@ -198,16 +194,7 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %check || : -## REMOVE ME! Cause for the PPC workaround should be fixed by -## http://svn.linux-vserver.org/projects/util-vserver/changeset/2545 -## which is going into 0.30.214 -%ifarch ppc - rc=true -%else - rc=false -%endif - -%__make check || $rc +%__make check %clean @@ -369,6 +356,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Sep 3 2007 Enrico Scholz - 0.30.214-1 +- updated to 0.30.214 + * Sat Aug 4 2007 Enrico Scholz - 0.30.213-2 - added patch to make 'vyum' work with a patched yum-3.2 From 028ed402e76d60c7e8285ae873717097c5397d8b Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 3 Sep 2007 17:42:38 +0000 Subject: [PATCH 14/55] disabled dietlibc build for ppc64 again --- util-vserver.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util-vserver.spec b/util-vserver.spec index 63fcaf1..3c93463 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -6,7 +6,12 @@ ## Fedora Extras specific customization below... +%ifarch ppc64 +%bcond_with dietlibc +%else %bcond_without dietlibc +%endif + %bcond_with xalan ## From fa19d276a500c3431a21408e0fe4447a12929ab6 Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 19 Sep 2007 20:11:14 +0000 Subject: [PATCH 15/55] - fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when a directory becomes a symlink. Hence, remove the 'etch' directory in %%pre --- util-vserver.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 3c93463..afa7fff 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -29,7 +29,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.214 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -261,6 +261,10 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-* copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* +%pre build +# TODO: remove in FC9... +d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || : + %post build test -d /vservers/.hash || mkdir -m0700 /vservers/.hash @@ -361,6 +365,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Sep 19 2007 Enrico Scholz - 0.30.214-2 +- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when + a directory becomes a symlink. Hence, remove the 'etch' directory in + %%pre + * Mon Sep 3 2007 Enrico Scholz - 0.30.214-1 - updated to 0.30.214 From 61ed8228123dc9a44652dbecd30963bfaec0c550 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 02:37:59 +0000 Subject: [PATCH 16/55] - Autorebuild for GCC 4.3 --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index afa7fff..d8e0064 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -29,7 +29,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.214 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -365,6 +365,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0.30.214-3 +- Autorebuild for GCC 4.3 + * Wed Sep 19 2007 Enrico Scholz - 0.30.214-2 - fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when a directory becomes a symlink. Hence, remove the 'etch' directory in From 52f670b1b10a420dbb63754d6e500014a3660a75 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 08:58:48 +0000 Subject: [PATCH 17/55] updated to 0.30.215 --- .cvsignore | 3 ++- lastver | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6d5da98..b72e46f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -util-vserver-*.tar.bz2* +util-vserver-0.30.215.tar.bz2 +util-vserver-0.30.215.tar.bz2.asc diff --git a/lastver b/lastver index c9fd43c..1790a0f 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.30.214 +0.30.215 diff --git a/sources b/sources index b7bc5b6..c40bfbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8bad879e36a6a1b9b4858d0d6d3c8c76 util-vserver-0.30.214.tar.bz2 -ce8fd758ce4d201791020f6f87f0bddf util-vserver-0.30.214.tar.bz2.asc +befd9b8e5311e87395b67ee381d83649 util-vserver-0.30.215.tar.bz2 +783de8acf8f16e56c1b8cf4a7b683994 util-vserver-0.30.215.tar.bz2.asc From 0e55c67f6a0b571c9e4673d101d1b34e62289f13 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 08:59:57 +0000 Subject: [PATCH 18/55] removed; is now in upstream --- util-vserver-0.30.214-stat.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 util-vserver-0.30.214-stat.patch diff --git a/util-vserver-0.30.214-stat.patch b/util-vserver-0.30.214-stat.patch deleted file mode 100644 index c33ef4c..0000000 --- a/util-vserver-0.30.214-stat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib_internal/util-safechdir.h -=================================================================== ---- lib_internal/util-safechdir.h (revision 2605) -+++ lib_internal/util-safechdir.h (working copy) -@@ -19,7 +19,8 @@ - #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H - #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H - --struct stat; -+#include -+ - int safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2)); - - #define EsafeChdir(PATH,EXP_STAT) \ From 50c3deccf21256305a28aa03929788515253ecaa Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 09:03:21 +0000 Subject: [PATCH 19/55] - updated to 0.30.215 - use nss-devel instead of beecrypt-devel as BR --- util-vserver.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index d8e0064..61e274f 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,14 +28,13 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.214 -Release: %release_func 3 +Version: 0.30.215 +Release: %release_func 1 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc -Patch0: util-vserver-0.30.214-stat.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) @@ -46,7 +45,7 @@ Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils -BuildRequires: e2fsprogs-devel beecrypt-devel +BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript BuildRequires: libxslt rsync dump Requires(post): %name-core @@ -176,11 +175,11 @@ develop VServer related applications. %prep %setup -q -%patch0 -p0 -b .stat %build %configure --with-initrddir=%_initrddir --enable-release \ + --with-crypto-api=nss \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc %__make %{?_smp_mflags} all @@ -365,6 +364,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 +- updated to 0.30.215 +- use nss-devel instead of beecrypt-devel as BR + * Mon Feb 18 2008 Fedora Release Engineering - 0.30.214-3 - Autorebuild for GCC 4.3 From 20396fc658f73d4649c201c241b6cf0b2e5e88e2 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 13 Apr 2008 23:02:19 +0000 Subject: [PATCH 20/55] - run crypto-suite benchmark in %%check - fixed initscript runlevels (#441311) --- util-vserver.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util-vserver.spec b/util-vserver.spec index 61e274f..ba29c64 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -176,6 +176,8 @@ develop VServer related applications. %prep %setup -q +sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* + %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -199,6 +201,7 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %check || : %__make check +LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : %clean @@ -367,6 +370,8 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : * Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 - updated to 0.30.215 - use nss-devel instead of beecrypt-devel as BR +- run crypto-suite benchmark in %%check +- fixed initscript runlevels (#441311) * Mon Feb 18 2008 Fedora Release Engineering - 0.30.214-3 - Autorebuild for GCC 4.3 From ce1fa3c988e4ce6cef97bc628107c90295d423b9 Mon Sep 17 00:00:00 2001 From: alexlan Date: Mon, 14 Apr 2008 12:19:08 +0000 Subject: [PATCH 21/55] - Temporarily disable check to get it to at least build and fix broken dep in rawhide/F-9 as f9-final is going to close soon and it would be good that upgrades from F-8 "just work". --- util-vserver.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index ba29c64..55fbe0a 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -29,7 +29,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -199,9 +199,9 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : -%__make check -LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : +#check || : +#__make check +#LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : %clean @@ -367,6 +367,10 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Alex Lancaster - 0.30.215-2 +- Temporarily disable check to get it to at least build and fix broken + dep in rawhide/F-9. + * Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 - updated to 0.30.215 - use nss-devel instead of beecrypt-devel as BR From 3263bb72086cf61c1081ce272c55a5f71a4d12cd Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 19 Apr 2008 17:34:35 +0000 Subject: [PATCH 22/55] reenabled %%check --- util-vserver.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 55fbe0a..0c2b73b 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -29,7 +29,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -199,9 +199,9 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -#check || : -#__make check -#LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : +%check || : +%__make check +LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : %clean @@ -367,6 +367,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Apr 19 2008 Enrico Scholz - 0.30.215-3 +- reenabled %%check + * Mon Apr 14 2008 Alex Lancaster - 0.30.215-2 - Temporarily disable check to get it to at least build and fix broken dep in rawhide/F-9. From b41db7e8ac6422250d18eb6591cebb1371d843b4 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 21 Jun 2008 15:19:35 +0000 Subject: [PATCH 23/55] removed CVS tags --- Makefile | 1 - util-vserver.spec | 2 -- 2 files changed, 3 deletions(-) diff --git a/Makefile b/Makefile index ca269bd..32f556b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ # Makefile for source rpm: util-vserver -# $Id$ NAME := util-vserver SPECFILE = $(firstword $(wildcard *.spec)) diff --git a/util-vserver.spec b/util-vserver.spec index 0c2b73b..0e9027a 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,5 +1,3 @@ -# $Id$ - ## This package understands the following switches: ## --without dietlibc ... disable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor From f43d7211e0c2e92d4650aedeafe6fc9d094f7458 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 9 Sep 2008 03:20:50 +0000 Subject: [PATCH 24/55] fix license tag --- util-vserver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 0e9027a..55351c9 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -27,8 +27,8 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 3 -License: GPL +Release: %release_func 4 +License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 @@ -365,6 +365,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Sep 8 2008 Tom "spot" Callaway - 0.30.215-4 +- fix license tag + * Sat Apr 19 2008 Enrico Scholz - 0.30.215-3 - reenabled %%check From bbce0a0f0241ba584de26dbe324d2e4e07bdbde3 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 18 Oct 2008 15:45:02 +0000 Subject: [PATCH 25/55] fixed build with recent rpm --- util-vserver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 55351c9..5900f7d 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -27,7 +27,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 4 +Release: %release_func 5 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -197,7 +197,7 @@ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -%check || : +%check %__make check LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : @@ -365,6 +365,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 +- fixed build with recent rpm + * Mon Sep 8 2008 Tom "spot" Callaway - 0.30.215-4 - fix license tag From c5cf47cc1a3c2f4dcdcba7b2d958728bae68684b Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 18 Oct 2008 17:24:13 +0000 Subject: [PATCH 26/55] rebuilt with recent dietlibc --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 5900f7d..c0191d3 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -27,7 +27,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 5 +Release: %release_func 6 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -365,6 +365,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 +- rebuilt with recent dietlibc + * Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 - fixed build with recent rpm From 0cc359616cc3da98879e96db5f9e26b02e2329cb Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 18 Oct 2008 17:35:06 +0000 Subject: [PATCH 27/55] reenabled dietlibc for PPC64 --- util-vserver.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index c0191d3..70c569d 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -4,12 +4,8 @@ ## Fedora Extras specific customization below... -%ifarch ppc64 -%bcond_with dietlibc -%else +%dump %bcond_without dietlibc -%endif - %bcond_with xalan ## @@ -367,6 +363,7 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog * Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 - rebuilt with recent dietlibc +- reenabled dietlibc for PPC64 * Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 - fixed build with recent rpm From 4bd7fccd70ee1af223bb0e1c15919194720719b8 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 18 Oct 2008 17:42:00 +0000 Subject: [PATCH 28/55] debug rpm's %bcond* expansion... --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 70c569d..0492bb2 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -4,7 +4,7 @@ ## Fedora Extras specific customization below... -%dump +%trace %bcond_without dietlibc %bcond_with xalan From b18ebaa83d43c929b6c5ce876ff25df4dbff3d6f Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 19 Oct 2008 09:11:04 +0000 Subject: [PATCH 29/55] removed %trace --- util-vserver.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 0492bb2..c89c081 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -4,7 +4,6 @@ ## Fedora Extras specific customization below... -%trace %bcond_without dietlibc %bcond_with xalan From 165c96fc20a3f931d6c98f71e932e19bd7dca107 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 19 Oct 2008 09:22:33 +0000 Subject: [PATCH 30/55] disabled dietlibc for ppc64 again --- util-vserver.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index c89c081..3505e98 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -4,7 +4,13 @@ ## Fedora Extras specific customization below... +%ifarch ppc64 +## fails because '__sigsetjmp' and '__longjmp' are undefined +%bcond_with dietlibc +%else %bcond_without dietlibc +%endif + %bcond_with xalan ## @@ -362,7 +368,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog * Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 - rebuilt with recent dietlibc -- reenabled dietlibc for PPC64 * Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 - fixed build with recent rpm From f9f380204b08e4758b7415e733357ebcb23bddd3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:35:23 +0000 Subject: [PATCH 31/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 3505e98..c6cc273 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 6 +Release: %release_func 7 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -366,6 +366,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.30.215-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 - rebuilt with recent dietlibc From 7535efb24e010472e5b1ffdde8bdef1455a1eeb7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:40:33 +0000 Subject: [PATCH 32/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index c6cc273..9f5d444 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215 -Release: %release_func 7 +Release: %release_func 8 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -366,6 +366,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 0.30.215-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.30.215-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bc04d08207c3d7d907ada2c10b03b413bfc448f4 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 23 Aug 2009 13:30:04 +0000 Subject: [PATCH 33/55] - updated to svn 2847 snapshot - added -python subpackage --- .cvsignore | 3 +-- sources | 3 +-- util-vserver.spec | 43 +++++++++++++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index b72e46f..45b3057 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -util-vserver-0.30.215.tar.bz2 -util-vserver-0.30.215.tar.bz2.asc +util-vserver-0.30.215+svn2847.tar.bz2 diff --git a/sources b/sources index c40bfbf..0956717 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -befd9b8e5311e87395b67ee381d83649 util-vserver-0.30.215.tar.bz2 -783de8acf8f16e56c1b8cf4a7b683994 util-vserver-0.30.215.tar.bz2.asc +5682ed047a44d8e027bd780fc43cf982 util-vserver-0.30.215+svn2847.tar.bz2 diff --git a/util-vserver.spec b/util-vserver.spec index 9f5d444..c73d55e 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -12,7 +12,6 @@ %endif %bcond_with xalan - ## %global confdir %_sysconfdir/vservers @@ -22,18 +21,19 @@ %global _localstatedir %_var +%{!?python_sitearch:%global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?release_func:%global release_func() %1%{?dist}} Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.215 -Release: %release_func 8 +Version: 0.30.215+svn2847 +Release: %release_func 0 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 -Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc +#Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) @@ -65,7 +65,7 @@ Requires: util-linux %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm wget binutils tar e2fsprogs rsync +Requires: rpm wget binutils tar Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir @@ -98,6 +98,12 @@ Group: Development/Libraries Requires: pkgconfig Requires: %name-lib = %version-%release +%package python +Summary: Python bindings to develop vserver-based applications +Group: Development/Libraries +BuildRequires: python +Requires: %name-lib = %version-%release + %description util-vserver provides the components and a framework to setup virtual @@ -171,6 +177,16 @@ can't interact with services in the main server. This package contains header files and libraries which are needed to develop VServer related applications. +%description python +util-vserver provides the components and a framework to setup virtual +servers. A virtual server runs inside a linux server. It is nevertheless +highly independent. As such, you can run various services with normal +configuration. The various vservers can't interact with each other and +can't interact with services in the main server. + +This package contains the files needed to interface with the +Linux-VServer API from Python. + %prep %setup -q @@ -181,6 +197,7 @@ sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* %build %configure --with-initrddir=%_initrddir --enable-release \ --with-crypto-api=nss \ + --with-python \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc %__make %{?_smp_mflags} all @@ -191,7 +208,8 @@ sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution -rm -f $RPM_BUILD_ROOT/%_libdir/*.la +rm -f $RPM_BUILD_ROOT%_libdir/*.la \ + $RPM_BUILD_ROOT%python_sitearch/*.*a MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ @@ -262,10 +280,6 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-* copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* -%pre build -# TODO: remove in FC9... -d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || : - %post build test -d /vservers/.hash || mkdir -m0700 /vservers/.hash @@ -365,7 +379,16 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %doc lib/apidoc/html +%files python +%defattr(-,root,root,-) +%python_sitearch/*.so + + %changelog +* Sun Aug 23 2009 Enrico Scholz - 0.30.215+svn2847-0 +- updated to svn 2847 snapshot +- added -python subpackage + * Sun Jul 26 2009 Fedora Release Engineering - 0.30.215-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From cd9bf9e967ef1563d760d5a68ea3e2fb4cc47d3a Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 23 Aug 2009 13:39:00 +0000 Subject: [PATCH 34/55] fixed python BRs --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index c73d55e..e918f30 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -101,7 +101,7 @@ Requires: %name-lib = %version-%release %package python Summary: Python bindings to develop vserver-based applications Group: Development/Libraries -BuildRequires: python +BuildRequires: python-devel ctags Requires: %name-lib = %version-%release From 752a15302c21ab4af0b08f42db508b8d59bebe3b Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 23 Aug 2009 13:43:37 +0000 Subject: [PATCH 35/55] increased release to fix broken build; 'cvs tag -f' does not work anymore :( --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index e918f30..c1adb87 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2847 -Release: %release_func 0 +Release: %release_func 143596525 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ From d7dcba59851b28ac3459ec0b3fe4523994667a3d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:48 +0000 Subject: [PATCH 36/55] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 32f556b..ccf7583 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ NAME := util-vserver SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From cc691703d8164b75342728f87d3e1fbd533c5f8e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 2 Jun 2010 17:23:38 +0000 Subject: [PATCH 37/55] disable static libs, disable dietlibc by default to get package building again --- util-vserver.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index c1adb87..17fc2d0 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,15 +1,11 @@ ## This package understands the following switches: -## --without dietlibc ... disable usage of dietlibc +## --with dietlibc ... enable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor ## Fedora Extras specific customization below... -%ifarch ppc64 -## fails because '__sigsetjmp' and '__longjmp' are undefined +## ppc64 fails because '__sigsetjmp' and '__longjmp' are undefined %bcond_with dietlibc -%else -%bcond_without dietlibc -%endif %bcond_with xalan ## @@ -28,7 +24,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2847 -Release: %release_func 143596525 +Release: %release_func 143596526 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -47,6 +43,7 @@ BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript BuildRequires: libxslt rsync dump +BuildRequires: procps module-init-tools net-tools Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -190,14 +187,13 @@ Linux-VServer API from Python. %prep %setup -q - sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* - %build %configure --with-initrddir=%_initrddir --enable-release \ --with-crypto-api=nss \ --with-python \ + --disable-static \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc %__make %{?_smp_mflags} all @@ -211,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la \ $RPM_BUILD_ROOT%python_sitearch/*.*a +sed -i 's|devel /usr/lib64/libvserver.a||' contrib/manifest.dat + MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat @@ -385,6 +383,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596526 +- do not package static libs +- disable dietlibc by default (tests fail to build with dietlibc enabled) +- add missing BuildRequires + * Sun Aug 23 2009 Enrico Scholz - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From f8bd46a7de77d186fd72ce1908c7e1cbb8a26404 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 2 Jun 2010 17:50:07 +0000 Subject: [PATCH 38/55] enable dietlibc again, disable tests, forcibly remove static lib --- util-vserver.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 17fc2d0..b696cab 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,11 +1,15 @@ ## This package understands the following switches: -## --with dietlibc ... enable usage of dietlibc +## --without dietlibc ... disable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor ## Fedora Extras specific customization below... -## ppc64 fails because '__sigsetjmp' and '__longjmp' are undefined -%bcond_with dietlibc +%ifarch ppc64 +## fails because '__sigsetjmp' and '__longjmp' are undefined +%bcond_with dietlibc +%else +%bcond_without dietlibc +%endif %bcond_with xalan ## @@ -24,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2847 -Release: %release_func 143596526 +Release: %release_func 143596527 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -205,9 +209,10 @@ rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution rm -f $RPM_BUILD_ROOT%_libdir/*.la \ - $RPM_BUILD_ROOT%python_sitearch/*.*a + $RPM_BUILD_ROOT%python_sitearch/*.*a \ + $RPM_BUILD_ROOT%{_libdir}/*.a -sed -i 's|devel /usr/lib64/libvserver.a||' contrib/manifest.dat +sed -i "s|devel %{_libdir}/libvserver.a||" contrib/manifest.dat MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ @@ -215,8 +220,10 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %check +%if 0 %__make check LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : +%endif %clean @@ -383,6 +390,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596527 +- enable dietlibc again, but disable tests + * Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596526 - do not package static libs - disable dietlibc by default (tests fail to build with dietlibc enabled) From 628058bfe3528e279abbcbff8ffb7bb34cc61fda Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 19:26:34 +0000 Subject: [PATCH 39/55] revert last two commits --- util-vserver.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index b696cab..c1adb87 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -6,9 +6,9 @@ %ifarch ppc64 ## fails because '__sigsetjmp' and '__longjmp' are undefined -%bcond_with dietlibc +%bcond_with dietlibc %else -%bcond_without dietlibc +%bcond_without dietlibc %endif %bcond_with xalan @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2847 -Release: %release_func 143596527 +Release: %release_func 143596525 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -47,7 +47,6 @@ BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript BuildRequires: libxslt rsync dump -BuildRequires: procps module-init-tools net-tools Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -191,13 +190,14 @@ Linux-VServer API from Python. %prep %setup -q + sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* + %build %configure --with-initrddir=%_initrddir --enable-release \ --with-crypto-api=nss \ --with-python \ - --disable-static \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc %__make %{?_smp_mflags} all @@ -209,10 +209,7 @@ rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution rm -f $RPM_BUILD_ROOT%_libdir/*.la \ - $RPM_BUILD_ROOT%python_sitearch/*.*a \ - $RPM_BUILD_ROOT%{_libdir}/*.a - -sed -i "s|devel %{_libdir}/libvserver.a||" contrib/manifest.dat + $RPM_BUILD_ROOT%python_sitearch/*.*a MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ @@ -220,10 +217,8 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat %check -%if 0 %__make check LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : -%endif %clean @@ -390,14 +385,6 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog -* Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596527 -- enable dietlibc again, but disable tests - -* Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596526 -- do not package static libs -- disable dietlibc by default (tests fail to build with dietlibc enabled) -- add missing BuildRequires - * Sun Aug 23 2009 Enrico Scholz - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From 0baa93331325e04bc89f8edd115031b414256b2f Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 19:49:37 +0000 Subject: [PATCH 40/55] use $(CVS), not cvs --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccf7583..4bde95a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ # Makefile for source rpm: util-vserver NAME := util-vserver SPECFILE = $(firstword $(wildcard *.spec)) +CVS ?= cvs define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9dd1e7a330c83ce3891346df9cc060f9e138e24d Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 22:34:51 +0000 Subject: [PATCH 41/55] - updated to svn2893 snapshot - splitted static libs out of -devel into own subpackage - added some BRs (thx to Tom "spot" Callaway) - added %%{?_isa} annotations to some Requires: - removed a very old workaround --- util-vserver.spec | 60 +++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index c1adb87..9a5aab5 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -22,13 +22,12 @@ %global _localstatedir %_var %{!?python_sitearch:%global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%{!?release_func:%global release_func() %1%{?dist}} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.215+svn2847 -Release: %release_func 143596525 +Version: 0.30.215+svn2893 +Release: %release_func 1400 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -37,8 +36,8 @@ Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar. BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) -Requires: %name-core = %version-%release -Requires: %name-lib = %version-%release +Requires: %name-core%{?_isa} = %version-%release +Requires: %name-lib%{?_isa} = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version @@ -47,6 +46,7 @@ BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript BuildRequires: libxslt rsync dump +BuildRequires: procps module-init-tools net-tools Requires(post): %name-core Requires(pre): %pkglibdir Requires(postun): %pkglibdir @@ -96,13 +96,19 @@ requires(postun): %_initrddir %pkglibdir Summary: Header-files and libraries needed to develop vserver based applications Group: Development/Libraries Requires: pkgconfig -Requires: %name-lib = %version-%release +Requires: %name-lib%{?_isa} = %version-%release + +%package static +Summary: Static libraries needed to develop vserver based applications +Group: Development/Libraries +Requires: pkgconfig +Requires: %name-lib%{?_isa} = %version-%release %package python Summary: Python bindings to develop vserver-based applications Group: Development/Libraries BuildRequires: python-devel ctags -Requires: %name-lib = %version-%release +Requires: %name-lib%{?_isa} = %version-%release %description @@ -177,6 +183,17 @@ can't interact with services in the main server. This package contains header files and libraries which are needed to develop VServer related applications. + +%description static +util-vserver provides the components and a framework to setup virtual +servers. A virtual server runs inside a linux server. It is nevertheless +highly independent. As such, you can run various services with normal +configuration. The various vservers can't interact with each other and +can't interact with services in the main server. + +This package contains static libraries which are needed to develop +VServer related applications. + %description python util-vserver provides the components and a framework to setup virtual servers. A virtual server runs inside a linux server. It is nevertheless @@ -293,17 +310,6 @@ f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \ test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-* -## Temporary workaround to remove old v_* files; it will conflict -## somehow with the -legacy package but can be fixed by reinstalling -## this package. -## TODO: remove me in the final .spec file -%define v_services httpd named portmap sendmail smb sshd xinetd gated -%triggerun sysv -- util-vserver-sysv < 0.30.198 -for i in %v_services; do - %chkconfig --del v_$i || : -done - - %post legacy %chkconfig --add rebootmgr %chkconfig --add vservers-legacy @@ -312,7 +318,6 @@ for i in %v_services; do %chkconfig --add v_$i done - %preun legacy test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : @@ -378,13 +383,28 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %doc lib/apidoc/latex/refman.pdf %doc lib/apidoc/html +%exclude %_libdir/*.a + + +%files static +%defattr(-,root,root,-) +%_libdir/*.a + %files python %defattr(-,root,root,-) %python_sitearch/*.so +%python_sitearch/*.py* %changelog +* Thu Jun 3 2010 Enrico Scholz - 0.30.215+svn2893-1400 +- updated to svn2893 snapshot +- splitted static libs out of -devel into own subpackage +- added some BRs (thx to Tom "spot" Callaway) +- added %%{?_isa} annotations to some Requires: +- removed a very old workaround + * Sun Aug 23 2009 Enrico Scholz - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From afb494ba47799bf47ee618c59acd05c33290baf6 Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 22:35:25 +0000 Subject: [PATCH 42/55] - updated to svn2893 snapshot --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45b3057..59e718b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -util-vserver-0.30.215+svn2847.tar.bz2 +util-vserver-0.30.215+svn2893.tar.bz2 diff --git a/sources b/sources index 0956717..fa27c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5682ed047a44d8e027bd780fc43cf982 util-vserver-0.30.215+svn2847.tar.bz2 +4687024e1374ba2a4044240fd71f0804 util-vserver-0.30.215+svn2893.tar.bz2 From c6488b327ba4a315dd1af9759407cea093f664b8 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 07:08:23 +0000 Subject: [PATCH 43/55] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 9a5aab5..9e870ca 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -27,7 +27,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2893 -Release: %release_func 1400 +Release: %release_func 1401 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -398,6 +398,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Thu Jun 3 2010 Enrico Scholz - 0.30.215+svn2893-1400 - updated to svn2893 snapshot - splitted static libs out of -devel into own subpackage From eba74e56a8df9df4ce639d13c555464d9b1fb59b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:50:37 +0000 Subject: [PATCH 44/55] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4bde95a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: util-vserver -NAME := util-vserver -SPECFILE = $(firstword $(wildcard *.spec)) -CVS ?= cvs - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From b94e4934852babaafce79266c7eca9d0b123a3ac Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 16 Aug 2010 00:08:09 +0200 Subject: [PATCH 45/55] readded makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e5461e3 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) From fa50699bfb38eff61c8517e2d4b3a2d481920447 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 24 Dec 2010 14:42:52 +0100 Subject: [PATCH 46/55] updated to svn 2929 snapshot --- .gitignore | 1 + sources | 2 +- util-vserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59e718b..95908a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ util-vserver-0.30.215+svn2893.tar.bz2 +/util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/sources b/sources index fa27c59..fd9d2ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4687024e1374ba2a4044240fd71f0804 util-vserver-0.30.215+svn2893.tar.bz2 +993b02c69f3937b772887da31fa6a363 util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/util-vserver.spec b/util-vserver.spec index 9e870ca..f9d79e9 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -26,8 +26,8 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.215+svn2893 -Release: %release_func 1401 +Version: 0.30.215+svn2929 +Release: %release_func 1500 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -398,6 +398,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 +- updated to svn 2929 snapshot + * Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From d2afe8d76cf5e3f21deeb7be32e610eaf19d1561 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 24 Dec 2010 15:53:32 +0100 Subject: [PATCH 47/55] added tmpfiles.d/ descriptions --- util-vserver.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index f9d79e9..db31f37 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -12,6 +12,7 @@ %endif %bcond_with xalan +%bcond_without tmpfiles ## %global confdir %_sysconfdir/vservers @@ -232,6 +233,16 @@ MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat +install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf +-d %_localstatedir/run/vservers 0755 root root +-d %_localstatedir/run/vservers.rev 0755 root root +-d %_localstatedir/run/vshelper 0755 root root +EOF + + +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + %check %__make check @@ -347,10 +358,17 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %ghost %confdefaultdir/run.rev %dir %_localstatedir/cache/vservers -%dir %_localstatedir/run/vservers -%dir %_localstatedir/run/vservers.rev -%dir %_localstatedir/run/vshelper +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/%name.conf + %ghost %dir %_localstatedir/run/vservers + %ghost %dir %_localstatedir/run/vservers.rev + %ghost %dir %_localstatedir/run/vshelper +%else + %dir %_localstatedir/run/vservers + %dir %_localstatedir/run/vservers.rev + %dir %_localstatedir/run/vshelper +%endif %files lib -f %name-lib.list %files sysv -f %name-sysv.list @@ -400,6 +418,7 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog * Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 - updated to svn 2929 snapshot +- added tmpfiles.d/ descriptions * Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 873325e32908202dd558679467b71ed9b9a47aac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:46:25 -0600 Subject: [PATCH 48/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index db31f37..7408141 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1500 +Release: %release_func 1501 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 - updated to svn 2929 snapshot - added tmpfiles.d/ descriptions From 52ff05b4dd6f33055ba375fdd2590c230ebf7a8e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 20 Feb 2011 18:41:28 +0100 Subject: [PATCH 49/55] removed 'mount' BR --- util-vserver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 7408141..8fe47f9 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1501 +Release: %release_func 1600 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -42,7 +42,7 @@ Requires: %name-lib%{?_isa} = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version -BuildRequires: mount vconfig gawk iproute iptables +BuildRequires: vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 +- removed 'mount' BR + * Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e94872f4ac01bb795899f057da1c9fd4e9e6ca37 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 23 Apr 2011 14:45:51 +0200 Subject: [PATCH 50/55] fixed tmpfiles.d syntax --- util-vserver.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 8fe47f9..6c608ba 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1600 +Release: %release_func 1601 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -235,9 +235,9 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf --d %_localstatedir/run/vservers 0755 root root --d %_localstatedir/run/vservers.rev 0755 root root --d %_localstatedir/run/vshelper 0755 root root +d %_localstatedir/run/vservers 0755 root root +d %_localstatedir/run/vservers.rev 0755 root root +d %_localstatedir/run/vshelper 0755 root root EOF @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 +- fixed tmpfiles.d syntax + * Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 - removed 'mount' BR From 5b225a60d5967ac5d9e0529a6718cbd15bfd218f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 11 Jan 2012 10:46:59 +0000 Subject: [PATCH 51/55] mktemp was long obsoleted by coreutils --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 6c608ba..24b933f 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core%{?_isa} = %version-%release Requires: %name-lib%{?_isa} = %version-%release -Requires: diffutils mktemp sed +Requires: diffutils coreutils sed Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: vconfig gawk iproute iptables From 6a0263a8525022d79771fee71285399314ff667f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:41:53 -0600 Subject: [PATCH 52/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 24b933f..8cf32a0 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1601 +Release: %release_func 1602 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 - fixed tmpfiles.d syntax From 4f45f5c675a641174761273f86873a4ff9b75b35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:14:46 -0500 Subject: [PATCH 53/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 8cf32a0..95b9b86 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1602 +Release: %release_func 1603 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 5ed607c88d0bafc6e3f6b4f8a6e404173cf6b7b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:35:11 -0600 Subject: [PATCH 54/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 95b9b86..8813291 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1603 +Release: %release_func 1604 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.30.215+svn2929-1604 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4e6c1bcb6e79d7f1cccc1aaba3817d7ecb09e2e9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Mar 2013 00:25:37 -0400 Subject: [PATCH 55/55] Retire util-vserver - no maintainer --- Makefile | 2 - dead.package | 1 + lastver | 1 - sources | 1 - util-vserver.spec | 610 ---------------------------------------------- verinfo | 2 - 6 files changed, 1 insertion(+), 616 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 lastver delete mode 100644 sources delete mode 100644 util-vserver.spec delete mode 100644 verinfo diff --git a/Makefile b/Makefile deleted file mode 100644 index e5461e3..0000000 --- a/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MAKEFILE_COMMON = $(HOME)/.fedora/common.mk --include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5e32ab9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2013-03-11 due to a lack of a willing Fedora maintainer. diff --git a/lastver b/lastver deleted file mode 100644 index 1790a0f..0000000 --- a/lastver +++ /dev/null @@ -1 +0,0 @@ -0.30.215 diff --git a/sources b/sources deleted file mode 100644 index fd9d2ce..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -993b02c69f3937b772887da31fa6a363 util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/util-vserver.spec b/util-vserver.spec deleted file mode 100644 index 8813291..0000000 --- a/util-vserver.spec +++ /dev/null @@ -1,610 +0,0 @@ -## This package understands the following switches: -## --without dietlibc ... disable usage of dietlibc -## --with xalan ... require/use the xalan xslt processor - -## Fedora Extras specific customization below... - -%ifarch ppc64 -## fails because '__sigsetjmp' and '__longjmp' are undefined -%bcond_with dietlibc -%else -%bcond_without dietlibc -%endif - -%bcond_with xalan -%bcond_without tmpfiles -## - -%global confdir %_sysconfdir/vservers -%global confdefaultdir %confdir/.defaults -%global pkglibdir %_libdir/%name -%global chkconfig /sbin/chkconfig - -%global _localstatedir %_var - -%{!?python_sitearch:%global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} - -Summary: Linux virtual server utilities -Name: util-vserver -Version: 0.30.215+svn2929 -Release: %release_func 1604 -License: GPLv2 -Group: System Environment/Base -URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 -#Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc - -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: init(%name) -Requires: %name-core%{?_isa} = %version-%release -Requires: %name-lib%{?_isa} = %version-%release -Requires: diffutils coreutils sed -Provides: vserver = %version-%release -Obsoletes: vserver < %version -BuildRequires: vconfig gawk iproute iptables -BuildRequires: gcc-c++ wget which diffutils -BuildRequires: e2fsprogs-devel nss-devel -BuildRequires: doxygen tetex-latex graphviz ghostscript -BuildRequires: libxslt rsync dump -BuildRequires: procps module-init-tools net-tools -Requires(post): %name-core -Requires(pre): %pkglibdir -Requires(postun): %pkglibdir -%{?with_dietlibc:BuildRequires: dietlibc} -%{?with_xalan:BuildRequires: xalan-j} - -%package lib -Summary: Dynamic libraries for util-vserver -Group: System Environment/Libraries - -%package core -Summary: The core-utilities for util-vserver -Group: Applications/System -Requires: util-linux - -%package build -Summary: Tools which can be used to build vservers -Group: Applications/System -Requires: rpm wget binutils tar -Requires: %name = %version-%release -Requires(pre): %confdir -Requires(postun): %confdir -Requires(post): %name-core - -%package sysv -Summary: SysV-initscripts for vserver -Group: System Environment/Base -Provides: init(%name) = sysv -Requires: make diffutils -Requires: initscripts -Requires: %name = %version-%release -Requires(post): %chkconfig -Requires(preun): %chkconfig -Requires(pre): %_initrddir %pkglibdir -requires(postun): %_initrddir %pkglibdir - -%package legacy -Summary: Legacy utilities for util-vserver -Group: Applications/System -Requires: %name = %version-%release -Requires(post): %chkconfig -Requires(preun): %chkconfig -Requires(pre): %_initrddir %pkglibdir -requires(postun): %_initrddir %pkglibdir - -%package devel -Summary: Header-files and libraries needed to develop vserver based applications -Group: Development/Libraries -Requires: pkgconfig -Requires: %name-lib%{?_isa} = %version-%release - -%package static -Summary: Static libraries needed to develop vserver based applications -Group: Development/Libraries -Requires: pkgconfig -Requires: %name-lib%{?_isa} = %version-%release - -%package python -Summary: Python bindings to develop vserver-based applications -Group: Development/Libraries -BuildRequires: python-devel ctags -Requires: %name-lib%{?_isa} = %version-%release - - -%description -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This requires a special kernel supporting the new new_s_context and -set_ipv4root system call. - -%description lib -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains the shared libraries needed by all other -'util-vserver' subpackages. - -%description core -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains utilities which are required to communicate with -the Linux-Vserver enabled kernel. - - -%description build -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains utilities which assist in building Vservers. - -%description sysv -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains the SysV initscripts which start and stop -VServers and related tools. - - -%description legacy -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains the tools which are needed to work with VServers -having an old-style configuration. - - -%description devel -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains header files and libraries which are needed to -develop VServer related applications. - - -%description static -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains static libraries which are needed to develop -VServer related applications. - -%description python -util-vserver provides the components and a framework to setup virtual -servers. A virtual server runs inside a linux server. It is nevertheless -highly independent. As such, you can run various services with normal -configuration. The various vservers can't interact with each other and -can't interact with services in the main server. - -This package contains the files needed to interface with the -Linux-VServer API from Python. - - -%prep -%setup -q - -sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/* - - -%build -%configure --with-initrddir=%_initrddir --enable-release \ - --with-crypto-api=nss \ - --with-python \ - %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc - -%__make %{?_smp_mflags} all -%__make %{?_smp_mflags} doc - - -%install -rm -rf $RPM_BUILD_ROOT -%__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution - -rm -f $RPM_BUILD_ROOT%_libdir/*.la \ - $RPM_BUILD_ROOT%python_sitearch/*.*a - -MANIFEST_CONFIG='%config' \ -MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ -contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat - -install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf -d %_localstatedir/run/vservers 0755 root root -d %_localstatedir/run/vservers.rev 0755 root root -d %_localstatedir/run/vshelper 0755 root root -EOF - - -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - - -%check -%__make check -LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -test -d /vservers || mkdir -m0000 /vservers -test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg - -f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" -f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" -f="%confdefaultdir/cachebase"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/cache/vservers "$f" - -%_sbindir/setattr --barrier /vservers /vservers/.pkg || : - - -%preun -test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || : - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%post sysv -%chkconfig --add vservers-default -%chkconfig --add vprocunhide -%chkconfig --add util-vserver - - -%preun sysv -test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : - -test "$1" != 0 || %chkconfig --del vprocunhide -test "$1" != 0 || %chkconfig --del vservers-default -test "$1" != 0 || %chkconfig --del util-vserver - - -%postun sysv -test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : - - -%triggerin build -- fedora-release, centos-release -function copy() -{ - base=$1 - shift - - for i; do - test -r "$i" || continue - - target=%confdir/.distributions/.common/pubkeys/$base-$(basename "$i") - cp -a "$i" "$target" - done -} -copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* -copy fedora /etc/pki/rpm-gpg/RPM-GPG-* -copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* - - -%post build -test -d /vservers/.hash || mkdir -m0700 /vservers/.hash - -f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \ - ln -s /vservers/.hash "$f"/00 - -%_sbindir/setattr --barrier /vservers/.hash || : - - -%preun build -test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-* - - -%post legacy -%chkconfig --add rebootmgr -%chkconfig --add vservers-legacy - -for i in %v_services; do - %chkconfig --add v_$i -done - -%preun legacy -test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : - -test "$1" != 0 || for i in %v_services; do - %chkconfig --del v_$i -done - -test "$1" != 0 || %chkconfig --del rebootmgr -test "$1" != 0 || %chkconfig --del vservers-legacy - -%postun legacy -test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : - - -%files -f %name-base.list -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -%doc doc/*.html doc/*.css -/sbin/vshelper -%dir %confdir -%dir %confdefaultdir -%dir %confdefaultdir/apps -%dir %confdefaultdir/files -%dir %pkglibdir/defaults -%ghost %confdefaultdir/cachebase -%ghost %confdefaultdir/vdirbase -%ghost %confdefaultdir/run.rev - -%dir %_localstatedir/cache/vservers - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/%name.conf - %ghost %dir %_localstatedir/run/vservers - %ghost %dir %_localstatedir/run/vservers.rev - %ghost %dir %_localstatedir/run/vshelper -%else - %dir %_localstatedir/run/vservers - %dir %_localstatedir/run/vservers.rev - %dir %_localstatedir/run/vshelper -%endif - -%files lib -f %name-lib.list -%files sysv -f %name-sysv.list - - -%files core -f %name-core.list -%defattr(-,root,root,-) -%dir %pkglibdir - - -%files build -f %name-build.list -%defattr(-,root,root,-) -%doc contrib/yum*.patch -%dir %confdir/.distributions -%dir %confdir/.distributions/* -%dir %confdir/.distributions/*/apt -%dir %confdir/.distributions/.common -%dir %confdir/.distributions/.common/pubkeys -%dir %confdefaultdir/apps/vunify -%dir %confdefaultdir/apps/vunify/hash - - -%files legacy -f %name-legacy.list -%defattr(-,root,root,-) -%dir %pkglibdir/legacy - - -%files devel -f %name-devel.list -%defattr(-,root,root,-) -%doc lib/apidoc/latex/refman.pdf -%doc lib/apidoc/html - -%exclude %_libdir/*.a - - -%files static -%defattr(-,root,root,-) -%_libdir/*.a - - -%files python -%defattr(-,root,root,-) -%python_sitearch/*.so -%python_sitearch/*.py* - - -%changelog -* Fri Feb 15 2013 Fedora Release Engineering - 0.30.215+svn2929-1604 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 -- fixed tmpfiles.d syntax - -* Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 -- removed 'mount' BR - -* Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 -- updated to svn 2929 snapshot -- added tmpfiles.d/ descriptions - -* Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu Jun 3 2010 Enrico Scholz - 0.30.215+svn2893-1400 -- updated to svn2893 snapshot -- splitted static libs out of -devel into own subpackage -- added some BRs (thx to Tom "spot" Callaway) -- added %%{?_isa} annotations to some Requires: -- removed a very old workaround - -* Sun Aug 23 2009 Enrico Scholz - 0.30.215+svn2847-0 -- updated to svn 2847 snapshot -- added -python subpackage - -* Sun Jul 26 2009 Fedora Release Engineering - 0.30.215-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.30.215-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 -- rebuilt with recent dietlibc - -* Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 -- fixed build with recent rpm - -* Mon Sep 8 2008 Tom "spot" Callaway - 0.30.215-4 -- fix license tag - -* Sat Apr 19 2008 Enrico Scholz - 0.30.215-3 -- reenabled %%check - -* Mon Apr 14 2008 Alex Lancaster - 0.30.215-2 -- Temporarily disable check to get it to at least build and fix broken - dep in rawhide/F-9. - -* Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 -- updated to 0.30.215 -- use nss-devel instead of beecrypt-devel as BR -- run crypto-suite benchmark in %%check -- fixed initscript runlevels (#441311) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.30.214-3 -- Autorebuild for GCC 4.3 - -* Wed Sep 19 2007 Enrico Scholz - 0.30.214-2 -- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when - a directory becomes a symlink. Hence, remove the 'etch' directory in - %%pre - -* Mon Sep 3 2007 Enrico Scholz - 0.30.214-1 -- updated to 0.30.214 - -* Sat Aug 4 2007 Enrico Scholz - 0.30.213-2 -- added patch to make 'vyum' work with a patched yum-3.2 - -* Thu May 31 2007 Enrico Scholz - 0.30.213-1 -- updated to 0.30.213 -- disabled dietlibc build for PPC64 -- enabled support for 'util-vserver' initscript - -* Fri Apr 20 2007 Enrico Scholz - 0.30.212-4 -- BR some tools tested by ./configure - -* Fri Jan 19 2007 David Woodhouse - 0.30.212-3 -- Build with 64KiB page size - -* Fri Jan 19 2007 David Woodhouse - 0.30.212-2 -- rebuilt with PPC support - -* Sun Dec 10 2006 Enrico Scholz - 0.30.212-1 -- updated to 0.30.212 -- updated URLs -- requires 'rsync' for -build to support new 'rsync' build method - -* Thu Oct 12 2006 Enrico Scholz - 0.30.211-2 -- added graphiz + ghostscript BR - -* Thu Oct 12 2006 Enrico Scholz - 0.30.211-1 -- updated to 0.30.211 - -* Thu Oct 05 2006 Christian Iseli 0.30.210-5 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Mon Sep 18 2006 Enrico Scholz - 0.30.210-4 -- rebuilt - -* Sun Jul 9 2006 Enrico Scholz - 0.30.210-3 -- rebuilt with dietlibc-0.30 - -* Mon Feb 20 2006 Enrico Scholz - 0.30.210-2 -- rebuilt for FC5 - -* Sun Jan 22 2006 Enrico Scholz - 0.30.210-1 -- version 0.30.210 -- removed patches which were from upstream - -* Sun Jan 22 2006 Enrico Scholz - 0.30.210-0 -- do not require 'xalan' anymore by default -- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore -- removed 'chattr' leftovers -- create the '/etc/vservers/.defaults/cachebase' symlink -- added /var/cache/vservers and the needed support -- set barrier attribute on /vservers/.pkg and /vservers/.hash -- added 'centos-release' to the list of packages in the copy-the-keys - trigger script -- create '/vservers/.hash' and add initial configuration for it - -* Thu Nov 3 2005 Enrico Scholz - 0.30.209-4 -- exclude PPC from build; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389 -- added patch to make 'vyum' work with yum-2.4 - -* Tue Nov 1 2005 Enrico Scholz - 0.30.209-3 -- added lot of debug stuff to find out the reason for the 'make check' - failure on PPC (cflags & personlity get killed there) - -* Sun Oct 30 2005 Enrico Scholz - 0.30.209-2 -- made sure that ensc_fmt/* it compiled with dietlibc. Else, it will - fail with the stack-protector in FC5's gcc - -* Sun Oct 30 2005 Enrico Scholz - 0:0.30.209-1 -- version 0.30.209 -- copy centos keys - -* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 -- updated URLs - -* Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 -- version 0.30.208 -- require the -lib subpackage by -devel -- copy GPG keys from /etc/pki/rpm-gpg/ - -* Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 -- added patches to make yum work in chroot environments -- version 0.30.206 - -* Thu Mar 24 2005 Enrico Scholz - 0:0.30.205-1 -- added some %%descriptions -- copy GPG keys from the system into the confdir -- buildrequire dietlibc-0.25 -- BuildRequire beecrypt-devel -- cleanups -- use %%global instead of %%define -- removed 'run.rev' as a vserver-local variable and made it a system-wide setting - -* Wed Jan 26 2005 Enrico Scholz - 0:0.30.198-0.3 -- updated BuildRequires: -- use 'setattr --barrier' instead of 'chattr +t' in the %%post scriptlet -- moved the v_* initscripts to legacy -- do not ship the /vservers directory itself; as it is immutable, the - extraction will fail else - -* Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0 -- documented switches for 'rpmbuild' - -* Wed May 26 2004 Enrico Scholz - 0:0.29.215-0 -- (re)added the MANIFEST_* variables which were lost some time ago; - this will preserve %%config files... - -* Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0 -- use file-list for sysv scripts also - -* Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0 -- added vprocunhide-service support -- added doxygen support -- updated Requires: - -* Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 -- Initial build. diff --git a/verinfo b/verinfo deleted file mode 100644 index b78fa74..0000000 --- a/verinfo +++ /dev/null @@ -1,2 +0,0 @@ -http://ftp.linux-vserver.org/pub/utils/util-vserver/ -util-vserver-(.*?)\.tar\.bz2