Updated devmapper patch by Christophe Saout (#53413) and dolilo config file installed as example only (#53462)

5 files changed, 216 insertions, 4 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 3026e24c5dfa..e0e43b1ab90d 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.13 2004/06/09 22:28:36 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.14 2004/06/10 17:41:02 chainsaw Exp $
+
+*lilo-22.5.9-r1 (10 Jun 2004)
+
+  10 Jun 2004; Tony Vroon <chainsaw@gentoo.org>
+  files/lilo-22.5.9-devmapper_gentoo.patch, +lilo-22.5.9-r1.ebuild:
+  Device mapper support patch updated by Christophe Saout <christophe@saout.de>
+  in bug #53413. Will only install the dolilo config file as an example, to make
+  sure rewrite mode is disabled by default. Closes bug #53462.
 
 *lilo-22.5.9 (09 Jun 2004)
 
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index ebf78e815397..f523550cc22f 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,12 +1,13 @@
 MD5 47742f30310fffc18379ae060aac8a8f lilo-22.5.8-r2.ebuild 4457
 MD5 b52018ecad7a5624be44a3141e3daff5 lilo-22.5.7.2.ebuild 3983
+MD5 eb4723d77a5f99787a2dddf0aadb06e2 lilo-22.5.9-r1.ebuild 5267
 MD5 dde858e9ad322a74658a06ba8f85aa83 lilo-22.5.9.ebuild 5259
 MD5 0638e8e1176ae4c22ada6cbb9d8c2683 lilo-22.5.8-r1.ebuild 4341
 MD5 b62ac7c19b9163b3b4fb17d9da33a3f3 lilo-22.5.1.ebuild 4395
 MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190
 MD5 b0ecf6d774e388fb6f13c869c9915270 lilo-22.5.8-r3.ebuild 4639
 MD5 d504f429b27f9ba59a96fff3b81e1293 lilo-22.5.8.ebuild 4050
-MD5 9b3469b4bc8afc7f5bbd08ff2f9641ef ChangeLog 8794
+MD5 2b0fe5f06cfcf9fdc95a8af07a5eb41a ChangeLog 9166
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.5.9-correct-usage-info.patch 683
@@ -17,12 +18,13 @@ MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r3 63
+MD5 40f4a24227338f8fae1e5996bae46576 files/digest-lilo-22.5.9-r1 124
 MD5 77acd52c9bdf0a660026777a3419ccb3 files/lilo-22.5.9-glibc233.patch 584
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.9-create-install-dirs.patch 970
 MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970
 MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
 MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.9-lvm.2-6headers.patch 470
-MD5 fae76ec2aab0220700b2c4a2a6881793 files/lilo-22.5.9-devmapper_gentoo.patch 11877
+MD5 fdc2575e3b1e96d80ba2c1409abcad0e files/lilo-22.5.9-devmapper_gentoo.patch 11884
 MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470
 MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-glibc233.patch 640
diff --git a/sys-boot/lilo/files/digest-lilo-22.5.9-r1 b/sys-boot/lilo/files/digest-lilo-22.5.9-r1
new file mode 100644
index 000000000000..f9cdd0591159
--- /dev/null
+++ b/sys-boot/lilo/files/digest-lilo-22.5.9-r1
@@ -0,0 +1,2 @@
+MD5 d5b561190cbe0968d50e09e0031edb79 lilo-22.5.9.tar.gz 415378
+MD5 fc344efe42e541a11a0972fa418780ce dolilo-0.1.tar.bz2 3930
diff --git a/sys-boot/lilo/files/lilo-22.5.9-devmapper_gentoo.patch b/sys-boot/lilo/files/lilo-22.5.9-devmapper_gentoo.patch
index 077532d218fd..847f953b061e 100644
--- a/sys-boot/lilo/files/lilo-22.5.9-devmapper_gentoo.patch
+++ b/sys-boot/lilo/files/lilo-22.5.9-devmapper_gentoo.patch
@@ -221,11 +221,11 @@ diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
 +	    strncpy(dmdev, dev.name, PATH_MAX);
 +	    dmdev[PATH_MAX] = 0;
 +	    do {
++		memset(buf, 0, PATH_MAX + 1);
 +		if ((result = readlink(dmdev, buf, PATH_MAX)) < 0 && errno != EINVAL)
 +		    die("device-mapper: readlink(\"%s\") failed with: %s",buf,
 +			strerror(errno));
 +		if (result >= 0) {
-+		    buf[PATH_MAX] = 0;
 +		    if (buf[0] != '/' && (slash = strrchr(dmdev, '/')) != NULL)
 +			slash++;
 +		    else
diff --git a/sys-boot/lilo/lilo-22.5.9-r1.ebuild b/sys-boot/lilo/lilo-22.5.9-r1.ebuild
new file mode 100644
index 000000000000..6ddd8bdf4a4d
--- /dev/null
+++ b/sys-boot/lilo/lilo-22.5.9-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.9-r1.ebuild,v 1.1 2004/06/10 17:41:02 chainsaw Exp $
+
+inherit eutils flag-o-matic
+
+DOLILO_V="0.1"
+IUSE="devmap static"
+
+DESCRIPTION="Standard Linux boot loader"
+HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
+DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
+SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz
+	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz
+	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${P}.tar.gz
+	mirror://gentoo/${DOLILO_TAR}"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="-* ~x86"
+
+RDEPEND=">=sys-apps/sed-4
+	devmap? ( >=sys-libs/device-mapper-1.00.08 )"
+DEPEND="${RDEPEND}
+	dev-lang/nasm
+	>=sys-devel/bin86-0.15.5"
+
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	einfo
+	einfo "If you want to use lilo with device mapper, please enable the"
+	einfo "\"devmap\" USE flag."
+	einfo
+
+	unpack ${P}.tar.gz
+
+	# Do not try and build the dos crap.
+	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
+
+	# The bootlogo patch from SuSE linux, which was originally in
+	# here, has been dropped because it's no longer compatible
+	# with lilo since the 22.5.x series.
+	# Quequero has done a good attempt to port the patch in bug
+	# #19397, but unfortunately that breaks the timeout at boot.
+	# If you can overcome these problems, a patch is very welcome.
+
+	if [ `use devmap` ]; then
+		# devmapper-patch (boot on evms/lvm2)
+		cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch
+	fi
+
+	cd ${S}
+	unpack ${DOLILO_TAR}
+
+	# Fixup things for glibc-2.3.3 (and later CVS versions of 2.3.2)
+	epatch ${FILESDIR}/${P}-glibc233.patch
+	# Fix building against 2.6 headers
+	epatch ${FILESDIR}/${P}-lvm.2-6headers.patch
+	# Fix creating install dirs, bug #39405
+	epatch ${FILESDIR}/${P}-create-install-dirs.patch
+	# Correctly document commandline options -v and -V, bug #43554
+	epatch ${FILESDIR}/${P}-correct-usage-info.patch
+}
+
+src_compile() {
+
+	# hardened automatic PIC plus PIE building should be suppressed
+	# because of assembler instructions that cannot be compiled PIC
+	HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie`"
+
+	# we explicitly prevent the custom CFLAGS for stability reasons
+	if [ `use static` ]; then
+		emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo-static || die
+		mv lilo-static lilo || die
+	else
+		emake CC="${CC:=gcc} ${HARDENED_CFLAGS}" lilo || die
+	fi
+}
+
+src_install() {
+	keepdir /boot
+	make ROOT=${D} install || die
+
+	into /
+	dosbin ${S}/dolilo/dolilo
+
+	into /usr
+	dosbin keytab-lilo.pl
+
+	insinto /etc
+	newins ${FILESDIR}/lilo.conf lilo.conf.example
+
+	insinto /etc/conf.d
+	newins ${S}/dolilo/dolilo.conf.d dolilo.example
+
+	doman manPages/*.[5-8]
+	dodoc CHANGES COPYING INCOMPAT README*
+	docinto samples ; dodoc sample/*
+}
+
+# Check whether LILO is installed
+# This function is from /usr/sbin/mkboot from debianutils, with copyright:
+#
+#   Debian GNU/Linux
+#   Copyright 1996-1997 Guy Maor <maor@debian.org>
+#
+# Modified for Gentoo for use with the lilo ebuild by:
+#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
+#
+lilocheck () {
+	local bootpart=
+	local rootpart="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)"
+
+	echo
+	einfon "Checking for LILO ..."
+
+	if [ "$(whoami)" != "root" ]
+	then
+		echo; echo
+		eerror "Only root can check for LILO!"
+		return 1
+	fi
+
+	if [ -z "${rootpart}" ]
+	then
+		echo; echo
+		eerror "Could not determine root partition!"
+		return 1
+	fi
+
+	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
+	then
+		echo " No"
+		return 1
+	fi
+
+	bootpart="$(perl -ne 'print $1 if /^\s*boot\s*=\s*(\S*)/' /etc/lilo.conf)"
+
+	if [ -z "${bootpart}" ]
+	then
+		# lilo defaults to current root when 'boot=' is not present
+		bootpart="${rootpart}"
+	fi
+
+	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
+	then
+		echo; echo
+		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
+		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
+		return 1
+	fi
+
+	echo " Yes, on ${bootpart}"
+
+	return 0
+}
+
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ]
+	then
+		[ -f "${ROOT}/boot/boot-menu.b" ] && \
+			ln -snf boot-menu.b ${ROOT}/boot/boot.b
+	fi
+
+	if [ "${ROOT}" = "/" ]
+	then
+		if lilocheck
+		then
+			einfo "Running DOLILO to complete the install ..."
+			# do not redirect to /dev/null because it may display some input
+			# prompt
+			/sbin/dolilo
+			if [ "$?" -ne 0 ]
+			then
+				echo
+				ewarn "Running /sbin/dolilo failed!  Please check what the problem is"
+				ewarn "before your next reboot."
+
+				echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+				echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+				sleep 5
+			fi
+		fi
+		echo
+	fi
+
+	echo
+	einfo "Please note that all the loader files (/boot/*.b) are now linked"
+	einfo "into LILO, and thus no longer installed."
+	einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
+	einfo "handles mounting and unmounting /boot for you, and automatically"
+	einfo "copies the newest available bzImage in place."
+	einfo "Edit /etc/conf.d/dolilo to harness it's full potential."
+	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+	sleep 3
+	echo
+}
+