updated vserver (1.26) - the new stable tree vquota merged into vserver vserver (1.26), quota (0.13), utils (1.29), cleanup building cq-tools, vr-tools, vproc in adition to util-vserver git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2403 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
@ -1 +0,0 @@ |
|||
- quota-3.09 patch |
|||
@ -1,34 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/make_install.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./Makefile.orig Tue Feb 11 07:24:43 2003
|
|||
+++ ./Makefile Tue Feb 11 07:32:10 2003
|
|||
@@ -11,6 +11,9 @@
|
|||
rm -f *.o |
|||
rm -f $(TARGETS) |
|||
|
|||
+install: all
|
|||
+ $(INSTALL) -m 755 $(TARGETS) $(sbindir)
|
|||
+
|
|||
vrsetup : $(vrsetup_OBJ) |
|||
$(CC) $(CFLAGS) $(LIBS) $< -o $@ |
|||
strip $@ |
|||
@ -1,33 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_conf.in |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
echo_status "Including Contexts Quota (vquota) patch..." |
|||
|
|||
pkg_vquota_confdir=$base/package/mnemoc/vquota |
|||
pkg_vquota_archdir=$base/download/mnemoc/vquota |
|||
|
|||
set -x |
|||
pkg_vquota_patchbz2=$( grep "^\[D\]" ${pkg_vquota_confdir}/vquota.desc \ |
|||
| tr ' ' '\t' | tr -s '\t' | cut -f3 | grep -e "^${pkg:0:5}" ) |
|||
pkg_vquota_ver=$( sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_vquota_confdir}/vquota.desc ) |
|||
set +x |
|||
|
|||
@ -1,23 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24-header_pre.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
. $base/package/mnemoc/vquota/pkg_linux24_pre.conf |
|||
@ -1,23 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24-src_pre.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
. $base/package/mnemoc/vquota/pkg_linux24_pre.conf |
|||
@ -1,34 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_linux24_pre.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
. $base/package/mnemoc/vquota/pkg_conf.in |
|||
|
|||
pkg_vquota_patchdir=$( mktemp -d ) |
|||
hook_add postpatch 4 "rm -rf $pkg_vquota_patchdir" |
|||
|
|||
pkg_vquota_patchfile=${pkg_vquota_patchdir}/ctx-vquota-${pkg_vquota_ver}.patch |
|||
|
|||
bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > \ |
|||
${pkg_vquota_patchfile} |
|||
|
|||
var_append confscripts ' ' "${pkg_vquota_confdir}/kernel.conf.sh" |
|||
var_append patchfiles ' ' "$pkg_vquota_patchfile" |
|||
@ -1,30 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_quota_pre.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
. $base/package/mnemoc/vquota/pkg_conf.in |
|||
|
|||
pkg_vquota_patchfile=$( mktemp ) |
|||
hook_add postpatch 4 "rm -f $pkg_vquota_patchfile" |
|||
|
|||
bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > $pkg_vquota_patchfile |
|||
|
|||
var_append patchfiles ' ' "$pkg_vquota_patchfile" |
|||
@ -1,30 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vquota/pkg_vserver_pre.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
. $base/package/mnemoc/vquota/pkg_conf.in |
|||
|
|||
pkg_vquota_patchfile=$( mktemp ) |
|||
hook_add postpatch 4 "rm -f $pkg_vquota_patchfile" |
|||
|
|||
bunzip2 -c "${pkg_vquota_archdir}/${pkg_vquota_patchbz2}" > $pkg_vquota_patchfile |
|||
|
|||
var_append patchfiles ' ' "$pkg_vquota_patchfile" |
|||
@ -1,34 +0,0 @@ |
|||
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
[COPY] |
|||
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
[COPY] Please add additional copyright information _after_ the line containing |
|||
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
[COPY] |
|||
[COPY] ROCK Linux: rock-src/package/mnemoc/vquota/vquota.cache |
|||
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
[COPY] |
|||
[COPY] This program is free software; you can redistribute it and/or modify |
|||
[COPY] it under the terms of the GNU General Public License as published by |
|||
[COPY] the Free Software Foundation; either version 2 of the License, or |
|||
[COPY] (at your option) any later version. A copy of the GNU General Public |
|||
[COPY] License can be found at Documentation/COPYING. |
|||
[COPY] |
|||
[COPY] Many people helped and are helping developing ROCK Linux. Please |
|||
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
[COPY] file for details. |
|||
[COPY] |
|||
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
[TIMESTAMP] 1045899685 Sat Feb 22 04:41:25 2003 |
|||
[CONFIG-ID] 1.7-snapshot-x86-pentium3-mnemosyne-expert |
|||
[ROCKVER] 1.7-snapshot |
|||
|
|||
[LOGS] 5-vquota.log 9-vquota.log |
|||
|
|||
[BUILDTIME] 5603 (9) |
|||
[SIZE] 0.04 MB, 9 files |
|||
|
|||
[DEP] bash bzip2 fileutils findutils grep make patch sed sysfiles tar |
|||
[DEP] textutils |
|||
|
|||
@ -1,45 +0,0 @@ |
|||
|
|||
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
[COPY] |
|||
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
[COPY] Please add additional copyright information _after_ the line containing |
|||
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
[COPY] |
|||
[COPY] ROCK Linux: rock-src/package/mnemoc/vquota/vquota.desc |
|||
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
[COPY] |
|||
[COPY] This program is free software; you can redistribute it and/or modify |
|||
[COPY] it under the terms of the GNU General Public License as published by |
|||
[COPY] the Free Software Foundation; either version 2 of the License, or |
|||
[COPY] (at your option) any later version. A copy of the GNU General Public |
|||
[COPY] License can be found at Documentation/COPYING. |
|||
[COPY] |
|||
[COPY] Many people helped and are helping developing ROCK Linux. Please |
|||
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
[COPY] file for details. |
|||
[COPY] |
|||
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
[I] VServer Context Quota |
|||
|
|||
[T] This is the first attempt to add per context quota support to the linux |
|||
[T] kernel vserver project (new context, and per-context user/group quota), |
|||
|
|||
[U] http://www.13thfloor.at/VServer/ |
|||
|
|||
[A] Herbert Potzl <herbert@13thfloor.at> |
|||
[M] Alejandro Mery <amery@geeks.cl> |
|||
|
|||
[C] extra/security |
|||
|
|||
[L] GPL |
|||
[S] Alpha |
|||
[V] 0.12 |
|||
[P] O -----5---9 793.000 |
|||
|
|||
[D] 982560686 vquota-tools-0.12.tar.bz2 http://www.13thfloor.at/VServer/ |
|||
[D] 4004901191 linux-2.4.21-ctx17-vquota-0.10.diff.bz2 http://www.13thfloor.at/VServer/ |
|||
[D] 2125636190 vserver-0.23-cap_quotactl.diff.bz2 http://www.13thfloor.at/VServer/ |
|||
[D] 2351796584 quota-tools-3.08-ctx17-v0.35.diff.bz2 http://www.13thfloor.at/VServer/ |
|||
|
|||
@ -1,40 +1,21 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/mnemoc/vserver/no_extraversion.diff |
|||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|||
# |
|||
# This program is free software; you can redistribute it and/or modify |
|||
# it under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 2 of the License, or |
|||
# (at your option) any later version. A copy of the GNU General Public |
|||
# License can be found at Documentation/COPYING. |
|||
# |
|||
# Many people helped and are helping developing ROCK Linux. Please |
|||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|||
# file for details. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./ctx17a.diff.orig 2003-09-10 23:37:16.000000000 -0400
|
|||
+++ ./ctx17a.diff 2003-09-10 23:38:21.000000000 -0400
|
|||
@@ -1,15 +1,3 @@
|
|||
-diff -NurP --minimal linux-2.4.22/Makefile linux-2.4.22-ctx17a/Makefile
|
|||
---- linux-2.4.22/Makefile 2003-08-25 03:13:16.000000000 +0200
|
|||
-+++ linux-2.4.22-ctx17a/Makefile 2003-08-25 03:16:10.000000000 +0200
|
|||
--- ./vserver-1.24.patch.orig 2003-12-17 11:04:30.000000000 -0300
|
|||
+++ ./vserver-1.24.patch 2003-12-17 11:04:47.000000000 -0300
|
|||
@@ -13,18 +13,6 @@
|
|||
Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL) |
|||
CONFIG_BLK_DEV_UMEM |
|||
Saying Y here will include support for the MM5415 family of |
|||
-diff -NurpP --minimal linux-2.4.23/Makefile linux-2.4.23-vs1.22/Makefile
|
|||
---- linux-2.4.23/Makefile Fri Nov 28 19:26:21 2003
|
|||
-+++ linux-2.4.23-vs1.22/Makefile Sat Dec 13 18:42:20 2003
|
|||
-@@ -1,7 +1,7 @@
|
|||
- VERSION = 2
|
|||
- PATCHLEVEL = 4
|
|||
- SUBLEVEL = 22
|
|||
- SUBLEVEL = 24
|
|||
--EXTRAVERSION =
|
|||
-+EXTRAVERSION = -ctx17a
|
|||
-+EXTRAVERSION = -vs1.26
|
|||
-
|
|||
- KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
|||
-
|
|||
diff -NurP --minimal linux-2.4.22/arch/i386/kernel/entry.S linux-2.4.22-ctx17a/arch/i386/kernel/entry.S |
|||
--- linux-2.4.22/arch/i386/kernel/entry.S 2003-06-13 16:51:29.000000000 +0200 |
|||
+++ linux-2.4.22-ctx17a/arch/i386/kernel/entry.S 2003-08-25 03:16:10.000000000 +0200 |
|||
diff -NurpP --minimal linux-2.4.23/arch/alpha/kernel/entry.S linux-2.4.23-vs1.22/arch/alpha/kernel/entry.S |
|||
--- linux-2.4.23/arch/alpha/kernel/entry.S Fri Jun 13 16:51:29 2003 |
|||
+++ linux-2.4.23-vs1.22/arch/alpha/kernel/entry.S Sat Dec 13 18:42:20 2003 |
|||
@ -0,0 +1,27 @@ |
|||
vserver_cqtools() { |
|||
cd $builddir |
|||
tar $taropt $archdir/$( echo "$desc_D" | grep " cq-tools-" | cut -d' ' -f2 ) |
|||
cd cq-tools-* |
|||
make all |
|||
cp -vdf $( grep 'all:' Makefile | cut -f2 ) $sbindir |
|||
} |
|||
vserver_vrtools() { |
|||
cd $builddir |
|||
tar $taropt $archdir/$( echo "$desc_D" | grep " vr-tools-" | cut -d' ' -f2 ) |
|||
cd vr-tools-* |
|||
make vrsetup |
|||
cp -vf vrsetup $sbindir |
|||
} |
|||
vserver_vproc() { |
|||
cd $builddir |
|||
tar $taropt $archdir/$( echo "$desc_D" | grep " vproc-" | cut -d' ' -f2 ) |
|||
cd vproc-* |
|||
make vproc |
|||
cp -vf vproc $sbindir |
|||
} |
|||
|
|||
if [ "$ROCKCFG_PKG_VSERVER_QUOTA" = "1" ]; then |
|||
hook_add postdoc 6 'vserver_vrtools; vserver_cqtools' |
|||
fi |
|||
hook_add postdoc 5 'vserver_vproc' |
|||
|
|||