[arch-commits] Commit in util-linux/trunk (PKGBUILD mount-segfault-2.19.1.patch)
Date: Friday, July 29, 2011 @ 18:28:52
Author: tomegun
Revision: 133609
Release candidate
Link mount against libmount for now. This will probably be reverted before
the final release.
Modified:
util-linux/trunk/PKGBUILD
Deleted:
util-linux/trunk/mount-segfault-2.19.1.patch
-+
PKGBUILD| 18 +++--
mount-segfault-2.19.1.patch | 84 --
2 files changed, 7 insertions(+), 95 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-29 21:12:09 UTC (rev 133608)
+++ PKGBUILD2011-07-29 22:28:52 UTC (rev 133609)
@@ -1,10 +1,10 @@
# $Id$
-# Maintainer:
+# Maintainer: Tom Gundersen t...@jklm.no
# Contributor: judd jvi...@zeroflux.org
pkgname=util-linux
-pkgver=2.19.1
-pkgrel=2
+pkgver=2.20-rc1
+pkgrel=1
pkgdesc=Miscellaneous system utilities for Linux
url=http://userweb.kernel.org/~kzak/util-linux-ng/;
arch=('i686' 'x86_64')
@@ -15,19 +15,14 @@
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)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
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
+ sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+ ./configure --enable-arch --enable-write --enable-raw --disable-wall
--enable-partx --enable-libmount-mount
make
}
@@ -36,3 +31,4 @@
install -dm755 ${pkgdir}/var/lib/hwclock
make DESTDIR=${pkgdir} install
}
+sha256sums=('34edb87c1ae46a54921ea73dc9b07d010d0611cf79ff982f20bfc6841bae2fcc')
Deleted: mount-segfault-2.19.1.patch
===
--- mount-segfault-2.19.1.patch 2011-07-29 21:12:09 UTC (rev 133608)
+++ mount-segfault-2.19.1.patch 2011-07-29 22:28:52 UTC (rev 133609)
@@ -1,84 +0,0 @@
-From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001
-From: Karel Zak k...@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 vap...@gentoo.org
-Signed-off-by: Karel Zak k...@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
[arch-commits] Commit in util-linux/trunk (PKGBUILD mount-segfault-2.19.1.patch)
Date: Saturday, May 14, 2011 @ 05:14:06
Author: tpowa
Revision: 123897
upgpkg: util-linux 2.19.1-2
fix mount segfaut patch
Added:
util-linux/trunk/mount-segfault-2.19.1.patch
Modified:
util-linux/trunk/PKGBUILD
-+
PKGBUILD| 10 +++--
mount-segfault-2.19.1.patch | 84 ++
2 files changed, 91 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-14 09:00:47 UTC (rev 123896)
+++ PKGBUILD2011-05-14 09:14:06 UTC (rev 123897)
@@ -4,7 +4,7 @@
pkgname=util-linux
pkgver=2.19.1
-pkgrel=1
+pkgrel=2
pkgdesc=Miscellaneous system utilities for Linux
url=http://userweb.kernel.org/~kzak/util-linux-ng/;
arch=('i686' 'x86_64')
@@ -15,12 +15,16 @@
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)
+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')
+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
Added: mount-segfault-2.19.1.patch
===
--- mount-segfault-2.19.1.patch (rev 0)
+++ mount-segfault-2.19.1.patch 2011-05-14 09:14:06 UTC (rev 123897)
@@ -0,0 +1,84 @@
+From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001
+From: Karel Zak k...@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 vap...@gentoo.org
+Signed-off-by: Karel Zak k...@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
+
