Rediffed botched devmapper patch.

3 files changed, 24 insertions, 20 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 2f603387a371..3026e24c5dfa 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,9 +1,12 @@
 # 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.12 2004/06/09 16:40:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.13 2004/06/09 22:28:36 chainsaw Exp $
 
 *lilo-22.5.9 (09 Jun 2004)
 
+  09 Jun 2004; Tony Vroon <chainsaw@gentoo.org> files/lilo-22.5.9-devmapper_gentoo.patch:
+  Rediffed patch as it failed to apply properly. Fixes reopened bug #53413.
+
   09 Jun 2004; Tony Vroon <chainsaw@gentoo.org> metadata.xml,
   +files/lilo-22.5.9-correct-usage-info.patch,
   +files/lilo-22.5.9-create-install-dirs.patch,
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 94a787c36ace..ebf78e815397 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -6,7 +6,7 @@ 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 b2e9ac8f689e9bb75cec47c6ecec10d5 ChangeLog 8627
+MD5 9b3469b4bc8afc7f5bbd08ff2f9641ef ChangeLog 8794
 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
@@ -23,6 +23,6 @@ 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 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.9-devmapper_gentoo.patch 11889
+MD5 fae76ec2aab0220700b2c4a2a6881793 files/lilo-22.5.9-devmapper_gentoo.patch 11877
 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/lilo-22.5.9-devmapper_gentoo.patch b/sys-boot/lilo/files/lilo-22.5.9-devmapper_gentoo.patch
index b72e3a1ff6b8..077532d218fd 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
@@ -1,16 +1,17 @@
-<diff -Naur lilo-22.5.8/Makefile lilo-22.5.8-devmapper/Makefile
---- lilo-22.5.8/Makefile	2003-10-10 18:58:35.000000000 +0200
-+++ lilo-22.5.8-devmapper/Makefile	2004-04-13 10:48:31.000000000 +0200
-@@ -53,7 +53,7 @@
+diff -uNr lilo-22.5.9.orig/Makefile lilo-22.5.9/Makefile
+--- lilo-22.5.9.orig/Makefile	2004-06-09 22:41:24.519057048 +0100
++++ lilo-22.5.9/Makefile	2004-06-09 22:42:25.269821528 +0100
+@@ -53,7 +53,8 @@
  #   XL_SECS=n	  Support for extra large (non-standard) floppies.
  
  CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DONE_SHOT -DPASS160 \
--   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL
-+   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL -DDEVMAPPER
+-   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL -DATARAID
++   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL -DATARAID \
++   -DDEVMAPPER
  
  # set the compiler optimization level
  
-@@ -88,6 +88,8 @@
+@@ -88,6 +89,8 @@
  LDFLAGS=#-Xlinker -qmagic
  LIBS=
  
@@ -19,7 +20,7 @@
  OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
    temp.o partition.o identify.o probe.o shs2.o loader.o edit.o
  
-@@ -241,7 +243,11 @@
+@@ -255,7 +258,11 @@
  		cp -p dparam.S dparam.s
  
  lilo:		$(OBJS)
@@ -29,11 +30,11 @@
  		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
 +endif
  
- boot-text.b:	first.b second.b
- 		(dd if=first.b bs=512 conv=sync; dd if=second.b) >boot-text.b
-diff -Naur lilo-22.5.8/geometry.c lilo-22.5.8-devmapper/geometry.c
---- lilo-22.5.8/geometry.c	2003-10-10 01:59:07.000000000 +0200
-+++ lilo-22.5.8-devmapper/geometry.c	2004-04-13 10:47:35.000000000 +0200
+ lilo-static:	$(OBJS)
+ 		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS)
+diff -uNr lilo-22.5.9.orig/geometry.c lilo-22.5.9/geometry.c
+--- lilo-22.5.9.orig/geometry.c	2004-06-09 22:41:24.526055984 +0100
++++ lilo-22.5.9/geometry.c	2004-06-09 22:41:42.016397048 +0100
 @@ -14,6 +14,9 @@
  #include <stdio.h>
  #include <fcntl.h>
@@ -81,7 +82,7 @@ diff -Naur lilo-22.5.8/geometry.c lilo-22.5.8-devmapper/geometry.c
  #ifdef LCF_LVM
  struct lv_bmap {
      __u32 lv_block;
-@@ -114,6 +140,12 @@
+@@ -121,6 +147,12 @@
  {
      FILE *file;
      char line[MAX_LINE+1];
@@ -94,7 +95,7 @@ diff -Naur lilo-22.5.8/geometry.c lilo-22.5.8-devmapper/geometry.c
      char *here;
      DT_ENTRY *entry;
      int disk_section,items;
-@@ -122,29 +154,69 @@
+@@ -129,29 +161,69 @@
  	if ((file = fopen(name,"r")) == NULL)
  	    die("open %s: %s",name,strerror(errno));
      }
@@ -184,7 +185,7 @@ diff -Naur lilo-22.5.8/geometry.c lilo-22.5.8-devmapper/geometry.c
  }
  
  
-@@ -768,6 +840,161 @@
+@@ -775,6 +847,161 @@
  {
      DT_ENTRY *walk;
      int inherited,keep_cyls,is_raid=0;
@@ -346,7 +347,7 @@ diff -Naur lilo-22.5.8/geometry.c lilo-22.5.8-devmapper/geometry.c
  
      if (verbose>=5) printf("geo_get: device %04X, all=%d\n", device, all);
  #ifdef LCF_LVM
-@@ -1130,14 +1357,50 @@
+@@ -1146,14 +1373,50 @@
              die("EVMS boot volume cannot be on multiple disks.\n");
          sector = ebm.rsector + ((offset/SECTOR_SIZE) % geo->spb) + geo->start;
      }