summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-01-30 10:59:16 +0300
committerVlad Glagolev2015-01-30 11:01:13 +0300
commit9e15a0937dd3b989d240b2d5f7d94d78219847d7 (patch)
tree151f8f686ac16af348e95248ea5c24a913361522
parent295dc566a3a82055d6626301de66833959a06928 (diff)
lilo: => 24.1
(cherry picked from commit 0de096102d0e659c8cce74b9e5352f85a3bd02d8)
-rw-r--r--disk/lilo/0001-fix-failure-during-install.patch36
-rw-r--r--disk/lilo/1FE1B08B.gpgbin1245 -> 0 bytes
-rwxr-xr-xdisk/lilo/CONFIGURE5
-rwxr-xr-xdisk/lilo/DETAILS4
-rw-r--r--disk/lilo/HISTORY10
-rwxr-xr-xdisk/lilo/PRE_BUILD7
-rw-r--r--disk/lilo/lilo.gpgbin0 -> 3618 bytes
-rw-r--r--disk/lilo/xvd.patch29
8 files changed, 16 insertions, 75 deletions
diff --git a/disk/lilo/0001-fix-failure-during-install.patch b/disk/lilo/0001-fix-failure-during-install.patch
deleted file mode 100644
index c1a32ed432..0000000000
--- a/disk/lilo/0001-fix-failure-during-install.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 810806d4d5003dbc61f0efa38f363d0417c66ed3 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-Date: Sat, 8 Jun 2013 23:07:57 +0200
-Subject: [PATCH] fix failure during install
-
----
- src/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index feb144e..5d12cad 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -243,9 +243,8 @@ install:
- if [ -f diag1.img ]; then cp -f diag1.img $$DESTDIR$(BOOT_DIR); fi
- if [ -f diag2.img ]; then cp -f diag2.img $$DESTDIR$(BOOT_DIR); fi
-
-- strip lilo
- cp lilo $$DESTDIR$(SBIN_DIR)/lilo
-- [ -x lilo.static ] && strip lilo.static
-+ strip $$DESTDIR$(SBIN_DIR)/lilo
- cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue
- cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo
-
-@@ -264,6 +263,8 @@ mkloader: temp.c
- tidy:
- rm -f core $(LIS) *.shs *.crc $(TMP)*
- rm -rf sbin boot usr
-+ if [ -x lilo ]; then strip lilo; fi
-+ if [ -x lilo.static ]; then strip lilo.static; fi
-
- clean:
- rm -f *.o *.s *.i *.img *.b tmp_make version
---
-1.8.3
-
diff --git a/disk/lilo/1FE1B08B.gpg b/disk/lilo/1FE1B08B.gpg
deleted file mode 100644
index 109cda186f..0000000000
--- a/disk/lilo/1FE1B08B.gpg
+++ /dev/null
Binary files differ
diff --git a/disk/lilo/CONFIGURE b/disk/lilo/CONFIGURE
index 35e828ee02..a291216583 100755
--- a/disk/lilo/CONFIGURE
+++ b/disk/lilo/CONFIGURE
@@ -1,3 +1,6 @@
config_query RUN_LILO "Run LILO automatically upon LILO upgrades?" n &&
-config_query LILO_XVD "Apply patch to get lilo to recognize Xen XVD disks?" n
+# remove obsolete option
+if [[ -n "$LILO_XVD" ]]; then
+ persistent_remove LILO_XVD
+fi
diff --git a/disk/lilo/DETAILS b/disk/lilo/DETAILS
index 7666079d3b..a477ee394e 100755
--- a/disk/lilo/DETAILS
+++ b/disk/lilo/DETAILS
@@ -1,11 +1,11 @@
SPELL=lilo
- VERSION=24.0
+ VERSION=24.1
SOURCE=lilo-${VERSION}.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE_URL[0]=http://lilo.alioth.debian.org/ftp/sources/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=1FE1B08B.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=lilo.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://lilo.alioth.debian.org/
ENTERED=20010922
diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY
index a4f95126c8..a66adfd561 100644
--- a/disk/lilo/HISTORY
+++ b/disk/lilo/HISTORY
@@ -1,3 +1,13 @@
+2015-01-30 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 24.1; use lilo.gpg
+ * CONFIGURE: remove obsolete option
+ * xvd.patch, 0001-fix-failure-during-install.patch: removed, fixed by
+ upstream
+ * 1FE1B08B.gpg: removed, outdated
+ * lilo.gpg: added, 39A11092 public key (Joachim Wiedorn
+ <joodevel@joonet.de>) imported
+ * PRE_BUILD: removed, not needed anymore
+
2014-04-25 Vlad Glagolev <stealth@sourcemage.org>
* CONFIGURE: added option to apply XVD patch
* PRE_BUILD: apply patch
diff --git a/disk/lilo/PRE_BUILD b/disk/lilo/PRE_BUILD
deleted file mode 100755
index 1be3d3e271..0000000000
--- a/disk/lilo/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-failure-during-install.patch &&
-
-if [[ $LILO_XVD == y ]]; then
- patch -p0 < "$SPELL_DIRECTORY/xvd.patch"
-fi
diff --git a/disk/lilo/lilo.gpg b/disk/lilo/lilo.gpg
new file mode 100644
index 0000000000..0fcccf7bd3
--- /dev/null
+++ b/disk/lilo/lilo.gpg
Binary files differ
diff --git a/disk/lilo/xvd.patch b/disk/lilo/xvd.patch
deleted file mode 100644
index 35e2ce6885..0000000000
--- a/disk/lilo/xvd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/geometry.c.orig
-+++ src/geometry.c
-@@ -339,7 +339,7 @@ unsigned char max_partno[512] = {
- 31, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
-- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* Cx */
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, /* Cx */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-@@ -670,6 +670,7 @@ void geo_query_dev(GEOMETRY *geo,int device,int all)
- case MAJOR_SD6:
- case MAJOR_SD7:
- case MAJOR_SD8:
-+ case MAJOR_XVD:
- MASK15:
- geo->device = 0x80 + last_dev(MAJOR_HD,64) + (MINOR(device) >> 4);
- if (!get_all) break;
---- src/lilo.h.orig
-+++ src/lilo.h
-@@ -148,6 +148,7 @@
- #define MAJOR_EMD 153 /* Enhanced multi-disk RAID sets */
- #define MAJOR_CARM1 160 /* Carmel SATA Disk on first 8-port controller */
- #define MAJOR_CARM2 161 /* Carmel SATA Disk on 2nd 8-port controller */
-+#define MAJOR_XVD 202 /* xen xvd disks */
-
- /* don't use the following */
- #define MAJOR_MDP 254 /* Enhanced multi-disk RAID sets [experimental?] */