[arch-commits] Commit in util-linux-ng/trunk (3 files)
Thomas Bächler
thomas at archlinux.org
Mon Jul 5 23:24:20 UTC 2010
Date: Monday, July 5, 2010 @ 19:24:20
Author: thomas
Revision: 84963
util-linux-ng 2.18-2: remove static fsck, make findmnt usable
Added:
util-linux-ng/trunk/fix-findmnt.patch
Modified:
util-linux-ng/trunk/PKGBUILD
Deleted:
util-linux-ng/trunk/fsck-static.patch
-------------------+
PKGBUILD | 11 ++++++-----
fix-findmnt.patch | 24 ++++++++++++++++++++++++
fsck-static.patch | 29 -----------------------------
3 files changed, 30 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-05 21:58:59 UTC (rev 84962)
+++ PKGBUILD 2010-07-05 23:24:20 UTC (rev 84963)
@@ -2,7 +2,7 @@
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=util-linux-ng
pkgver=2.18
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://userweb.kernel.org/~kzak/util-linux-ng/"
arch=('i686' 'x86_64')
@@ -14,19 +14,20 @@
license=('GPL2')
options=('!libtool')
source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.18/${pkgname}-${pkgver}.tar.bz2
- fsck-static.patch)
+ fix-findmnt.patch)
optdepends=('perl: for chkdupexe support')
install=util-linux-ng.install
md5sums=('2f5f71e6af969d041d73ab778c141a77'
- '2cd1b7a768e83c8b03e23631b1546e84')
+ '7346673932b165faadde2fa2a9c1cd3a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # Provide static fsck
- patch -Np1 -i "${srcdir}/fsck-static.patch" || 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
+ # fix findmnt
+ patch -p1 -i "${srcdir}/fix-findmnt.patch"
+
autoreconf || return 1
automake || return 1
./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev --enable-partx || return 1
Added: fix-findmnt.patch
===================================================================
--- fix-findmnt.patch (rev 0)
+++ fix-findmnt.patch 2010-07-05 23:24:20 UTC (rev 84963)
@@ -0,0 +1,24 @@
+commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
+Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA at public.gmane.org>
+Date: Sun Jul 4 20:02:57 2010 +0200
+
+ libmount: fix merge_optstr (do not truncate 3 trailing characters)
+
+ I believe this is the correct fix.
+
+ Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA at public.gmane.org>
+
+diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
+index 5dbcfa6..680e1fc 100644
+--- a/shlibs/mount/src/tab_parse.c
++++ b/shlibs/mount/src/tab_parse.c
+@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
+ if (!strcmp(vfs, fs))
+ return strdup(vfs); /* e.g. "aaa" and "aaa" */
+
+- sz = strlen(vfs) + strlen(fs) + 2;
++ /* leave space for leading "r[ow],", "," and trailing zero */
++ sz = strlen(vfs) + strlen(fs) + 5;
+ res = malloc(sz);
+ if (!res)
+ return NULL;
Deleted: fsck-static.patch
===================================================================
--- fsck-static.patch 2010-07-05 21:58:59 UTC (rev 84962)
+++ fsck-static.patch 2010-07-05 23:24:20 UTC (rev 84963)
@@ -1,29 +0,0 @@
---- util-linux-ng-2.16/fsck/Makefile.am 2009-07-04 01:20:01.000000000 +0200
-+++ util-linux-ng-2.16.new/fsck/Makefile.am 2009-08-01 14:16:31.000000000 +0200
-@@ -1,17 +1,25 @@
- include $(top_srcdir)/config/include-Makefile.am
-
--sbin_PROGRAMS = fsck
-+sbin_PROGRAMS = fsck fsck.static
- dist_man_MANS = fsck.8
-
- fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \
- $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c
-+fsck_static_SOURCES = $(fsck_SOURCES)
- fsck_LDADD =
- fsck_CFLAGS = $(AM_CFLAGS)
-+fsck_static_LDADD =
-+fsck_static_CFLAGS = $(AM_CFLAGS)
-+fsck_static_LDFLAGS = -all-static
-
- if BUILD_LIBBLKID
- fsck_LDADD += $(ul_libblkid_la)
- fsck_CFLAGS += -I$(ul_libblkid_incdir)
-+fsck_static_LDADD += $(ul_libblkid_la)
-+fsck_static_CFLAGS += -I$(ul_libblkid_incdir)
- else
- fsck_LDADD += $(BLKID_LIBS)
- fsck_CFLAGS += $(BLKID_CFLAGS)
-+fsck_static_LDADD += $(BLKID_LIBS)
-+fsck_static_CFLAGS += $(BLKID_CFLAGS)
- endif
More information about the arch-commits
mailing list