# HG changeset patch # User Christopher Rogers # Date 1286037243 0 # Node ID cb53e0d303462f7defe06eb3cc4947d9c2f2ebd1 # Parent 250ea75bef27a92cf7f73c1a0569fabb90f21645 Up: util-linux-ng to 2.18. diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-blkid-dev/receipt --- a/util-linux-ng-blkid-dev/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-blkid-dev/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-blkid-dev" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="development" SHORT_DESC="The blkid devel files from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-blkid/receipt --- a/util-linux-ng-blkid/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-blkid/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-blkid" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="base-system" SHORT_DESC="The blkid utility and library from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-cfdisk/receipt --- a/util-linux-ng-cfdisk/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-cfdisk/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-cfdisk" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="system-tools" SHORT_DESC="The cfdisk utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-getopt/receipt --- a/util-linux-ng-getopt/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-getopt/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-getopt" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="base-system" SHORT_DESC="The getopt utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-partx/receipt --- a/util-linux-ng-partx/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-partx/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-partx" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="system-tools" SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-sfdisk/receipt --- a/util-linux-ng-sfdisk/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-sfdisk/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-sfdisk" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="system-tools" SHORT_DESC="The sfdisk utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-uuid-dev/receipt --- a/util-linux-ng-uuid-dev/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-uuid-dev/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-uuid-dev" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="development" SHORT_DESC="The uuid devel files from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng-uuid/receipt --- a/util-linux-ng-uuid/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng-uuid/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-uuid" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="base-system" SHORT_DESC="The uuid utility and library from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng/receipt --- a/util-linux-ng/receipt Sat Oct 02 16:11:32 2010 +0000 +++ b/util-linux-ng/receipt Sat Oct 02 16:34:03 2010 +0000 @@ -1,21 +1,26 @@ # SliTaz package receipt. PACKAGE="util-linux-ng" -VERSION="2.16.1" +VERSION="2.18" CATEGORY="meta" SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.bz2" DEPENDS="glibc-base" -BUILD_DEPENDS="slitaz-toolchain ncurses-dev e2fsprogs-dev" +BUILD_DEPENDS="slitaz-toolchain ncurses-dev e2fsprogs-dev zlib-dev" WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" -WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$TARBALL" +WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v${VERSION%*}/$TARBALL" LOCALE="" # Rules to configure and make the package. compile_rules() { cd $src + # fix findmnt + patch -p1 -i ../stuff/fix-findmnt.patch + # fix cfdisk partition changing, included in next upstream release + patch -p1 -i ../stuff/util-linux-ng-cfdisk.patch + if ! grep 'tty:x:4:' /etc/group; then addgroup -g 4 tty fi diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng/stuff/fix-findmnt.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-ng/stuff/fix-findmnt.patch Sat Oct 02 16:34:03 2010 +0000 @@ -0,0 +1,24 @@ +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 +Author: Petr Uzel +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 + +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; diff -r 250ea75bef27 -r cb53e0d30346 util-linux-ng/stuff/util-linux-ng-cfdisk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-ng/stuff/util-linux-ng-cfdisk.patch Sat Oct 02 16:34:03 2010 +0000 @@ -0,0 +1,57 @@ +From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 19 Jul 2010 22:52:58 +0200 +Subject: [PATCH] cfdisk: get_string not calculating correct limits + +Reported-by: James L. Hammons +Signed-off-by: Karel Zak +--- + fdisk/cfdisk.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c +index 7fa0b19..e7955fe 100644 +--- a/fdisk/cfdisk.c ++++ b/fdisk/cfdisk.c +@@ -421,6 +421,11 @@ fdexit(int ret) { + exit(ret); + } + ++/* ++ * Note that @len is size of @str buffer. ++ * ++ * Returns number of read bytes (without \0). ++ */ + static int + get_string(char *str, int len, char *def) { + size_t cells = 0, i = 0; +@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { + break; + default: + #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) +- if (i < len && iswprint(c)) { ++ if (i + 1 < len && iswprint(c)) { + wchar_t wc = (wchar_t) c; + char s[MB_CUR_MAX + 1]; + int sz = wctomb(s, wc); +@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { + putchar(BELL); + } + #else +- if (i < len && isprint(c)) { ++ if (i + 1 < len && isprint(c)) { + mvaddch(y, x + cells, c); + if (use_def) { + clrtoeol(); +@@ -2405,7 +2410,7 @@ change_id(int i) { + + sprintf(def, "%02X", new_id); + mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); +- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) ++ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) + return; + + if (len != GS_DEFAULT) { +-- +1.7.2.1 +