diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/util-linux/PKGBUILD | 38 | ||||
| -rw-r--r-- | abs/core/util-linux/mount-segfault-2.19.1.patch | 84 |
2 files changed, 122 insertions, 0 deletions
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD new file mode 100644 index 0000000..877e013 --- /dev/null +++ b/abs/core/util-linux/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $ +# Maintainer: +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=util-linux +pkgver=2.19.1 +pkgrel=2 +pkgdesc="Miscellaneous system utilities for Linux" +url="http://userweb.kernel.org/~kzak/util-linux-ng/" +arch=('i686' 'x86_64') +groups=('base') +depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') +replaces=('linux32' 'util-linux-ng') +conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') +provides=('linux32' "util-linux-ng=${pkgver}") +license=('GPL2') +options=('!libtool') +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 + mount-segfault-2.19.1.patch) +optdepends=('perl: for chkdupexe support') +md5sums=('3eab06f05163dfa65479c44e5231932c' + '3247b52f0e4b8044f23f2f7218e2fdea') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix https://bugs.archlinux.org/task/24261 + patch -Np1 -i ../mount-segfault-2.19.1.patch + # hardware clock + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c + ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -dm755 "${pkgdir}/var/lib/hwclock" + make DESTDIR="${pkgdir}" install +} diff --git a/abs/core/util-linux/mount-segfault-2.19.1.patch b/abs/core/util-linux/mount-segfault-2.19.1.patch new file mode 100644 index 0000000..7bcb3bc --- /dev/null +++ b/abs/core/util-linux/mount-segfault-2.19.1.patch @@ -0,0 +1,84 @@ +From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 11 May 2011 16:57:27 +0200 +Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount + options) + + # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab + # mkdir /tmp/x + # mount -a + segfault + +Reported-by: Mike Frysinger <vapier@gentoo.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + mount/mount.c | 8 +++++--- + mount/mount_mntent.c | 5 +++-- + mount/sundries.c | 2 ++ + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/mount/mount.c b/mount/mount.c +index ba71149..29963c2 100644 +--- a/mount/mount.c ++++ b/mount/mount.c +@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long + res = loopfile_used_with((char *) mnt->m.mnt_fsname, + loopfile, offset); + +- else if ((p = strstr(mnt->m.mnt_opts, "loop="))) { ++ else if (mnt->m.mnt_opts && ++ (p = strstr(mnt->m.mnt_opts, "loop="))) ++ { + char *dev = xstrdup(p+5); + if ((p = strchr(dev, ','))) + *p = '\0'; +@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose) + goto yes; + + /* extra care for loop devices */ +- if ((strstr(mc->m.mnt_opts, "loop=") || +- (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) { ++ if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) || ++ (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) { + + char *p = get_option_value(mc->m.mnt_opts, "offset="); + uintmax_t offset = 0; +diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c +index d90def3..f42c0ad 100644 +--- a/mount/mount_mntent.c ++++ b/mount/mount_mntent.c +@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { + m1 = mangle(mnt->mnt_fsname); + m2 = mangle(mnt->mnt_dir); + m3 = mangle(mnt->mnt_type); +- m4 = mangle(mnt->mnt_opts); ++ m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw"; + + res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n", + m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno); +@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { + free(m1); + free(m2); + free(m3); +- free(m4); ++ if (mnt->mnt_opts) ++ free(m4); + return (res < 0) ? 1 : 0; + } + +diff --git a/mount/sundries.c b/mount/sundries.c +index ae4501a..2dec37f 100644 +--- a/mount/sundries.c ++++ b/mount/sundries.c +@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) { + + if (test_opts == NULL) + return 1; ++ if (options == NULL) ++ options = ""; + + len = strlen(test_opts); + q = alloca(len+1); +-- +1.7.5.1 + |