Author: arekm Date: Wed Oct 13 12:40:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 23.0
---- Files affected:
packages/lilo:
lilo-degraded_arrary.patch (1.1 -> 1.2) , lilo-dm.patch (1.1 -> 1.2) ,
lilo-nobash.patch (1.2 -> 1.3) , lilo-pagesize.patch (1.1 -> 1.2) , lilo.spec
(1.156 -> 1.157) , lilo-devmapper.patch (1.1 -> NONE) (REMOVED),
lilo-doc-fallback.patch (1.1 -> NONE) (REMOVED), lilo-makefile.patch (1.8 ->
NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/lilo/lilo-degraded_arrary.patch
diff -u packages/lilo/lilo-degraded_arrary.patch:1.1
packages/lilo/lilo-degraded_arrary.patch:1.2
--- packages/lilo/lilo-degraded_arrary.patch:1.1 Wed Feb 3 13:33:16 2010
+++ packages/lilo/lilo-degraded_arrary.patch Wed Oct 13 14:40:25 2010
@@ -10,9 +10,9 @@
# getting informations about the faulty or removed device is skipped.
The attached patch really scans all devices to get all required information.
-diff -Nur lilo-22.8/raid.c lilo-22.8/raid.c
---- lilo-22.8/raid.c 2009-04-01 17:27:06.000000000 +0200
-+++ lilo-22.8/raid.c 2009-04-01 17:26:48.000000000 +0200
+diff -Nur lilo-22.8/src/raid.c lilo-22.8/src/raid.c
+--- lilo-22.8/src/raid.c 2009-04-01 17:27:06.000000000 +0200
++++ lilo-22.8/src/raid.c 2009-04-01 17:26:48.000000000 +0200
@@ -223,7 +223,7 @@
if (!force_raid) die("Not all RAID-1 disks are active; use '-H' to
install to active disks only");
else {
================================================================
Index: packages/lilo/lilo-dm.patch
diff -u packages/lilo/lilo-dm.patch:1.1 packages/lilo/lilo-dm.patch:1.2
--- packages/lilo/lilo-dm.patch:1.1 Wed Sep 20 00:08:17 2006
+++ packages/lilo/lilo-dm.patch Wed Oct 13 14:40:25 2010
@@ -1,6 +1,6 @@
-diff -urN lilo-22.7.3.org/device.c lilo-22.7.3/device.c
---- lilo-22.7.3.org/device.c 2006-07-06 03:33:46.000000000 +0200
-+++ lilo-22.7.3/device.c 2006-09-20 00:05:13.000000000 +0200
+diff -urN lilo-22.7.3.org/src/device.c lilo-22.7.3/src/device.c
+--- lilo-22.7.3.org/src/device.c 2006-07-06 03:33:46.000000000 +0200
++++ lilo-22.7.3/src/device.c 2006-09-20 00:05:13.000000000 +0200
@@ -1028,7 +1028,7 @@
geo_query_dev(&geo, dev,
MAJOR(dev)!=MAJOR_LOOP
================================================================
Index: packages/lilo/lilo-nobash.patch
diff -u packages/lilo/lilo-nobash.patch:1.2 packages/lilo/lilo-nobash.patch:1.3
--- packages/lilo/lilo-nobash.patch:1.2 Tue Jan 4 23:51:01 2005
+++ packages/lilo/lilo-nobash.patch Wed Oct 13 14:40:25 2010
@@ -24,10 +24,3 @@
if [ "$fast" = error ]; then
echo -n `$lilo -V`
echo " failure."
-@@ -683,4 +683,4 @@
-
- echo "All done."
- echo ""
--exit 0
-\ No newline at end of file
-+exit 0
================================================================
Index: packages/lilo/lilo-pagesize.patch
diff -u packages/lilo/lilo-pagesize.patch:1.1
packages/lilo/lilo-pagesize.patch:1.2
--- packages/lilo/lilo-pagesize.patch:1.1 Sun Jun 13 11:23:44 2004
+++ packages/lilo/lilo-pagesize.patch Wed Oct 13 14:40:25 2010
@@ -1,5 +1,5 @@
---- lilo-21.4.4/lilo.h.pagesize 2003-08-20 18:55:00.000000000 -0400
-+++ lilo-21.4.4/lilo.h 2003-08-20 18:55:22.000000000 -0400
+--- lilo-21.4.4/src/lilo.h.pagesize 2003-08-20 18:55:00.000000000 -0400
++++ lilo-21.4.4/src/lilo.h 2003-08-20 18:55:22.000000000 -0400
@@ -142,6 +142,8 @@
#define PRTMAP_SIZE 32 /* number of partition type mappings */
#define DRVMAP_SIZE 8 /* number of drive mappings */
================================================================
Index: packages/lilo/lilo.spec
diff -u packages/lilo/lilo.spec:1.156 packages/lilo/lilo.spec:1.157
--- packages/lilo/lilo.spec:1.156 Wed Feb 3 13:33:16 2010
+++ packages/lilo/lilo.spec Wed Oct 13 14:40:25 2010
@@ -12,13 +12,13 @@
Summary(uk.UTF-8): Завантажувач для Linux та інших операційних систем
Summary(zh_CN.UTF-8): Linux 和其它系统的引导模块。
Name: lilo
-Version: 22.8
-Release: 6
+Version: 23.0
+Release: 1
Epoch: 2
License: BSD
Group: Applications/System
-Source0:
ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/%{name}-%{version}.src.tar.gz
-# Source0-md5: 72765f2aafd20e23ecf07ebd22baeec7
+Source0:
https://alioth.debian.org/frs/download.php/3315/%{name}-%{version}.tar.gz
+# Source0-md5: 72f9b547393c0d0fb48b4b1c23f85f50
Source1: %{name}-pldblack.bmp
Source2: %{name}.conf
Source3: %{name}_functions.sh
@@ -26,15 +26,12 @@
# Source4-md5: 5d93c6c01175d2e701ca77de16368a62
Source5: %{name}-pldblue.bmp
Source6: %{name}-pldblue8.bmp
-Patch0: %{name}-makefile.patch
-Patch1: %{name}-nobash.patch
-Patch2: %{name}-cc.patch
-Patch3: %{name}-doc-fallback.patch
-Patch4: %{name}-pagesize.patch
-Patch5: %{name}-dm.patch
-Patch6: %{name}-devmapper.patch
-Patch7: %{name}-degraded_arrary.patch
-URL: http://freshmeat.net/projects/lilo/
+Patch0: %{name}-nobash.patch
+Patch1: %{name}-cc.patch
+Patch2: %{name}-pagesize.patch
+Patch3: %{name}-dm.patch
+Patch4: %{name}-degraded_arrary.patch
+URL: https://alioth.debian.org/projects/lilo/
BuildRequires: bin86 >= 0.15
BuildRequires: device-mapper-devel >= 1.01.01
BuildRequires: sed >= 4.0
@@ -43,6 +40,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
+%define _usrsbindir %{_prefix}/sbin
%description
Lilo is repsonsible for loading your linux kernel from either a floppy
@@ -112,9 +110,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
:> checkit
@@ -129,7 +124,7 @@
install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-boot,%{_mandir}/man{5,8}}
%{__make} install \
- ROOT=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lilo.conf
@@ -152,7 +147,7 @@
%files
%defattr(644,root,root,755)
-%doc README* CHANGES INCOMPAT QuickInst
+%doc CHANGELOG* NEWS README TODO QuickInst readme
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.conf
%attr(600,root,root) %config(noreplace,missingok) %verify(not md5 mtime size)
%{_sysconfdir}/disktab
/boot/diag1.img
@@ -160,7 +155,8 @@
/boot/lilo-pldblue.bmp
/boot/lilo-pldblue8.bmp
%attr(755,root,root) %{_sbindir}/lilo
-%attr(755,root,root) %{_sbindir}/mkrescue
+%attr(755,root,root) %{_usrsbindir}/keytab-lilo
+%attr(755,root,root) %{_usrsbindir}/mkrescue
%{_mandir}/man[58]/*
%lang(cs) %{_mandir}/cs/man[58]/*
%lang(de) %{_mandir}/de/man[58]/*
@@ -183,6 +179,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157 2010/10/13 12:40:25 arekm
+- up to 23.0
+
Revision 1.156 2010/02/03 12:33:16 matkor
- Release 6. degraded_arrary.patch by Christian Schoniger for running lilo
when first disk on array is failed.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo-degraded_arrary.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo-dm.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo-nobash.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo-pagesize.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo.spec?r1=1.156&r2=1.157&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
