[arch-commits] Commit in lilo/trunk (4 files)

[Andrea Scarpino]

    Date: Friday, November 19, 2010 @ 09:37:52
  Author: andrea
Revision: 99931

upgpkg: lilo 23.1-1
new url, source and upstream release; remove old patch; use package() function; updated make options

Modified:
  lilo/trunk/PKGBUILD
  lilo/trunk/lilo.install
Deleted:
  lilo/trunk/ChangeLog
  lilo/trunk/fix_lilo_dm.patch

-------------------+
 ChangeLog         |    6 ------
 PKGBUILD          |   34 ++++++++++++++++++----------------
 fix_lilo_dm.patch |   48 ------------------------------------------------
 lilo.install      |    2 --
 4 files changed, 18 insertions(+), 72 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-11-19 14:20:24 UTC (rev 99930)
+++ ChangeLog	2010-11-19 14:37:52 UTC (rev 99931)
@@ -1,6 +0,0 @@
-2009-11-06  Eric Belanger  <eric at archlinux.org>
-
-	* lilo 22.8-4
-	* Fixed issue with device-mapper
-	* PKGBUILD clean up
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-19 14:20:24 UTC (rev 99930)
+++ PKGBUILD	2010-11-19 14:37:52 UTC (rev 99931)
@@ -3,11 +3,11 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=lilo
-pkgver=22.8
-pkgrel=4
+pkgver=23.1
+pkgrel=1
 pkgdesc="A bootloader for Linux"
 arch=('i686' 'x86_64')
-url="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/!INDEX.html"
+url="https://alioth.debian.org/projects/lilo/"
 license=('BSD')
 # While lilo should stay in the base category,
 # it usually makes no sense if it is installed
@@ -19,19 +19,21 @@
 makedepends=('bin86')
 install=lilo.install
 options=('!makeflags')
-source=(ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-${pkgver}.src.tar.gz \
-	lilo.conf fix_lilo_dm.patch)
-md5sums=('72765f2aafd20e23ecf07ebd22baeec7' 'a3a4c90bead3f9b8672bd384ff9f8db1'\
-         'd82cd0a08b89782261e534a81b82bb88')
-sha1sums=('59852eab59b93dcea63b39eef1db7963b7268b0d' '9ca31ef52ae0a29269c608f9470fb9341bb38f2e'\
-         '4d2ce83a1bf50fb18594713e4c15bce6e6149b6f')
+source=(https://alioth.debian.org/frs/download.php/3315/${pkgname}-${pkgver}.src.tar.gz
+        'lilo.conf')
+md5sums=('72f9b547393c0d0fb48b4b1c23f85f50'
+        'a3a4c90bead3f9b8672bd384ff9f8db1')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../fix_lilo_dm.patch || return 1
-  LANG=en_US
-  make all || return 1
-  make ROOT="${pkgdir}" MAN_DIR=/usr/share/man install || return 1
-  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  cd "${srcdir}/${pkgname}-23.0"
+  export LC_ALL=C
+  make all
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-23.0"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: fix_lilo_dm.patch
===================================================================
--- fix_lilo_dm.patch	2010-11-19 14:20:24 UTC (rev 99930)
+++ fix_lilo_dm.patch	2010-11-19 14:37:52 UTC (rev 99931)
@@ -1,48 +0,0 @@
-diff -Nur lilo-22.8.orig/geometry.c lilo-22.8/geometry.c
---- lilo-22.8.orig/geometry.c	2006-12-17 04:46:17.000000000 +0100
-+++ lilo-22.8/geometry.c	2009-11-07 03:26:02.815256390 +0100
-@@ -901,42 +901,15 @@
- 	    DEVICE dev;
- 	    struct dm_task *dmt;
- 	    void *next = NULL;
--	    char dmdev[PATH_MAX+1];
- 	    char buf[PATH_MAX+1];
--	    char *slash;
- 	    int result;
- 
- 	    dev_open(&dev, device, -1);
--	    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) {
--		    if (buf[0] != '/' && (slash = strrchr(dmdev, '/')) != NULL)
--			slash++;
--		    else
--			slash = dmdev;
--		    strncpy(slash, buf, PATH_MAX - (slash-dmdev));
--		}
--		if (realpath(dmdev, buf) == NULL)
--		    die("device-mapper: realpath(\"%s\") failed with: %s",dmdev,
--			strerror(errno));
--		strncpy(dmdev, buf, PATH_MAX);
--	    } while (result >= 0);
--	    dmdev[PATH_MAX] = 0;
- 
- 	    if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
- 		die("device-mapper: dm_task_create(DM_DEVICE_TABLE) failed");
--	    slash = strrchr(dmdev, '/');
--		if (slash)
--	    slash++;
--		else
--	    slash = dmdev;
--	    if (!dm_task_set_name(dmt, slash))
--		die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev);
-+	    if (!dm_task_set_name(dmt, dev.name))
-+		die("device-mapper: dm_task_set_name(\"%s\") failed",dev.name);
- 	    if (!dm_task_run(dmt))
- 		die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed");
- 

Modified: lilo.install
===================================================================
--- lilo.install	2010-11-19 14:20:24 UTC (rev 99930)
+++ lilo.install	2010-11-19 14:37:52 UTC (rev 99931)
@@ -1,5 +1,3 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   echo
   echo "If you use the LILO bootloader, you should run 'lilo' after upgrading."