[arch-commits] Commit in util-linux-ng/trunk (PKGBUILD fsck-static.patch)
Tobias Powalowski
tpowa at archlinux.org
Fri Jan 22 11:00:45 UTC 2010
Date: Friday, January 22, 2010 @ 06:00:45
Author: tpowa
Revision: 64840
upgpkg: util-linux-ng 2.17-1
bump to latest version
Modified:
util-linux-ng/trunk/PKGBUILD
util-linux-ng/trunk/fsck-static.patch
-------------------+
PKGBUILD | 16 +++++++++-------
fsck-static.patch | 8 ++++----
2 files changed, 13 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-22 10:50:58 UTC (rev 64839)
+++ PKGBUILD 2010-01-22 11:00:45 UTC (rev 64840)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=util-linux-ng
-pkgver=2.16.2
+pkgver=2.17
_loop_version=3.2h
pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
@@ -14,14 +14,12 @@
provides=('linux32' 'util-linux')
license=('GPL2')
options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.16/${pkgname}-${pkgver}.tar.bz2
- http://loop-aes.sourceforge.net/loop-AES/loop-AES-v$_loop_version.tar.bz2
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.17/${pkgname}-${pkgver}.tar.bz2
+ #http://loop-aes.sourceforge.net/loop-AES/loop-AES-v$_loop_version.tar.bz2
+ http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2
fsck-static.patch)
optdepends=('perl: for chkdupexe support')
install=util-linux-ng.install
-md5sums=('edd1f7a82fd388cc0e1e3d2d1e7ea55a'
- '060bec1ae3c5ba98d63c7d64d906faaf'
- '35c3ba312782f042b594399b50b8de62')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,7 +27,8 @@
patch -Np1 -i "${srcdir}/fsck-static.patch" || return 1
# cryptoloop support
- patch -Np1 -i "${srcdir}/loop-AES-v${_loop_version}/${pkgname}-2.16.1.diff" || return 1
+ # patch -Np1 -i "${srcdir}/loop-AES-v${_loop_version}/${pkgname}-2.16.1.diff" || return 1
+ patch -Np1 -i ${srcdir}/util-linux-ng-2.17-20100120.diff || return 1
# hardware clock
sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1
mkdir -p "${pkgdir}/var/lib/hwclock" || return 1
@@ -44,3 +43,6 @@
rm -f "${pkgdir}/usr/share/man/man5/nfs.5"
rm -f "${pkgdir}/usr/share/info/dir"
}
+md5sums=('11cc8a0138019e7060dd275d47dbc096'
+ '9f74f22a8a189fab8f97f52def0a6858'
+ '499f80605a50d1c7b27894f3319343e8')
Modified: fsck-static.patch
===================================================================
--- fsck-static.patch 2010-01-22 10:50:58 UTC (rev 64839)
+++ fsck-static.patch 2010-01-22 11:00:45 UTC (rev 64840)
@@ -11,16 +11,16 @@
../lib/fsprobe.c ../lib/canonicalize.c
+fsck_static_SOURCES = $(fsck_SOURCES)
fsck_LDADD =
- fsck_CFLAGS =
+ fsck_CFLAGS = $(AM_CFLAGS)
+fsck_static_LDADD =
-+fsck_static_CFLAGS =
++fsck_static_CFLAGS = $(AM_CFLAGS)
+fsck_static_LDFLAGS = -all-static
if BUILD_LIBBLKID
fsck_LDADD += $(ul_libblkid_la)
- fsck_CFLAGS += -I$(ul_libblkid_srcdir)
+ fsck_CFLAGS += -I$(ul_libblkid_incdir)
+fsck_static_LDADD += $(ul_libblkid_la)
-+fsck_static_CFLAGS += -I$(ul_libblkid_srcdir)
++fsck_static_CFLAGS += -I$(ul_libblkid_incdir)
else
fsck_LDADD += $(BLKID_LIBS)
fsck_CFLAGS += $(BLKID_CFLAGS)
More information about the arch-commits
mailing list