From c1681629188f8bc0de2dfd27508d8d7c84518d59 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 10:51:50 +0000 Subject: [PATCH 01/10] Initialize branch F-7 for util-vserver --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 01020119922c2d1c63613755c815ded3a722c455 Mon Sep 17 00:00:00 2001 From: ensc Date: Fri, 1 Jun 2007 07:05:05 +0000 Subject: [PATCH 02/10] - updated to 0.30.213 - disabled dietlibc build for PPC64 - enabled support for 'util-vserver' initscript - BR some tools tested by ./configure --- sources | 4 ++-- util-vserver-0.30.212-pagesize.patch | 11 ----------- util-vserver.spec | 27 +++++++++++++++++++++------ 3 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 util-vserver-0.30.212-pagesize.patch 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-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]; - diff --git a/util-vserver.spec b/util-vserver.spec index 573de01..276db04 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 \ @@ -217,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 @@ -225,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 @@ -349,6 +356,14 @@ 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 +- 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 From 303128936f83b76751fbc7781ac27f6b672aef5c Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 4 Aug 2007 10:52:11 +0000 Subject: [PATCH 03/10] 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 276db04..954e6e9 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 \ @@ -356,6 +360,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 5d038180159423d62c01937b030c46e5dad206b9 Mon Sep 17 00:00:00 2001 From: ensc Date: Sun, 2 Sep 2007 11:30:32 +0000 Subject: [PATCH 04/10] 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 2d1fcf1dc1476bb5b7633105b7bf925ab440e1eb Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 3 Sep 2007 07:57:48 +0000 Subject: [PATCH 05/10] 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 | 17 ++++++++--------- 5 files changed, 25 insertions(+), 23 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 954e6e9..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 @@ -360,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 fb339a0c3ac9f18a6e21391dbe3aab8741e22a6e Mon Sep 17 00:00:00 2001 From: ensc Date: Mon, 3 Sep 2007 17:56:53 +0000 Subject: [PATCH 06/10] 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 3d1b30370bb3b8f55262aaa0fc04de415bb34158 Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 19 Sep 2007 20:11:21 +0000 Subject: [PATCH 07/10] - 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 3c93463..6324328 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,9 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-* copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* +%pre build +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 +364,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 1a9bf79dc719cab5a45abfb46f8aec7d45df40f5 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 09:34:03 +0000 Subject: [PATCH 08/10] - updated to 0.30.215 - enforced beecrypt crypto api - run crypto-suite benchmark in %%check --- util-vserver.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 6324328..8fe35a6 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 2 +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) @@ -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=beecrypt \ %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc %__make %{?_smp_mflags} all @@ -200,6 +199,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 @@ -364,6 +364,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 +- updated to 0.30.215 +- enforced beecrypt crypto api +- run crypto-suite benchmark in %%check + * 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 8bb96bbac222954219f0bf248ba363c02307991f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:39 +0000 Subject: [PATCH 09/10] 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 ca269bd..ec2f183 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,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 1fa19854d3ec68d22a42cb462d1c1c04ffc6a879 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:50:23 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 ec2f183..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: util-vserver -# $Id$ -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 $$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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7