summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2006-12-20 12:33:59 +0000
committerBenedikt Boehm <hollow@gentoo.org>2006-12-20 12:33:59 +0000
commit20df85bb4a97cb07b922021c64d63edf01875f71 (patch)
treed3e60e2b85955aa65804e89eb23c06e17886d6b8 /util-vserver/patches/0.30.210-r3
parentupdates (diff)
downloadmisc-20df85bb4a97cb07b922021c64d63edf01875f71.tar.gz
misc-20df85bb4a97cb07b922021c64d63edf01875f71.tar.bz2
misc-20df85bb4a97cb07b922021c64d63edf01875f71.zip
everything is in upstream now, no more patch tarballs, yay
svn path=/; revision=533
Diffstat (limited to 'util-vserver/patches/0.30.210-r3')
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-fix-fastboot.patch13
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-nicefix.patch24
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-rkill.patch26
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-sharedportage.patch11
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-testsuite-fix.patch33
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.209-remove-traditional-syscall.patch29
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-gentoo-tools.patch74
-rw-r--r--util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-syscall-update.patch60
8 files changed, 0 insertions, 270 deletions
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-fix-fastboot.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-fix-fastboot.patch
deleted file mode 100644
index 7bf246d..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-fix-fastboot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nrup util-vserver-0.30.208.orig/scripts/vserver.functions util-vserver-0.30.208/scripts/vserver.functions
---- util-vserver-0.30.208.orig/scripts/vserver.functions 2005-07-03 19:47:06.000000000 +0200
-+++ util-vserver-0.30.208/scripts/vserver.functions 2005-08-03 11:59:32.000000000 +0200
-@@ -627,8 +627,7 @@ function prepareInit
- find var/lock ! -type d -print0; } | xargs -0r $_CHROOT_SH rm
- ;;
- plain)
-- $_CHROOT_SH rm .autofsck forcefsck 2>/dev/null || :
-- : | $_CHROOT_SH truncate fastboot 2>/dev/null || :
-+ $_CHROOT_SH rm .autofsck forcefsck fastboot 2> /dev/null || :
- ;;
- minit)
- ;;
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-nicefix.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-nicefix.patch
deleted file mode 100644
index 8b489f0..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-nicefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -NurpP util-vserver-0.30.208/scripts/legacy/vserver util-vserver-0.30.208-nicefix/scripts/legacy/vserver
---- util-vserver-0.30.208/scripts/legacy/vserver 2005-03-21 21:03:31.000000000 +0100
-+++ util-vserver-0.30.208-nicefix/scripts/legacy/vserver 2005-10-27 13:33:37.384017250 +0200
-@@ -514,7 +514,7 @@ elif [ "$2" = "start" ] ; then
- DOMAINOPT="--domainname $S_DOMAINNAME"
- fi
- if [ "$S_NICE" != "" ] ; then
-- NICECMD="nice -$S_NICE"
-+ NICECMD="nice -n $S_NICE"
- fi
- mkdir -p $__PKGSTATEDIR
- chmod 700 $__PKGSTATEDIR
-diff -NurpP util-vserver-0.30.208/scripts/vserver.functions util-vserver-0.30.208-nicefix/scripts/vserver.functions
---- util-vserver-0.30.208/scripts/vserver.functions 2005-07-03 19:47:06.000000000 +0200
-+++ util-vserver-0.30.208-nicefix/scripts/vserver.functions 2005-10-27 13:32:33.332014250 +0200
-@@ -100,7 +100,7 @@ function _generateNiceCommand
- test -r "$vdir/nice" || return 0;
- read nice <"$vdir"/nice
-
-- NICE_CMD=( $_NICE -$nice )
-+ NICE_CMD=( $_NICE -n $nice )
- }
-
-
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-rkill.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-rkill.patch
deleted file mode 100644
index 058e404..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-rkill.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -NurpP util-vserver-0.30.208/lib/cflags-v13.c util-vserver-0.30.208-rkill/lib/cflags-v13.c
---- util-vserver-0.30.208/lib/cflags-v13.c 2004-10-21 21:00:20.000000000 +0200
-+++ util-vserver-0.30.208-rkill/lib/cflags-v13.c 2005-09-30 14:32:27.575320000 +0200
-@@ -54,6 +54,9 @@ static struct Mapping_uint64 const VALUE
- DECL("state_setup", VC_VXF_STATE_SETUP),
- DECL("state_init", VC_VXF_STATE_INIT),
-
-+ DECL("sc_helper", VC_VXF_SC_HELPER),
-+ DECL("reboot_kill", VC_VXF_REBOOT_KILL),
-+
- DECL("fork_rss", VC_VXF_FORK_RSS),
- DECL("prolific", VC_VXF_PROLIFIC),
- DECL("igneg_nice", VC_VXF_IGNEG_NICE),
-diff -NurpP util-vserver-0.30.208/lib/vserver.h util-vserver-0.30.208-rkill/lib/vserver.h
---- util-vserver-0.30.208/lib/vserver.h 2005-07-15 18:27:02.000000000 +0200
-+++ util-vserver-0.30.208-rkill/lib/vserver.h 2005-09-30 14:33:08.485876750 +0200
-@@ -181,6 +181,9 @@
- #define VC_VXF_STATE_SETUP (1ULL<<32)
- #define VC_VXF_STATE_INIT (1ULL<<33)
-
-+#define VC_VXF_SC_HELPER (1ULL<<36)
-+#define VC_VXF_REBOOT_KILL (1ULL<<37)
-+
- #define VC_VXF_FORK_RSS (1ULL<<48)
- #define VC_VXF_PROLIFIC (1ULL<<49)
-
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-sharedportage.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-sharedportage.patch
deleted file mode 100644
index 051e7f5..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-sharedportage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NurpP util-vserver-0.30.208/distrib/misc/fstab util-vserver-0.30.208-sharedportage/distrib/misc/fstab
---- util-vserver-0.30.208/distrib/misc/fstab 2005-02-19 19:12:34.000000000 +0100
-+++ util-vserver-0.30.208-sharedportage/distrib/misc/fstab 2005-09-30 14:39:41.790456750 +0200
-@@ -1,3 +1,7 @@
- none /proc proc defaults 0 0
- none /tmp tmpfs size=16m,mode=1777 0 0
- none /dev/pts devpts gid=5,mode=620 0 0
-+
-+# shared portage tree
-+#/usr/portage /usr/portage none bind,ro 0 0
-+#/usr/portage/distfiles /usr/portage/distfiles none bind,rw 0 0
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-testsuite-fix.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-testsuite-fix.patch
deleted file mode 100644
index a1be029..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.208-testsuite-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Origin:
-http://vserver.13thfloor.at/Experimental/UTIL-VSERVER/delta-0.30.208-tsfix.diff
---- util-vserver-0.30.208/lib/testsuite/personality.c 2005-04-28 19:54:57 +0200
-+++ util-vserver-0.30.208-fix/lib/testsuite/personality.c 2005-08-11 17:51:25 +0200
-@@ -73,7 +73,6 @@ int main()
- TEST_T2PF("SHORT_INODE", 0, SHORT_INODE);
- TEST_T2PF("WHOLE_SECONDS", 0, WHOLE_SECONDS);
- TEST_T2PF("STICKY_TIMEOUTS", 0, STICKY_TIMEOUTS);
-- TEST_T2PF("ADDR_LIMIT_3GB", 0, ADDR_LIMIT_3GB);
-
-
- // the _loc* tests
-@@ -82,7 +81,6 @@ int main()
- TEST_PF2T("SHORT_INODE", SHORT_INODE);
- TEST_PF2T("WHOLE_SECONDS", WHOLE_SECONDS);
- TEST_PF2T("STICKY_TIMEOUTS", STICKY_TIMEOUTS);
-- TEST_PF2T("ADDR_LIMIT_3GB", ADDR_LIMIT_3GB);
-
-
-
-@@ -123,10 +121,10 @@ int main()
- TEST_LIST("mmap_page_zero,any", 0, -1, MMAP_PAGE_ZERO, 15, 3);
-
- TEST_LIST("mmap_page_zero,addr_limit_32bit,short_inode,whole_seconds,"
-- "sticky_timeouts,addr_limit_3gb",
-+ "sticky_timeouts",
- 0, 0,
- MMAP_PAGE_ZERO|ADDR_LIMIT_32BIT|SHORT_INODE|WHOLE_SECONDS|
-- STICKY_TIMEOUTS|ADDR_LIMIT_3GB,
-+ STICKY_TIMEOUTS,
- -1, 0);
-
- TEST_T2PT("linux", 0, PER_LINUX);
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.209-remove-traditional-syscall.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.209-remove-traditional-syscall.patch
deleted file mode 100644
index fdb676a..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.209-remove-traditional-syscall.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: util-vserver-0.30.209/config.h.in
-===================================================================
---- util-vserver-0.30.209.orig/config.h.in
-+++ util-vserver-0.30.209/config.h.in
-@@ -232,10 +232,4 @@
- /* Use 64bit interface for filesystem operations */
- #undef _FILE_OFFSET_BITS
-
--
--#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS)
--# define ENSC_SYSCALL_TRADITIONAL 1
--#endif
--
- #include "compat.h"
--
-Index: util-vserver-0.30.209/m4/ensc_syscall.m4
-===================================================================
---- util-vserver-0.30.209.orig/m4/ensc_syscall.m4
-+++ util-vserver-0.30.209/m4/ensc_syscall.m4
-@@ -101,9 +101,4 @@ int main() {
- if test x"$with_syscall" = xtraditional; then
- AC_DEFINE(ENSC_SYSCALL_TRADITIONAL, 1, [Define to 1 when the fast syscall(2) invocation does not work])
- fi
--
-- AH_BOTTOM([
--#if defined(__pic__) && defined(__i386) && !defined(ENSC_SYSCALL_TRADITIONAL) && !defined(ENSC_USE_ALTERNATIVE_SYSCALL_MACROS)
--# define ENSC_SYSCALL_TRADITIONAL 1
--#endif])
- ])
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-gentoo-tools.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-gentoo-tools.patch
deleted file mode 100644
index a415d0a..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-gentoo-tools.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: util-vserver-0.30.210/scripts/Makefile-files
-===================================================================
---- util-vserver-0.30.210.orig/scripts/Makefile-files
-+++ util-vserver-0.30.210/scripts/Makefile-files
-@@ -38,6 +38,7 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
-
-
- scripts_pkglib_src_DTA = scripts/functions \
-+ scripts/gentoo-functions.sh \
- scripts/vserver-build.apt-rpm \
- scripts/vserver-build.skeleton \
- scripts/vserver-build.debootstrap \
-@@ -68,6 +69,7 @@ scripts_pkglib_src_SCRPTS = scripts/pkgm
- scripts/vservers.grabinfo.sh \
- scripts/vshelper \
- scripts/vsysvwrapper \
-+ scripts/vschedcalc \
- scripts/vyum-worker
-
- scripts_legacy_src_SCRPTS = scripts/legacy/save_s_context \
-@@ -85,7 +87,12 @@ scripts_sbin_src_PRGS = scripts/chconte
- scripts/vserver \
- scripts/vsomething \
- scripts/vtop \
-- scripts/vyum
-+ scripts/vyum \
-+ scripts/vdispatch-conf \
-+ scripts/vemerge \
-+ scripts/vesync \
-+ scripts/vserver-new \
-+ scripts/vupdateworld
-
- scripts_sbin_gen_PRGS =
- scripts_sbincfg_gen_DTA =
-Index: util-vserver-0.30.210/scripts/util-vserver-vars.pathsubst
-===================================================================
---- util-vserver-0.30.210.orig/scripts/util-vserver-vars.pathsubst
-+++ util-vserver-0.30.210/scripts/util-vserver-vars.pathsubst
-@@ -43,6 +43,7 @@ _IFSPEC="$__LEGACYDIR/ifspec"
- _INITSYNC_MINIT_START=:
- _KEEP_CTX_ALIVE="$__PKGLIBDIR/keep-ctx-alive"
- _LIB_FUNCTIONS="$__PKGLIBDIR/functions"
-+_LIB_GENTOO_FUNCTIONS="$__PKGLIBDIR/gentoo-functions.sh"
- _LIB_VSERVER_SETUP_FUNCTIONS="$__PKGLIBDIR/vserver-setup.functions"
- _LIB_VSERVER_BUILD_FUNCTIONS="$__PKGLIBDIR/vserver-build.functions"
- _LIB_VSERVER_BUILD_FUNCTIONS_APT="$__PKGLIBDIR/vserver-build.functions.apt"
-@@ -68,6 +69,9 @@ _VAPT_GET_WORKER="$__PKGLIBDIR/vapt-get-
- _VATTRIBUTE="$__SBINDIR/vattribute"
- _VCONTEXT="$__SBINDIR/vcontext"
- _VDLIMIT="$__SBINDIR/vdlimit"
-+_VDISPATCH_CONF="$__SBINDIR/vdispatch-conf"
-+_VEMERGE="$__SBINDIR/vemerge"
-+_VESYNC="$__SBINDIR/vesync"
- _VDU="$__SBINDIR/vdu"
- _VHASHIFY="$__PKGLIBDIR/vhashify"
- _VKILL="$__SBINDIR/vkill"
-@@ -81,7 +85,9 @@ _VRPM="$__SBINDIR/vrpm"
- _VRPM_PRELOAD="$__PKGLIBDIR/vrpm-preload"
- _VRPM_WORKER="$__PKGLIBDIR/vrpm-worker"
- _VSCHED="$__SBINDIR/vsched"
-+_VSCHEDCALC="$__PKGLIBDIR/vschedcalc"
- _VSERVER="$__SBINDIR/vserver"
-+_VSERVER_NEW="$__SBINDIR/vserver-new"
- _VSERVER_LEGACY="$__LEGACYDIR/vserver"
- _VSERVER_BUILD="$__PKGLIBDIR/vserver-build"
- _VSERVER_INFO="$__SBINDIR/vserver-info"
-@@ -92,6 +98,7 @@ _VSOMETHING="$__SBINDIR/vsomething"
- _VWAIT="$__SBINDIR/vwait"
- _VUNAME="$__SBINDIR/vuname"
- _VUNIFY="$__PKGLIBDIR/vunify"
-+_VUPDATEWORLD="$__SBINDIR/vupdateworld"
- _VYUM="$__SBINDIR/vyum"
- _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
-
diff --git a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-syscall-update.patch b/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-syscall-update.patch
deleted file mode 100644
index c7be942..0000000
--- a/util-vserver/patches/0.30.210-r3/util-vserver-0.30.210-syscall-update.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -NurpP util-vserver-0.30.209/lib/syscall-alternative.h util-vserver-0.30.209-mips/lib/syscall-alternative.h
---- util-vserver-0.30.209/lib/syscall-alternative.h 2005-10-28 18:33:50 +0200
-+++ util-vserver-0.30.209-mips/lib/syscall-alternative.h 2006-01-06 18:42:05 +0100
-@@ -1,9 +1,9 @@
-- // from http://vserver.13thfloor.at/Experimental/SYSCALL/syscall_shiny7.h
-+ // from http://vserver.13thfloor.at/Experimental/SYSCALL/syscall_shiny8.h
-
- #ifndef __SYSCALL_NEW_H
- #define __SYSCALL_NEW_H
-
--/* Copyright (C) 2005 Herbert P�tzl
-+/* Copyright (C) 2005-2006 Herbert P�tzl
-
- global config options
-
-@@ -399,8 +399,43 @@
-
- #elif defined(__mips__)
-
--#error syscall arch mips not implemented yet
-+/* The ABIO32 calling convention uses a0-a3 to pass the first
-+ four arguments, the rest is passed on the userspace stack. The 5th arg
-+ starts at 16($sp).
-+
-+ ABIN32 and ABI64 pass 6 args in a0-a3, t0-t1.
-+
-+ scnr: id(v0)
-+ args: a1(a0), a2(a1), a3(a2), a4(a3), a5(16($sp)), a6(20($sp))
-+ sret: r0(v0)
-+ serr: e0(a3)
-+ call: syscall
-+ clob: at, v0, t0-t7, t8-t9
-+*/
-+
-+#define __sysc_reg_cid "v0"
-+#define __sysc_reg_ret "v0"
-+#define __sysc_reg_err "a3"
-+#define __sysc_cmd_sys "syscall"
-
-+#define __sysc_reg(n) __arg_##n\
-+ ("a0","a1","a2","a3", "t0", "t1")
-+
-+#define __sysc_clobber "$1", "$3", "$8", "$9", "$10", "$11", "$12", \
-+ "$13", "$14", "$15", "$24", "$25", "memory"
-+
-+#if _MIPS_SIM == _ABIO32
-+#define __sysc_pre(n) \
-+ __casm(n,5,1,"addiu $sp,$sp,-32",) \
-+ __casm(n,6,1,"sw $9,20($sp)",) \
-+ __casm(n,5,1,"sw $8, 16($sp)",)
-+#define __sysc_fin(n) \
-+ __casm(n,5,1,"addiu $sp,$sp,32",)
-+#elif (_MIPS_SIM == _ABIN32) || (_MIPS_SIM == _ABI64)
-+#warning syscall arch mips with ABI N32 and 64 not tested yet
-+#else
-+#error unknown mips ABI version
-+#endif
-
-
- /* *****************************************