From 1aa43f20bcb74b0487105e52e1248ffee7e3b4d3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 18:37:42 +0000 Subject: [PATCH 1/6] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 9600aae9553de75a775f157ccf888b93752982ec Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 09:18:42 +0000 Subject: [PATCH 2/6] - updated to 0.30.215 --- .cvsignore | 3 ++- lastver | 2 +- sources | 4 ++-- util-vserver-0.30.214-stat.patch | 14 -------------- 4 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 util-vserver-0.30.214-stat.patch 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 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 b7315696818c5d58b62ef681441e39498f1a58c6 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 12 Apr 2008 09:30:51 +0000 Subject: [PATCH 3/6] - 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 afa7fff..ff22f11 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 @@ -365,6 +365,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 d8940e8ea0c4b43ec8f5a3e702fc9cd7d57bdff8 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 21 Jun 2008 15:12:02 +0000 Subject: [PATCH 4/6] 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 ff22f11..756cc61 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 91922f7de9b384ca9b366b45693005e5ceed7b65 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:39 +0000 Subject: [PATCH 5/6] 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 fe4ca424c9673b493ab3ae12ce5dbc873bb582fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:50:21 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 20 -------------------- branch | 1 - 3 files changed, 21 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 ccf7583..0000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile for source rpm: util-vserver -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8