Add patch from svn to fix EDITOR quoting.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 58 insertions, 27 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 2e53b2319487..cb150a1a6135 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.251 2005/07/08 02:16:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.252 2005/07/10 02:41:22 vapier Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  10 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-quote-EDITOR.patch,
+  baselayout-1.11.12-r4.ebuild:
+  Add patch from svn to fix EDITOR quoting.
+
   07 Jul 2005; Tom Gall <tgall@gentoo.org>
   baselayout-1.11.12-r4.ebuild:
   update for use of ibm and hvsi0 console
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 086316109b9d..d5fb2a10bcc1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,34 +1,45 @@
-MD5 7b3f0b6fb1847b118327d7f9df44733b ChangeLog 57656
-MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
-MD5 ed0258244e355142dabb2a1b04d001e7 baselayout-1.11.12-r4.ebuild 19356
-MD5 ae244ebc2bb4221e2ef7fbbab8d3d807 baselayout-1.12.0_alpha2-r1.ebuild 18947
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 63063133efc82df82db512614030ba19 baselayout-1.9.4-r6.ebuild 16993
 MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 7432b4f33b7c0694c18fa5e3d171896b baselayout-1.11.12-r4.ebuild 19440
+MD5 ae244ebc2bb4221e2ef7fbbab8d3d807 baselayout-1.12.0_alpha2-r1.ebuild 18947
+MD5 414184b1c4e892fbcfdb2ac580c6a065 ChangeLog 57832
+MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
+MD5 45a6a081214e662ab8de935ae12a255e files/digest-baselayout-1.12.0_alpha2-r1 69
+MD5 c530e98487e43a7bbbb779450f8dd94e files/baselayout-1.11.12-quote-EDITOR.patch 374
+MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
 MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
-MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
-MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
-MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
-MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 d49b2a31706ee1e9508b188672afcf13 files/baselayout-1.12.0-alpha2-netscripts-1.patch 15665
 MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
-MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
-MD5 8ab5b01cfcad4c79d822ff31296000be files/baselayout-1.11.12-ifconfig-cidr.patch 1740
-MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
+MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
+MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 2d89f41d8e2a27bb9c413ce38c5c95fb files/baselayout-1.11.12-profile.patch 1847
-MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.patch 670
+MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
+MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
 MD5 cac88e2e2f73778a4a4e79447d857c64 files/baselayout-1.11.12-swapon-quiet.patch 899
+MD5 8ab5b01cfcad4c79d822ff31296000be files/baselayout-1.11.12-ifconfig-cidr.patch 1740
+MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
+MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
+MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.patch 670
 MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
-MD5 d49b2a31706ee1e9508b188672afcf13 files/baselayout-1.12.0-alpha2-netscripts-1.patch 15665
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
-MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
-MD5 45a6a081214e662ab8de935ae12a255e files/digest-baselayout-1.12.0_alpha2-r1 69
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
-MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
 MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
-MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
-MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
+MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0IsUgIKl8Uu19MoRArQTAJ9YnGCLetcQJ6vdK9+zVyydEF5GegCaA4nZ
+YrCJKh0FhKHvsA7NphgDDdo=
+=2bk2
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild b/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
index 1a701f3fae26..58983afe0d5c 100644
--- a/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild,v 1.8 2005/07/08 02:16:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.12-r4.ebuild,v 1.9 2005/07/10 02:41:22 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -49,6 +49,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-profile.patch
 	# Help people who don't `etc-update` properly
 	epatch "${FILESDIR}"/${P}-volume-order-etc-update.patch
+	# Make sure we quote the EDITOR var
+	epatch "${FILESDIR}"/${P}-quote-EDITOR.patch
 	# Been moved to cryptfs
 	rm -f etc/conf.d/cryptfs
 	# Moved to ppp package
diff --git a/sys-apps/baselayout/files/baselayout-1.11.12-quote-EDITOR.patch b/sys-apps/baselayout/files/baselayout-1.11.12-quote-EDITOR.patch
new file mode 100644
index 000000000000..831550701e5b
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.11.12-quote-EDITOR.patch
@@ -0,0 +1,13 @@
+--- etc/profile
++++ etc/profile
+@@ -30,8 +30,8 @@
+ unset ROOTPATH
+ 
+ # Extract the value of EDITOR
+-[ -z $EDITOR ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
+-[ -z $EDITOR ] && EDITOR="/bin/nano"
++[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
++[ -z "$EDITOR" ] && EDITOR="/bin/nano"
+ export EDITOR
+ 
+ if [ -n "${BASH_VERSION}" ] ; then