Date: Saturday, September 10, 2011 @ 18:03:06
Author: tomegun
Revision: 137776
db-move: moved util-linux from [testing] to [core] (i686)
Added:
util-linux/repos/core-i686/PKGBUILD
(from rev 137775, util-linux/repos/testing-i686/PKGBUILD)
util-linux/repos/core-i686/agetty-typo.patch
(from rev 137775, util-linux/repos/testing-i686/agetty-typo.patch)
util-linux/repos/core-i686/dmesg-non-printk.patch
(from rev 137775, util-linux/repos/testing-i686/dmesg-non-printk.patch)
util-linux/repos/core-i686/dmesg-space.patch
(from rev 137775, util-linux/repos/testing-i686/dmesg-space.patch)
util-linux/repos/core-i686/write-freopen.patch
(from rev 137775, util-linux/repos/testing-i686/write-freopen.patch)
Deleted:
util-linux/repos/core-i686/PKGBUILD
util-linux/repos/core-i686/mount-segfault-2.19.1.patch
util-linux/repos/core-i686/two-component-linux.patch
util-linux/repos/testing-i686/
-----------------------------+
PKGBUILD | 98 ++++++++++++++++++++++++------------------
agetty-typo.patch | 27 +++++++++++
dmesg-non-printk.patch | 69 +++++++++++++++++++++++++++++
dmesg-space.patch | 31 +++++++++++++
mount-segfault-2.19.1.patch | 84 ------------------------------------
two-component-linux.patch | 32 -------------
write-freopen.patch | 27 +++++++++++
7 files changed, 210 insertions(+), 158 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2011-09-10 21:15:39 UTC (rev 137775)
+++ core-i686/PKGBUILD 2011-09-10 22:03:06 UTC (rev 137776)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <t...@jklm.no>
-# Contributor: judd <jvi...@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.19.1
-pkgrel=3
-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
- two-component-linux.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # add support for linux 3.0, which is needed mkswap
- patch -Np1 -i ../two-component-linux.patch
- # 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
-}
-md5sums=('3eab06f05163dfa65479c44e5231932c'
- '3247b52f0e4b8044f23f2f7218e2fdea'
- '6eb23edb484adf7192e107d1c6d94bd3')
Copied: util-linux/repos/core-i686/PKGBUILD (from rev 137775,
util-linux/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2011-09-10 22:03:06 UTC (rev 137776)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Tom Gundersen <t...@jklm.no>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=util-linux
+pkgver=2.20
+pkgrel=2
+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)
+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; 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
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ install -dm755 "${pkgdir}/var/lib/hwclock"
+
+ make DESTDIR="${pkgdir}" install
+}
+md5sums=('4dcacdbdafa116635e52b977d9d0e879'
+ '13838c6dd8df686e0f01ad0f236d2690'
+ '465817ff8f7c08411c8011ee91b50318'
+ 'f3ca75a1a22a2a739c5c22d92dc07ab0'
+ 'd9768f0b42d36d72c02ac7797b922ba1')
Copied: util-linux/repos/core-i686/agetty-typo.patch (from rev 137775,
util-linux/repos/testing-i686/agetty-typo.patch)
===================================================================
--- core-i686/agetty-typo.patch (rev 0)
+++ core-i686/agetty-typo.patch 2011-09-10 22:03:06 UTC (rev 137776)
@@ -0,0 +1,27 @@
+From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
+From: Karel Zak <k...@redhat.com>
+Date: Wed, 7 Sep 2011 07:37:03 +0200
+Subject: [PATCH] agetty: double equals sign typo in opentty()
+
+Reported-by: Francesco Cosoleto <cosol...@gmail.com>
+Signed-off-by: Karel Zak <k...@redhat.com>
+---
+ 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/core-i686/dmesg-non-printk.patch (from rev 137775,
util-linux/repos/testing-i686/dmesg-non-printk.patch)
===================================================================
--- core-i686/dmesg-non-printk.patch (rev 0)
+++ core-i686/dmesg-non-printk.patch 2011-09-10 22:03:06 UTC (rev 137776)
@@ -0,0 +1,69 @@
+From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
+From: Karel Zak <k...@redhat.com>
+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" <g...@papp.hu>
+Signed-off-by: Karel Zak <k...@redhat.com>
+---
+ 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/core-i686/dmesg-space.patch (from rev 137775,
util-linux/repos/testing-i686/dmesg-space.patch)
===================================================================
--- core-i686/dmesg-space.patch (rev 0)
+++ core-i686/dmesg-space.patch 2011-09-10 22:03:06 UTC (rev 137776)
@@ -0,0 +1,31 @@
+From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
+From: Karel Zak <k...@redhat.com>
+Date: Fri, 2 Sep 2011 14:42:04 +0200
+Subject: [PATCH] dmesg: remove extra space only after time stamp
+
+Signed-off-by: Karel Zak <k...@redhat.com>
+---
+ 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
+
Deleted: core-i686/mount-segfault-2.19.1.patch
===================================================================
--- core-i686/mount-segfault-2.19.1.patch 2011-09-10 21:15:39 UTC (rev
137775)
+++ core-i686/mount-segfault-2.19.1.patch 2011-09-10 22:03:06 UTC (rev
137776)
@@ -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 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
-
Deleted: core-i686/two-component-linux.patch
===================================================================
--- core-i686/two-component-linux.patch 2011-09-10 21:15:39 UTC (rev 137775)
+++ core-i686/two-component-linux.patch 2011-09-10 22:03:06 UTC (rev 137776)
@@ -1,32 +0,0 @@
-From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001
-From: Karel Zak <k...@redhat.com>
-Date: Mon, 6 Jun 2011 12:35:26 +0200
-Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux
- version (e.g. 3.0)
-
-Signed-off-by: Karel Zak <k...@redhat.com>
----
- lib/linux_version.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/linux_version.c b/lib/linux_version.c
-index f9fbd8d..ada566a 100644
---- a/lib/linux_version.c
-+++ b/lib/linux_version.c
-@@ -16,10 +16,10 @@ get_linux_version (void)
- return kver;
- if (uname (&uts))
- kver = 0;
-- else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3)
-- kver = 0;
-- else
-+ else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3)
- kver = KERNEL_VERSION (major, minor, teeny);
-+ else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2)
-+ kver = KERNEL_VERSION (major, minor, 0);
-
- return kver;
- }
---
-1.7.6
-
Copied: util-linux/repos/core-i686/write-freopen.patch (from rev 137775,
util-linux/repos/testing-i686/write-freopen.patch)
===================================================================
--- core-i686/write-freopen.patch (rev 0)
+++ core-i686/write-freopen.patch 2011-09-10 22:03:06 UTC (rev 137776)
@@ -0,0 +1,27 @@
+From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
+From: Karel Zak <k...@redhat.com>
+Date: Tue, 6 Sep 2011 03:18:46 +0200
+Subject: [PATCH] write: fix path for freopen()
+
+Reported-by: xinglp <xin...@gmail.com>
+Signed-off-by: Karel Zak <k...@redhat.com>
+---
+ 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
+
