Alejandro Mery <amery@geeks.cl>:

boehm-gc: copyright patch
ktcpvs: cache (it's O)
lvs: copyright patch
mono: copyright patch
vserver:
 - patches adapted for 2.4.22/ctx17a
 - pkg_*_pre.conf instead of parse-config
 - JFS no longer to kernel-disable list
vquota:
 - copyright patch
 - pkg_*_pre.conf instead of parse-config
rsbac:
 - errno.patch removed
 - pkg_*_pre.conf instead of parse-config


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1429 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -3,6 +3,7 @@
 
  - updated openssh and nmap
  - futher jail cleanups and the new includedir addition
+ - Alejandro Mery: fixes to mnemoc
 
 *) 2003-09-15 (2.0.0-rc1 - 2.0.0-rc2)
 

package/mnemoc/boehm-gc/install_private_headers.in

@@ -1,3 +1,24 @@
+# --- 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/boehm-gc/install_private_headers.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 ---
 flistdel="$flistdel|$prefix/include/gc/private/.*"
 flistdel="$flistdel|$prefix/include/gc/(cord\.h|ec\.h|javaxfc\.h)"
 

package/mnemoc/ktcpvs/ktcpvs.cache

@@ -20,14 +20,14 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1057639778 Tue Jul  8 00:49:38 2003
-[CONFIG-ID] 2.0.0-rc1-x86-pentium-mmx-mnemosyne-expert
-[ROCKVER] 2.0.0-rc1
+[TIMESTAMP] 1063223465 Wed Sep 10 15:51:05 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium2-32-mnemosyne-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-ktcpvs.log 9-ktcpvs.log
 
-[BUILDTIME] 8825 (9)
-[SIZE] 0.26 MB, 21 files
+[BUILDTIME] 8289 (9)
+[SIZE] 0.27 MB, 21 files
 
 [DEP] autoconf automake bash binutils bzip2 coreutils diffutils findutils
 [DEP] gcc33 glibc23 grep linux24-src make mktemp patch perl5 sed sysfiles

package/mnemoc/lvs/kernel.conf.sh

@@ -1,4 +1,25 @@
 #!/bin/bash
+# --- 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/lvs/kernel.conf.sh
+# 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 CONFIG_NETFILTER=y >> $1
 echo CONFIG_IP_VS=y >> $1

package/mnemoc/mono/mono.in

@@ -1,3 +1,25 @@
+# --- 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/mono/mono.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 ---
+
 [ "$prefix_auto" = 1 ] && prefix="opt/mono"
 set_confopt
 sysconfdir=${sysconfdir%/mono}

package/mnemoc/rsbac/errno_h.patch

@@ -1,162 +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/rsbac/errno_h.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 ---
-
---- ./src/acl_grant.c.orig	2002-07-25 06:01:55.000000000 -0400
-+++ ./src/acl_grant.c	2003-07-09 05:07:19.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <pwd.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>
---- ./src/acl_mask.c.orig	2003-07-09 05:26:45.000000000 -0400
-+++ ./src/acl_mask.c	2003-07-09 05:27:34.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <pwd.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/acl_getname.h>
---- ./src/acl_rights.c.orig	2003-07-09 05:26:45.000000000 -0400
-+++ ./src/acl_rights.c	2003-07-09 05:27:58.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <pwd.h>
-+#include <errno.h>
- #include <unistd.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
---- ./src/acl_tlist.c.orig	2003-07-09 05:26:45.000000000 -0400
-+++ ./src/acl_tlist.c	2003-07-09 05:28:12.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <pwd.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>
---- ./src/attr_back_dev.c.orig	2003-07-09 05:26:45.000000000 -0400
-+++ ./src/attr_back_dev.c	2003-07-09 05:32:10.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/syscalls.h>
---- ./src/attr_back_fd.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_back_fd.c	2003-07-09 05:28:35.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/syscalls.h>
---- ./src/attr_back_net.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_back_net.c	2003-07-09 05:28:46.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/syscalls.h>
---- ./src/attr_back_user.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_back_user.c	2003-07-09 05:28:59.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/syscalls.h>
---- ./src/attr_get_fd.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_get_fd.c	2003-07-09 05:29:08.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>
---- ./src/attr_rm_fd.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_rm_fd.c	2003-07-09 05:29:16.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>
---- ./src/attr_set_fd.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/attr_set_fd.c	2003-07-09 05:32:26.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>
---- ./src/auth_back_cap.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/auth_back_cap.c	2003-07-09 05:29:29.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/syscalls.h>
---- ./src/linux2acl.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/linux2acl.c	2003-07-09 05:32:57.000000000 -0400
-@@ -6,6 +6,7 @@
- #include <dirent.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/getname.h>
- #include <rsbac/acl_getname.h>
---- ./src/rc_get_eff_rights_fd.c.orig	2003-07-09 05:26:46.000000000 -0400
-+++ ./src/rc_get_eff_rights_fd.c	2003-07-09 05:33:04.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- #include <rsbac/types.h>
- #include <rsbac/aci_data_structures.h>
- #include <rsbac/getname.h>

package/mnemoc/rsbac/kernel.conf.sh

@@ -1,4 +1,25 @@
 #!/bin/sh
+# --- 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/rsbac/kernel.conf.sh
+# 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 "Enabling RSBAC..."
 echo -e '\nCONFIG_RSBAC=y\n' >> $1

package/mnemoc/rsbac/parse-config

@@ -1,50 +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/rsbac/parse-config
-# 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 ---
-
-if pkgcheck rsbac X; then
-	if [ ${pkg:0:7} == linux24 ]; then
-		echo_status "Including RSBAC patch..."
-		pkg_rsbac_tempdir=`mktemp -d`
-		pkg_rsbac_archdir=$base/download/mnemoc/rsbac
-		pkg_rsbac_confdir=$base/package/mnemoc/rsbac
-		pkg_rsbac_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_rsbac_confdir}/rsbac.desc`
-
-		# ignore kernel version of the patch, it can be appliable to another.
-		pkg_rsbac_lxpatch=$( grep "^\[D\]" ${pkg_rsbac_confdir}/rsbac.desc | \
-			sed -n "s,.* \(patch-.*-v${pkg_rsbac_ver}.gz\) .*,\1,p" )
-
-		bunzip2 -c ${pkg_rsbac_archdir}/${pkg_rsbac_lxpatch%.gz}.bz2 > \
-			${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch
-
-		var_append patchfiles ' ' "${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch"
-		var_append patchfiles ' ' "${pkg_rsbac_confdir}/rsbac-no_extraversion.diff"
-		var_append conffiles  ' ' "${pkg_rsbac_confdir}/kernel.conf.sh"
-
-		hook_add prepatch  4 "tar -v $taropt ${pkg_rsbac_archdir}/rsbac-v${pkg_rsbac_ver}.tar.bz2"
-		hook_add postpatch 6 "rm -rf $pkg_rsbac_tempdir"
-
-		# apply hotfixes here
-		for i in $pkg_rsbac_lxpatches; do
-			var_append patchfiles ' ' "${pkg_rsbac_archdir}/rsbac-bugfix-v$pkg_rsbac_ver-$i.diff"
-		done
-	fi
-fi

package/mnemoc/rsbac/pkg_linux24-header_pre.conf

@@ -0,0 +1,23 @@
+# --- 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/rsbac/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/rsbac/pkg_linux24_pre.conf

package/mnemoc/rsbac/pkg_linux24-src_pre.conf

@@ -0,0 +1,22 @@
+# --- 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/rsbac/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/rsbac/pkg_linux24_pre.conf

package/mnemoc/rsbac/pkg_linux24_pre.conf

@@ -0,0 +1,46 @@
+# --- 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/rsbac/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 ---
+
+echo_status "Including RSBAC patch..."
+pkg_rsbac_tempdir=`mktemp -d`
+pkg_rsbac_archdir=$base/download/mnemoc/rsbac
+pkg_rsbac_confdir=$base/package/mnemoc/rsbac
+pkg_rsbac_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_rsbac_confdir}/rsbac.desc`
+
+# ignore kernel version of the patch, it can be appliable to another.
+pkg_rsbac_lxpatch=$( grep "^\[D\]" ${pkg_rsbac_confdir}/rsbac.desc | \
+	sed -n "s,.* \(patch-.*-v${pkg_rsbac_ver}.gz\) .*,\1,p" )
+
+bunzip2 -c ${pkg_rsbac_archdir}/${pkg_rsbac_lxpatch%.gz}.bz2 > \
+	${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch
+
+var_append patchfiles ' ' "${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch"
+var_append patchfiles ' ' "${pkg_rsbac_confdir}/rsbac-no_extraversion.diff"
+var_append conffiles  ' ' "${pkg_rsbac_confdir}/kernel.conf.sh"
+
+hook_add prepatch  4 "tar -v $taropt ${pkg_rsbac_archdir}/rsbac-v${pkg_rsbac_ver}.tar.bz2"
+hook_add postpatch 6 "rm -rf $pkg_rsbac_tempdir"
+
+# apply hotfixes here
+for i in $pkg_rsbac_lxpatches; do
+	var_append patchfiles ' ' "${pkg_rsbac_archdir}/rsbac-bugfix-v$pkg_rsbac_ver-$i.diff"
+done

package/mnemoc/vquota/kernel.conf.sh

@@ -1,4 +1,25 @@
 #!/bin/bash
+# --- 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/kernel.conf.sh
+# 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 "CONFIG_QUOTA=y" >> $1
 echo "CONFIG_BLK_DEV_VROOT=y" >> $1

package/mnemoc/vquota/parse-config

@@ -1,70 +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/parse-config
-# 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 ---
-
-if pkgcheck vquota X; then
-	if [ ${pkg:0:7} == linux24 -o $pkg == vserver -o $pkg == quota ]; then
-		echo_status "Including Contexts Quota (vquota) patch..."
-
-		pkg_vquota_confdir=$base/package/mnemoc/vquota
-		pkg_vquota_archdir=$base/download/mnemoc/vquota
-		pkg_vquota_patchfile=''
-
-		for x in $( grep "^\[D\]" ${pkg_vquota_confdir}/vquota.desc | tr ' ' '\t' | tr -s '\t' | cut -f3 ); do
-			case "$x" in
-				linux*)
-					if [ "${pkg:0:7}" == "linux24" ] ; then
-						pkg_vquota_patchdir=$( mktemp -d )
-						hook_add postpatch  4 "rm -rf $pkg_vquota_patchdir"
-
-						pkg_vquota_ver=$( sed -n 's,^\[V\] \(.*\),\1,p' \
-							$pkg_vquota_confdir/vquota.desc )
-
-						pkg_vquota_patchfile=${pkg_vquota_patchdir}/ctx-vquota-${pkg_vquota_ver}.patch
-
-						bunzip2 -c "${pkg_vquota_archdir}/$x" > \
-							${pkg_vquota_patchfile}
-						
-		                		var_append conffiles ' ' "${pkg_vquota_confdir}/kernel.conf.sh"
-					fi
-					;;
-				vserver*)
-					if [ "$pkg" == "vserver" ] ; then
-						pkg_vquota_patchfile="/tmp/vquota-vserver.diff"
-
-						bunzip2 -c "${pkg_vquota_archdir}/$x" > $pkg_vquota_patchfile
-						hook_add postpatch  4 "rm -f $pkg_vquota_patchfile"
-					fi
-					;;
-				quota*)
-					if [ "$pkg" == "quota" ] ; then
-						pkg_vquota_patchfile="/tmp/vquota-quota.diff"
-
-						bunzip2 -c "${pkg_vquota_archdir}/$x" > $pkg_vquota_patchfile
-						hook_add postpatch  4 "rm -f $pkg_vquota_patchfile"
-					fi
-					;;
-			esac
-		done
-
-		var_append patchfiles ' ' "$pkg_vquota_patchfile"
-	fi
-fi

package/mnemoc/vquota/pkg_conf.in

@@ -0,0 +1,33 @@
+# --- 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
+

package/mnemoc/vquota/pkg_linux24-header_pre.conf

@@ -0,0 +1,23 @@
+# --- 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

package/mnemoc/vquota/pkg_linux24-src_pre.conf

@@ -0,0 +1,23 @@
+# --- 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

package/mnemoc/vquota/pkg_linux24_pre.conf

@@ -0,0 +1,34 @@
+# --- 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"

package/mnemoc/vquota/pkg_quota_pre.conf

@@ -0,0 +1,30 @@
+# --- 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"

package/mnemoc/vquota/pkg_vserver_pre.conf

@@ -0,0 +1,30 @@
+# --- 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"

package/mnemoc/vserver/kernel-disable.lst

@@ -1 +0,0 @@
-CONFIG_JFS_FS		2003-01-29	2.4.20	fs/jfs/*

package/mnemoc/vserver/no_extraversion.diff

@@ -20,21 +20,21 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./ctx-17.patch.orig	2003-07-10 00:43:23.000000000 -0400
-+++ ./ctx-17.patch	2003-07-10 00:43:51.000000000 -0400
+--- ./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 -NurbP --minimal linux-2.4.21/Makefile linux-2.4.21-ctx17/Makefile
----- linux-2.4.21/Makefile	Fri Jun 13 17:49:08 2003
--+++ linux-2.4.21-ctx17/Makefile	Fri Jun 13 17:54:29 2003
+-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
 -@@ -1,7 +1,7 @@
 - VERSION = 2
 - PATCHLEVEL = 4
-- SUBLEVEL = 21
+- SUBLEVEL = 22
 --EXTRAVERSION =
--+EXTRAVERSION = -ctx17
+-+EXTRAVERSION = -ctx17a
 - 
 - KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 - 
- diff -NurbP --minimal linux-2.4.21/arch/i386/kernel/entry.S linux-2.4.21-ctx17/arch/i386/kernel/entry.S
- --- linux-2.4.21/arch/i386/kernel/entry.S	Fri Jun 13 17:49:08 2003
- +++ linux-2.4.21-ctx17/arch/i386/kernel/entry.S	Fri Jun 13 17:54:29 2003
+ 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

package/mnemoc/vserver/parse-config

@@ -1,59 +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/vserver/parse-config
-# 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 ---
-
-if pkgcheck vserver X; then
-	if [ ${pkg:0:7} == linux24 ]; then
-		echo_status "Including Security Contexts (vserver) patch..."
-
-		pkg_vserver_confdir=$base/package/mnemoc/vserver
-		pkg_vserver_archdir=$base/download/mnemoc/vserver
-		set -x
-		pkg_ctx_patch=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
-			sed -n "s,.* \(patch-.*ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )	
-		pkg_ctx_jacques=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
-			sed -n "s,.* \(jacques-ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )
-
-		# fetch version from patchfile
-		pkg_ctx_ver=${pkg_ctx_patch#*ctx};
-		pkg_ctx_ver=${pkg_ctx_ver%.diff.bz2};
-
-		# get a patched ctx's patch.
-		pkg_ctx_tempdir=`mktemp -d`
-		bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_patch \
-			> $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch
-		if [ "$pkg_ctx_jacques" ]; then
-			bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_jacques \
-				> $pkg_ctx_tempdir/jacques-update.patch
-			patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
-				$pkg_ctx_tempdir/jacques-update.patch}
-		fi
-		patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
-			${pkg_vserver_confdir}/no_extraversion.diff
-		set +x
-		hook_add postpatch 6 "rm -rf $pkg_ctx_tempdir"
-
-		# it SHALL be before vquota patch
-		var_insert_before_regex patchfiles ' ' $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch '.*\/ctx-vquota.*'
-
-		# var_append pkg_linux_brokenfiles ' ' $pkg_vserver_confdir/kernel-disable.lst
-	fi
-fi

package/mnemoc/vserver/pkg_linux24-header_pre.conf

@@ -0,0 +1,23 @@
+# --- 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/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/vserver/pkg_linux24_pre.conf

package/mnemoc/vserver/pkg_linux24-src_pre.conf

@@ -0,0 +1,23 @@
+# --- 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/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/vserver/pkg_linux24_pre.conf

package/mnemoc/vserver/pkg_linux24_pre.conf

@@ -0,0 +1,53 @@
+# --- 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/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 ---
+
+echo_status "Including Security Contexts (vserver) patch..."
+
+pkg_vserver_confdir=$base/package/mnemoc/vserver
+pkg_vserver_archdir=$base/download/mnemoc/vserver
+
+pkg_ctx_patch=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
+	sed -n "s,.* \(patch-.*ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )	
+pkg_ctx_jacques=$( grep "^\[D\]" ${pkg_vserver_confdir}/vserver.desc | \
+	sed -n "s,.* \(jacques-ctx[0-9][0-9].*\.diff\.bz2\) .*,\1,p" )
+
+# fetch version from patchfile
+pkg_ctx_ver=${pkg_ctx_patch#*ctx};
+pkg_ctx_ver=${pkg_ctx_ver%.diff.bz2};
+
+# get a patched ctx's patch.
+pkg_ctx_tempdir=`mktemp -d`
+bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_patch \
+	> $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch
+if [ "$pkg_ctx_jacques" ]; then
+	bzip2 -d -c $pkg_vserver_archdir/$pkg_ctx_jacques \
+		> $pkg_ctx_tempdir/jacques-update.patch
+	patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
+		$pkg_ctx_tempdir/jacques-update.patch}
+fi
+patch $patchopt $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch \
+	${pkg_vserver_confdir}/no_extraversion.diff > /dev/null
+
+hook_add postpatch 6 "rm -rf $pkg_ctx_tempdir"
+
+# it SHALL be before vquota patch
+var_insert_before_regex patchfiles ' ' $pkg_ctx_tempdir/ctx-$pkg_ctx_ver.patch '.*\/ctx-vquota.*'