Date: Monday, September 19, 2011 @ 18:14:14
Author: tomegun
Revision: 138305
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
util-linux/repos/testing-i686/
util-linux/repos/testing-i686/PKGBUILD
(from rev 138303, util-linux/trunk/PKGBUILD)
util-linux/repos/testing-i686/agetty-typo.patch
(from rev 138303, util-linux/trunk/agetty-typo.patch)
util-linux/repos/testing-i686/dmesg-non-printk.patch
(from rev 138303, util-linux/trunk/dmesg-non-printk.patch)
util-linux/repos/testing-i686/dmesg-space.patch
(from rev 138303, util-linux/trunk/dmesg-space.patch)
util-linux/repos/testing-i686/dont-close-0.patch
(from rev 138303, util-linux/trunk/dont-close-0.patch)
util-linux/repos/testing-i686/fix-remount.patch
(from rev 138303, util-linux/trunk/fix-remount.patch)
util-linux/repos/testing-i686/write-freopen.patch
(from rev 138303, util-linux/trunk/write-freopen.patch)
util-linux/repos/testing-x86_64/
util-linux/repos/testing-x86_64/PKGBUILD
(from rev 138304, util-linux/trunk/PKGBUILD)
util-linux/repos/testing-x86_64/agetty-typo.patch
(from rev 138304, util-linux/trunk/agetty-typo.patch)
util-linux/repos/testing-x86_64/dmesg-non-printk.patch
(from rev 138304, util-linux/trunk/dmesg-non-printk.patch)
util-linux/repos/testing-x86_64/dmesg-space.patch
(from rev 138304, util-linux/trunk/dmesg-space.patch)
util-linux/repos/testing-x86_64/dont-close-0.patch
(from rev 138304, util-linux/trunk/dont-close-0.patch)
util-linux/repos/testing-x86_64/fix-remount.patch
(from rev 138304, util-linux/trunk/fix-remount.patch)
util-linux/repos/testing-x86_64/write-freopen.patch
(from rev 138304, util-linux/trunk/write-freopen.patch)
---------------------------------------+
testing-i686/PKGBUILD | 61 ++++++++++++++++++++++++++++
testing-i686/agetty-typo.patch | 27 ++++++++++++
testing-i686/dmesg-non-printk.patch | 69 ++++++++++++++++++++++++++++++++
testing-i686/dmesg-space.patch | 31 ++++++++++++++
testing-i686/dont-close-0.patch | 32 ++++++++++++++
testing-i686/fix-remount.patch | 37 +++++++++++++++++
testing-i686/write-freopen.patch | 27 ++++++++++++
testing-x86_64/PKGBUILD | 61 ++++++++++++++++++++++++++++
testing-x86_64/agetty-typo.patch | 27 ++++++++++++
testing-x86_64/dmesg-non-printk.patch | 69 ++++++++++++++++++++++++++++++++
testing-x86_64/dmesg-space.patch | 31 ++++++++++++++
testing-x86_64/dont-close-0.patch | 32 ++++++++++++++
testing-x86_64/fix-remount.patch | 37 +++++++++++++++++
testing-x86_64/write-freopen.patch | 27 ++++++++++++
14 files changed, 568 insertions(+)
Copied: util-linux/repos/testing-i686/PKGBUILD (from rev 138303,
util-linux/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Tom Gundersen <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=util-linux
+pkgver=2.20
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://userweb.kernel.org/~kzak/util-linux-ng/";
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('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}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ agetty-typo.patch
+ write-freopen.patch
+ dmesg-non-printk.patch
+ dmesg-space.patch
+ dont-close-0.patch
+ fix-remount.patch)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # patches from master
+ for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch
dmesg-space.patch dont-close-0.patch fix-remount.patch; do
+ patch -Np1 -i "${srcdir}/${patch}"
+ done
+
+ # hardware clock
+ 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ install -dm755 "${pkgdir}/var/lib/hwclock"
+
+ make DESTDIR="${pkgdir}" install
+}
+md5sums=('4dcacdbdafa116635e52b977d9d0e879'
+ '13838c6dd8df686e0f01ad0f236d2690'
+ '465817ff8f7c08411c8011ee91b50318'
+ 'f3ca75a1a22a2a739c5c22d92dc07ab0'
+ 'd9768f0b42d36d72c02ac7797b922ba1'
+ '37eae52af90c214dda73874c701fa246'
+ '344c780b9e08826dd8befe4271b41ed3')
Copied: util-linux/repos/testing-i686/agetty-typo.patch (from rev 138303,
util-linux/trunk/agetty-typo.patch)
===================================================================
--- testing-i686/agetty-typo.patch (rev 0)
+++ testing-i686/agetty-typo.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,27 @@
+From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Wed, 7 Sep 2011 07:37:03 +0200
+Subject: [PATCH] agetty: double equals sign typo in opentty()
+
+Reported-by: Francesco Cosoleto <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ term-utils/agetty.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 733be38..35bb389 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct
options *op)
+ * In case of a virtual console the ioctl TIOCMGET fails and
+ * the error number will be set to EINVAL.
+ */
+- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) {
++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) {
+ op->flags |= F_VCONSOLE;
+ if (!op->term)
+ op->term = DEFAULT_VCTERM;
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-i686/dmesg-non-printk.patch (from rev 138303,
util-linux/trunk/dmesg-non-printk.patch)
===================================================================
--- testing-i686/dmesg-non-printk.patch (rev 0)
+++ testing-i686/dmesg-non-printk.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,69 @@
+From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Wed, 31 Aug 2011 12:28:39 +0200
+Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels
+
+ * dmesg(1) incorrectly assumes that lines like "<6>\n"
+ are broken.
+
+ * it's more robust to assume the end of the record is "\n<"
+
+ * print \n for empty lines
+
+Reported-by: "Gabor Z. Papp" <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ sys-utils/dmesg.c | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 6090f4e..8e7bb4b 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+
+ if (!begin)
+ begin = p;
+- if (*p == '\n')
+- end = p;
+ if (i + 1 == rec->next_size) {
+ end = p + 1;
+ i++;
+- }
++ } else if (*p == '\n' && *(p + 1) == '<')
++ end = p;
++
+ if (begin && !*begin)
+ begin = NULL; /* zero(s) at the end of the buffer? */
+ if (!begin || !end)
+@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+ }
+ }
+
+- if (end <= begin)
+- return -1; /* error */
+-
+ if (*begin == '[' && (*(begin + 1) == ' ' ||
+ isdigit(*(begin + 1)))) {
+ if (ctl->delta || ctl->ctime) {
+@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size,
+ }
+
+ while (get_next_record(ctl, &rec) == 0) {
+- if (!rec.mesg_size)
+- continue;
+
+ if (!accept_record(ctl, &rec))
+ continue;
+
++ if (!rec.mesg_size) {
++ putchar('\n');
++ continue;
++ }
++
+ if (ctl->decode && rec.level >= 0 && rec.facility >= 0)
+ printf("%-6s:%-6s: ", facility_names[rec.facility].name,
+ level_names[rec.level].name);
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-i686/dmesg-space.patch (from rev 138303,
util-linux/trunk/dmesg-space.patch)
===================================================================
--- testing-i686/dmesg-space.patch (rev 0)
+++ testing-i686/dmesg-space.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,31 @@
+From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Fri, 2 Sep 2011 14:42:04 +0200
+Subject: [PATCH] dmesg: remove extra space only after time stamp
+
+Signed-off-by: Karel Zak <[email protected]>
+---
+ sys-utils/dmesg.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 8e7bb4b..b3713a0 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+ break;
+ }
+ }
++ if (begin < end && *begin == ' ')
++ begin++;
+ }
+
+- if (begin < end && *begin == ' ')
+- begin++;
+-
+ rec->mesg = begin;
+ rec->mesg_size = end - begin;
+
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-i686/dont-close-0.patch (from rev 138303,
util-linux/trunk/dont-close-0.patch)
===================================================================
--- testing-i686/dont-close-0.patch (rev 0)
+++ testing-i686/dont-close-0.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,32 @@
+From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001
+From: Petr Uzel <[email protected]>
+Date: Tue, 13 Sep 2011 11:08:46 +0200
+Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit()
+
+If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt'
+which hasn't been fully initialised. The 'dir_fd' is still 0, so
+sysfs_deinit calls "close(0)".
+
+Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151
+Reported-by: Diego Ercolani <[email protected]>
+Analysed-by: Neil Brown <[email protected]>
+Signed-off-by: Petr Uzel <[email protected]>
+---
+ lib/sysfs.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/sysfs.c b/lib/sysfs.c
+index eec1f24..ebb3bb5 100644
+--- a/lib/sysfs.c
++++ b/lib/sysfs.c
+@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct
sysfs_cxt *parent)
+ int fd, rc = 0;
+
+ memset(cxt, 0, sizeof(*cxt));
++ cxt->dir_fd = -1;
+
+ if (!sysfs_devno_path(devno, path, sizeof(path)))
+ goto err;
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-i686/fix-remount.patch (from rev 138303,
util-linux/trunk/fix-remount.patch)
===================================================================
--- testing-i686/fix-remount.patch (rev 0)
+++ testing-i686/fix-remount.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,37 @@
+From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Tue, 13 Sep 2011 22:59:39 +0200
+Subject: [PATCH 2/2] mount: check for target before source on remount
+
+Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091
+Reported-by: Eric Paris <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ mount/fstab.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/mount/fstab.c b/mount/fstab.c
+index 8d88f68..77bf81c 100644
+--- a/mount/fstab.c
++++ b/mount/fstab.c
+@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn
*mcprev) {
+ mc0 = mtab_head();
+ if (!mcprev)
+ mcprev = mc0;
++
+ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
+- if (streq(mc->m.mnt_dir, name) ||
+- streq(mc->m.mnt_fsname, name))
++ if (streq(mc->m.mnt_dir, name))
+ return mc;
++
++ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
++ if (streq(mc->m.mnt_fsname, name))
++ return mc;
++
+ return NULL;
+ }
+
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-i686/write-freopen.patch (from rev 138303,
util-linux/trunk/write-freopen.patch)
===================================================================
--- testing-i686/write-freopen.patch (rev 0)
+++ testing-i686/write-freopen.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,27 @@
+From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Tue, 6 Sep 2011 03:18:46 +0200
+Subject: [PATCH] write: fix path for freopen()
+
+Reported-by: xinglp <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ term-utils/write.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/write.c b/term-utils/write.c
+index a825f62..a70eb7b 100644
+--- a/term-utils/write.c
++++ b/term-utils/write.c
+@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
+
+ if (strlen(tty) + 6 > sizeof(path))
+ errx(EXIT_FAILURE, _("tty path %s too long"), tty);
+- printf(path, "/dev/%s", tty);
++ snprintf(path, sizeof(path), "/dev/%s", tty);
+ if ((freopen(path, "w", stdout)) == NULL)
+ err(EXIT_FAILURE, "%s", path);
+
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 138304,
util-linux/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Tom Gundersen <[email protected]>
+# Contributor: judd <[email protected]>
+
+pkgname=util-linux
+pkgver=2.20
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://userweb.kernel.org/~kzak/util-linux-ng/";
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('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}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ agetty-typo.patch
+ write-freopen.patch
+ dmesg-non-printk.patch
+ dmesg-space.patch
+ dont-close-0.patch
+ fix-remount.patch)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # patches from master
+ for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch
dmesg-space.patch dont-close-0.patch fix-remount.patch; do
+ patch -Np1 -i "${srcdir}/${patch}"
+ done
+
+ # hardware clock
+ 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ install -dm755 "${pkgdir}/var/lib/hwclock"
+
+ make DESTDIR="${pkgdir}" install
+}
+md5sums=('4dcacdbdafa116635e52b977d9d0e879'
+ '13838c6dd8df686e0f01ad0f236d2690'
+ '465817ff8f7c08411c8011ee91b50318'
+ 'f3ca75a1a22a2a739c5c22d92dc07ab0'
+ 'd9768f0b42d36d72c02ac7797b922ba1'
+ '37eae52af90c214dda73874c701fa246'
+ '344c780b9e08826dd8befe4271b41ed3')
Copied: util-linux/repos/testing-x86_64/agetty-typo.patch (from rev 138304,
util-linux/trunk/agetty-typo.patch)
===================================================================
--- testing-x86_64/agetty-typo.patch (rev 0)
+++ testing-x86_64/agetty-typo.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,27 @@
+From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Wed, 7 Sep 2011 07:37:03 +0200
+Subject: [PATCH] agetty: double equals sign typo in opentty()
+
+Reported-by: Francesco Cosoleto <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ term-utils/agetty.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 733be38..35bb389 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct
options *op)
+ * In case of a virtual console the ioctl TIOCMGET fails and
+ * the error number will be set to EINVAL.
+ */
+- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) {
++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) {
+ op->flags |= F_VCONSOLE;
+ if (!op->term)
+ op->term = DEFAULT_VCTERM;
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/dmesg-non-printk.patch (from rev
138304, util-linux/trunk/dmesg-non-printk.patch)
===================================================================
--- testing-x86_64/dmesg-non-printk.patch (rev 0)
+++ testing-x86_64/dmesg-non-printk.patch 2011-09-19 22:14:14 UTC (rev
138305)
@@ -0,0 +1,69 @@
+From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Wed, 31 Aug 2011 12:28:39 +0200
+Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels
+
+ * dmesg(1) incorrectly assumes that lines like "<6>\n"
+ are broken.
+
+ * it's more robust to assume the end of the record is "\n<"
+
+ * print \n for empty lines
+
+Reported-by: "Gabor Z. Papp" <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ sys-utils/dmesg.c | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 6090f4e..8e7bb4b 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+
+ if (!begin)
+ begin = p;
+- if (*p == '\n')
+- end = p;
+ if (i + 1 == rec->next_size) {
+ end = p + 1;
+ i++;
+- }
++ } else if (*p == '\n' && *(p + 1) == '<')
++ end = p;
++
+ if (begin && !*begin)
+ begin = NULL; /* zero(s) at the end of the buffer? */
+ if (!begin || !end)
+@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+ }
+ }
+
+- if (end <= begin)
+- return -1; /* error */
+-
+ if (*begin == '[' && (*(begin + 1) == ' ' ||
+ isdigit(*(begin + 1)))) {
+ if (ctl->delta || ctl->ctime) {
+@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size,
+ }
+
+ while (get_next_record(ctl, &rec) == 0) {
+- if (!rec.mesg_size)
+- continue;
+
+ if (!accept_record(ctl, &rec))
+ continue;
+
++ if (!rec.mesg_size) {
++ putchar('\n');
++ continue;
++ }
++
+ if (ctl->decode && rec.level >= 0 && rec.facility >= 0)
+ printf("%-6s:%-6s: ", facility_names[rec.facility].name,
+ level_names[rec.level].name);
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/dmesg-space.patch (from rev 138304,
util-linux/trunk/dmesg-space.patch)
===================================================================
--- testing-x86_64/dmesg-space.patch (rev 0)
+++ testing-x86_64/dmesg-space.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,31 @@
+From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Fri, 2 Sep 2011 14:42:04 +0200
+Subject: [PATCH] dmesg: remove extra space only after time stamp
+
+Signed-off-by: Karel Zak <[email protected]>
+---
+ sys-utils/dmesg.c | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 8e7bb4b..b3713a0 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl,
struct dmesg_record *rec)
+ break;
+ }
+ }
++ if (begin < end && *begin == ' ')
++ begin++;
+ }
+
+- if (begin < end && *begin == ' ')
+- begin++;
+-
+ rec->mesg = begin;
+ rec->mesg_size = end - begin;
+
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/dont-close-0.patch (from rev 138304,
util-linux/trunk/dont-close-0.patch)
===================================================================
--- testing-x86_64/dont-close-0.patch (rev 0)
+++ testing-x86_64/dont-close-0.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,32 @@
+From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001
+From: Petr Uzel <[email protected]>
+Date: Tue, 13 Sep 2011 11:08:46 +0200
+Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit()
+
+If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt'
+which hasn't been fully initialised. The 'dir_fd' is still 0, so
+sysfs_deinit calls "close(0)".
+
+Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151
+Reported-by: Diego Ercolani <[email protected]>
+Analysed-by: Neil Brown <[email protected]>
+Signed-off-by: Petr Uzel <[email protected]>
+---
+ lib/sysfs.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/sysfs.c b/lib/sysfs.c
+index eec1f24..ebb3bb5 100644
+--- a/lib/sysfs.c
++++ b/lib/sysfs.c
+@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct
sysfs_cxt *parent)
+ int fd, rc = 0;
+
+ memset(cxt, 0, sizeof(*cxt));
++ cxt->dir_fd = -1;
+
+ if (!sysfs_devno_path(devno, path, sizeof(path)))
+ goto err;
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/fix-remount.patch (from rev 138304,
util-linux/trunk/fix-remount.patch)
===================================================================
--- testing-x86_64/fix-remount.patch (rev 0)
+++ testing-x86_64/fix-remount.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,37 @@
+From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Tue, 13 Sep 2011 22:59:39 +0200
+Subject: [PATCH 2/2] mount: check for target before source on remount
+
+Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091
+Reported-by: Eric Paris <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ mount/fstab.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/mount/fstab.c b/mount/fstab.c
+index 8d88f68..77bf81c 100644
+--- a/mount/fstab.c
++++ b/mount/fstab.c
+@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn
*mcprev) {
+ mc0 = mtab_head();
+ if (!mcprev)
+ mcprev = mc0;
++
+ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
+- if (streq(mc->m.mnt_dir, name) ||
+- streq(mc->m.mnt_fsname, name))
++ if (streq(mc->m.mnt_dir, name))
+ return mc;
++
++ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
++ if (streq(mc->m.mnt_fsname, name))
++ return mc;
++
+ return NULL;
+ }
+
+--
+1.7.6.1
+
Copied: util-linux/repos/testing-x86_64/write-freopen.patch (from rev 138304,
util-linux/trunk/write-freopen.patch)
===================================================================
--- testing-x86_64/write-freopen.patch (rev 0)
+++ testing-x86_64/write-freopen.patch 2011-09-19 22:14:14 UTC (rev 138305)
@@ -0,0 +1,27 @@
+From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
+From: Karel Zak <[email protected]>
+Date: Tue, 6 Sep 2011 03:18:46 +0200
+Subject: [PATCH] write: fix path for freopen()
+
+Reported-by: xinglp <[email protected]>
+Signed-off-by: Karel Zak <[email protected]>
+---
+ term-utils/write.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/term-utils/write.c b/term-utils/write.c
+index a825f62..a70eb7b 100644
+--- a/term-utils/write.c
++++ b/term-utils/write.c
+@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
+
+ if (strlen(tty) + 6 > sizeof(path))
+ errx(EXIT_FAILURE, _("tty path %s too long"), tty);
+- printf(path, "/dev/%s", tty);
++ snprintf(path, sizeof(path), "/dev/%s", tty);
+ if ((freopen(path, "w", stdout)) == NULL)
+ err(EXIT_FAILURE, "%s", path);
+
+--
+1.7.6.1
+
