From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Feb 2012 08:55:15 +0000 (+0100)
Subject: remove 3 patches that have made it mainstream and are no longer relevant
X-Git-Tag: util-vserver-0.30.216-20~2
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=e5ab4cc4269d19ad6c083181a0d15d52df30d41e

remove 3 patches that have made it mainstream and are no longer relevant
---

diff --git a/nomtab.patch b/nomtab.patch
deleted file mode 100644
index 438d165..0000000
--- a/nomtab.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 34ab12c667eb08336e8e9b0f414ba26d3ad19a08
-Author: Daniel Hokka Zakrisson <daniel@hozac.com>
-Date:   Tue Mar 8 20:04:29 2011 +0100
-
-    Add nomtab option.
-
-diff --git a/src/secure-mount.c b/src/secure-mount.c
-index ae0650f..53863e3 100644
---- a/src/secure-mount.c
-+++ b/src/secure-mount.c
-@@ -98,6 +98,7 @@ struct Options {
- 
- #define XFLAG_NOAUTO	0x01
- #define XFLAG_FILE	0x02
-+#define XFLAG_NOMTAB	0x04
- 
- static struct option const
- CMDLINE_OPTIONS[] = {
-@@ -173,6 +174,7 @@ static struct FstabOption {
-   { "private",    MS_PRIVATE,     MS_PRIVATE,      0, false },
-   { "slave",      MS_SLAVE,       MS_SLAVE,        0, false },
-   { "shared",     MS_SHARED,      MS_SHARED,       0, false },
-+  { "nomtab",     0,              0,               XFLAG_NOMTAB, false },
- };
- 
- int			wrapper_exit_code = 1;
-@@ -488,7 +490,7 @@ mountSingle(struct MountInfo const *mnt, struct Options *opt)
-   else if (!callExternalMount(mnt))
-     return false;
- 
--  if (!opt->ignore_mtab &&
-+  if (!opt->ignore_mtab && (mnt->xflag & XFLAG_NOMTAB)==0 &&
-       updateMtab(mnt, opt)==-1) {
-     WRITE_MSG(2, "Failed to update mtab-file\n");
-       // no error
diff --git a/sl.patch b/sl.patch
deleted file mode 100644
index 10b1d02..0000000
--- a/sl.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Index: distrib/sl6/yum.repos.d/sl.repo
-===================================================================
---- distrib/sl6/yum.repos.d/sl.repo	(revision 0)
-+++ distrib/sl6/yum.repos.d/sl.repo	(revision 0)
-@@ -0,0 +1,41 @@
-+[sl]
-+name=Scientific Linux 6 - $basearch
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/os/
-+		http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/os/
-+		http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/os/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/os/
-+#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6.txt
-+enabled=1
-+gpgcheck=1
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-+[sl-testing]
-+name=Scientific Linux 6 Testing - $basearch
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
-+		http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
-+		http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/$basearch/
-+enabled=0
-+gpgcheck=0
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-+[sl-source]
-+name=Scientific Linux 6 Alpha - Source
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6/SRPMS/
-+		http://ftp1.scientificlinux.org/linux/scientific/6/SRPMS/
-+		http://ftp2.scientificlinux.org/linux/scientific/6/SRPMS/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6/SRPMS/
-+enabled=0
-+gpgcheck=1
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-+[sl-testing-source]
-+name=Scientific Linux 6 Testing - Source
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
-+		http://ftp1.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
-+		http://ftp2.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6rolling/testing/SRPMS/
-+enabled=0
-+gpgcheck=0
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-Index: distrib/sl6/yum.repos.d/sl-updates.repo
-===================================================================
---- distrib/sl6/yum.repos.d/sl-updates.repo	(revision 0)
-+++ distrib/sl6/yum.repos.d/sl-updates.repo	(revision 0)
-@@ -0,0 +1,22 @@
-+[sl-security]
-+name=Scientific Linux 6 - $basearch - security updates
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/security/
-+		http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/updates/security/
-+		http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/updates/security/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/security/
-+#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6.txt
-+enabled=1
-+gpgcheck=1
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-+[sl-fastbugs]
-+name=Scientific Linux 6 - $basearch - fastbug updates
-+baseurl=http://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/
-+		http://ftp1.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/
-+		http://ftp2.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/
-+		ftp://ftp.scientificlinux.org/linux/scientific/6/$basearch/updates/fastbugs/
-+#mirrorlist=http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6.txt
-+enabled=0
-+gpgcheck=1
-+gpgkey=http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-sl http://www.scientificlinux.org/documentation/gpg/RPM-GPG-KEY-dawson
-+
-Index: distrib/sl6/pkgs/01
-===================================================================
---- distrib/sl6/pkgs/01	(revision 0)
-+++ distrib/sl6/pkgs/01	(revision 0)
-@@ -0,0 +1 @@
-+glibc
-Index: distrib/sl6/pkgs/02
-===================================================================
---- distrib/sl6/pkgs/02	(revision 0)
-+++ distrib/sl6/pkgs/02	(revision 0)
-@@ -0,0 +1,3 @@
-+--reinstall
-+
-+filesystem
-Index: distrib/sl6/pkgs/03
-===================================================================
---- distrib/sl6/pkgs/03	(revision 0)
-+++ distrib/sl6/pkgs/03	(revision 0)
-@@ -0,0 +1,2 @@
-+coreutils
-+initscripts
-Index: distrib/sl6/yum/yum.conf
-===================================================================
---- distrib/sl6/yum/yum.conf	(revision 0)
-+++ distrib/sl6/yum/yum.conf	(revision 0)
-@@ -0,0 +1,11 @@
-+[main]
-+cachedir=@YUMCACHEDIR@
-+persistdir=@YUMLIBDIR@
-+reposdir=@YUMETCDIR@/yum.repos.d
-+debuglevel=1
-+logfile=@YUMLOGDIR@/log
-+lockfile=@YUMLOCKDIR@/yum.pid
-+pkgpolicy=newest
-+distroverpkg=sl-release
-+installonlypkgs=
-+exactarch=0
-Index: distrib/sl6/rpmlist.d/00.lst
-===================================================================
---- distrib/sl6/rpmlist.d/00.lst	(revision 0)
-+++ distrib/sl6/rpmlist.d/00.lst	(revision 0)
-@@ -0,0 +1,11 @@
-+glibc-[0-9]*.rpm
-+basesystem-*.rpm
-+bash-[0-9]*.rpm
-+filesystem-*.rpm
-+glibc-common-*.rpm
-+libgcc-[0-9]*.rpm
-+ncurses-base-[0-9]*.rpm
-+ncurses-libs-*.rpm
-+nss-softokn-freebl-*.rpm
-+setup-*.rpm
-+tzdata-*.rpm
-Index: distrib/Makefile.am
-===================================================================
---- distrib/Makefile.am	(revision 2939)
-+++ distrib/Makefile.am	(working copy)
-@@ -93,6 +93,9 @@
- 			   centos5/yum/yum.conf $(wildcard $(srcdir)/centos5/yum.repos.d/*.repo) \
- 			   suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
- 			   suse91/rpm/macros \
-+			   sl6/pkgs/01 sl6/pkgs/02 sl6/pkgs/03 sl6/yum/yum.conf \
-+			   $(wildcard $(srcdir)/sl6/yum.repos.d/*.repo) \
-+			   $(wildcard $(srcdir)/sl6/rpmlist.d/*.lst) $(wildcard $(srcdir)/sl6/rpmlist.d/*.opt) \
- 			   gentoo/init-vserver.sh gentoo/net.vserver \
- 			   gentoo/reboot.sh gentoo/shutdown.sh
- 
-@@ -114,7 +117,7 @@
- 			   $(nobase_confdistrib_DATA) \
- 			   $(defaults_DATA)
- 
--redhat_style		=  rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5
-+redhat_style		=  rh9 fc1 fc2 fc3 fc4 fc5 fc6 f7 f8 f9 f10 f11 f12 f13 f14 centos4 centos5 sl6
- sid_style		=  etch lenny squeeze wheezy sid
- 
- install-exec-hook:	install-notify-xtra
diff --git a/upstart.patch b/upstart.patch
deleted file mode 100644
index 3e36a02..0000000
--- a/upstart.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 54edc50b584ade4f323c16bec6ef6320f129e531
-Author: Daniel Hokka Zakrisson <daniel@hozac.com>
-Date:   Sun Mar 6 21:53:57 2011 +0100
-
-    Work with newer upstart.
-
-diff --git a/distrib/redhat/initpost b/distrib/redhat/initpost
-index 92f79bb..9eece3c 100755
---- a/distrib/redhat/initpost
-+++ b/distrib/redhat/initpost
-@@ -95,9 +95,18 @@ EOF
-     if $_CHROOT_SH testfile /sbin/initctl; then
- 	cat "$__DISTRIBDIR"/redhat/initctl | $_CHROOT_SH truncate /sbin/initctl.vserver
- 	$_CHROOT_SH chmod 0755 /sbin/initctl.vserver
--	subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!/sbin/initctl!/sbin/initctl.vserver!'
--	subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
--	$_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
-+	subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!initctl!initctl.vserver!'
-+	if test -d etc/event.d; then
-+	    subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
-+	    $_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
-+	elif test -d etc/init; then
-+	    for i in etc/init/*; do
-+		subst $i 's!^console output!#\0!'
-+	    done
-+	    subst etc/init/control-alt-delete.conf 's!/sbin/shutdown -r!/sbin/shutdown -h!'
-+	    subst etc/init/rcS.conf 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!;s!cat /proc/cmdline!cat /proc/cmdline 2>/dev/null!'
-+	    subst etc/init/start-ttys.conf 's!^start on !\0never and !'
-+	fi
-     fi
- popd >/dev/null
- 
diff --git a/util-vserver.spec b/util-vserver.spec
index 48f5b52..8c430c0 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -37,9 +37,9 @@ URL:		http://linux-vserver.org/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%fullver.tar.bz2
 Source1:	fstab
 Source2:	vprocunhide-files
-Patch1: nomtab.patch
-Patch2: upstart.patch
-Patch3: sl.patch
+#Patch1: nomtab.patch
+#Patch2: upstart.patch
+#Patch3: sl.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release