SliTaz Repositories

     1.1 --- a/util-linux-ng-blkid-dev/receipt	Sat Oct 02 16:11:32 2010 +0000
     1.2 +++ b/util-linux-ng-blkid-dev/receipt	Sat Oct 02 16:34:03 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="util-linux-ng-blkid-dev"
     1.7 -VERSION="2.16.1"
     1.8 +VERSION="2.18"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The blkid devel files from Util linux NG."
    1.11  MAINTAINER="pankso@slitaz.org"

     2.1 --- a/util-linux-ng-blkid/receipt	Sat Oct 02 16:11:32 2010 +0000
     2.2 +++ b/util-linux-ng-blkid/receipt	Sat Oct 02 16:34:03 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="util-linux-ng-blkid"
     2.7 -VERSION="2.16.1"
     2.8 +VERSION="2.18"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="The blkid utility and library from Util linux NG."
    2.11  MAINTAINER="pankso@slitaz.org"

     3.1 --- a/util-linux-ng-cfdisk/receipt	Sat Oct 02 16:11:32 2010 +0000
     3.2 +++ b/util-linux-ng-cfdisk/receipt	Sat Oct 02 16:34:03 2010 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="util-linux-ng-cfdisk"
     3.7 -VERSION="2.16.1"
     3.8 +VERSION="2.18"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="The cfdisk utility from Util linux NG."
    3.11  MAINTAINER="pankso@slitaz.org"

     4.1 --- a/util-linux-ng-getopt/receipt	Sat Oct 02 16:11:32 2010 +0000
     4.2 +++ b/util-linux-ng-getopt/receipt	Sat Oct 02 16:34:03 2010 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="util-linux-ng-getopt"
     4.7 -VERSION="2.16.1"
     4.8 +VERSION="2.18"
     4.9  CATEGORY="base-system"
    4.10  SHORT_DESC="The getopt utility from Util linux NG."
    4.11  MAINTAINER="pankso@slitaz.org"

     5.1 --- a/util-linux-ng-partx/receipt	Sat Oct 02 16:11:32 2010 +0000
     5.2 +++ b/util-linux-ng-partx/receipt	Sat Oct 02 16:34:03 2010 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="util-linux-ng-partx"
     5.7 -VERSION="2.16.1"
     5.8 +VERSION="2.18"
     5.9  CATEGORY="system-tools"
    5.10  SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)."
    5.11  MAINTAINER="pankso@slitaz.org"

     6.1 --- a/util-linux-ng-sfdisk/receipt	Sat Oct 02 16:11:32 2010 +0000
     6.2 +++ b/util-linux-ng-sfdisk/receipt	Sat Oct 02 16:34:03 2010 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="util-linux-ng-sfdisk"
     6.7 -VERSION="2.16.1"
     6.8 +VERSION="2.18"
     6.9  CATEGORY="system-tools"
    6.10  SHORT_DESC="The sfdisk utility from Util linux NG."
    6.11  MAINTAINER="pankso@slitaz.org"

     7.1 --- a/util-linux-ng-uuid-dev/receipt	Sat Oct 02 16:11:32 2010 +0000
     7.2 +++ b/util-linux-ng-uuid-dev/receipt	Sat Oct 02 16:34:03 2010 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="util-linux-ng-uuid-dev"
     7.7 -VERSION="2.16.1"
     7.8 +VERSION="2.18"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="The uuid devel files from Util linux NG."
    7.11  MAINTAINER="pankso@slitaz.org"

     8.1 --- a/util-linux-ng-uuid/receipt	Sat Oct 02 16:11:32 2010 +0000
     8.2 +++ b/util-linux-ng-uuid/receipt	Sat Oct 02 16:34:03 2010 +0000
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="util-linux-ng-uuid"
     8.7 -VERSION="2.16.1"
     8.8 +VERSION="2.18"
     8.9  CATEGORY="base-system"
    8.10  SHORT_DESC="The uuid utility and library from Util linux NG."
    8.11  MAINTAINER="pankso@slitaz.org"

     9.1 --- a/util-linux-ng/receipt	Sat Oct 02 16:11:32 2010 +0000
     9.2 +++ b/util-linux-ng/receipt	Sat Oct 02 16:34:03 2010 +0000
     9.3 @@ -1,21 +1,26 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="util-linux-ng"
     9.7 -VERSION="2.16.1"
     9.8 +VERSION="2.18"
     9.9  CATEGORY="meta"
    9.10  SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)."
    9.11  MAINTAINER="pankso@slitaz.org"
    9.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    9.13  DEPENDS="glibc-base"
    9.14 -BUILD_DEPENDS="slitaz-toolchain ncurses-dev e2fsprogs-dev"
    9.15 +BUILD_DEPENDS="slitaz-toolchain ncurses-dev e2fsprogs-dev zlib-dev"
    9.16  WEB_SITE="http://kernel.org/~kzak/util-linux-ng/"
    9.17 -WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$TARBALL"
    9.18 +WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v${VERSION%*}/$TARBALL"
    9.19  LOCALE=""
    9.20  
    9.21  # Rules to configure and make the package.
    9.22  compile_rules()
    9.23  {
    9.24  	cd $src
    9.25 +	# fix findmnt
    9.26 +	patch -p1 -i ../stuff/fix-findmnt.patch
    9.27 +	# fix cfdisk partition changing, included in next upstream release
    9.28 +	patch -p1 -i ../stuff/util-linux-ng-cfdisk.patch
    9.29 +
    9.30  	if ! grep 'tty:x:4:' /etc/group; then
    9.31  		addgroup -g 4 tty
    9.32  	fi

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/util-linux-ng/stuff/fix-findmnt.patch	Sat Oct 02 16:34:03 2010 +0000
    10.3 @@ -0,0 +1,24 @@
    10.4 +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
    10.5 +Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
    10.6 +Date:   Sun Jul 4 20:02:57 2010 +0200
    10.7 +
    10.8 +    libmount: fix merge_optstr (do not truncate 3 trailing characters)
    10.9 +    
   10.10 +    I believe this is the correct fix.
   10.11 +    
   10.12 +    Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
   10.13 +
   10.14 +diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
   10.15 +index 5dbcfa6..680e1fc 100644
   10.16 +--- a/shlibs/mount/src/tab_parse.c
   10.17 ++++ b/shlibs/mount/src/tab_parse.c
   10.18 +@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
   10.19 + 	if (!strcmp(vfs, fs))
   10.20 + 		return strdup(vfs);		/* e.g. "aaa" and "aaa" */
   10.21 + 
   10.22 +-	sz = strlen(vfs) + strlen(fs) + 2;
   10.23 ++	/* leave space for leading "r[ow],", "," and trailing zero */
   10.24 ++	sz = strlen(vfs) + strlen(fs) + 5;
   10.25 + 	res = malloc(sz);
   10.26 + 	if (!res)
   10.27 + 		return NULL;

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/util-linux-ng/stuff/util-linux-ng-cfdisk.patch	Sat Oct 02 16:34:03 2010 +0000
    11.3 @@ -0,0 +1,57 @@
    11.4 +From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001
    11.5 +From: Karel Zak <kzak@redhat.com>
    11.6 +Date: Mon, 19 Jul 2010 22:52:58 +0200
    11.7 +Subject: [PATCH] cfdisk: get_string not calculating correct limits
    11.8 +
    11.9 +Reported-by: James L. Hammons <jlhamm@acm.org>
   11.10 +Signed-off-by: Karel Zak <kzak@redhat.com>
   11.11 +---
   11.12 + fdisk/cfdisk.c |   11 ++++++++---
   11.13 + 1 files changed, 8 insertions(+), 3 deletions(-)
   11.14 +
   11.15 +diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
   11.16 +index 7fa0b19..e7955fe 100644
   11.17 +--- a/fdisk/cfdisk.c
   11.18 ++++ b/fdisk/cfdisk.c
   11.19 +@@ -421,6 +421,11 @@ fdexit(int ret) {
   11.20 +     exit(ret);
   11.21 + }
   11.22 + 
   11.23 ++/*
   11.24 ++ * Note that @len is size of @str buffer.
   11.25 ++ *
   11.26 ++ * Returns number of read bytes (without \0).
   11.27 ++ */
   11.28 + static int
   11.29 + get_string(char *str, int len, char *def) {
   11.30 +     size_t cells = 0, i = 0;
   11.31 +@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) {
   11.32 + 	    break;
   11.33 + 	default:
   11.34 + #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
   11.35 +-	    if (i < len && iswprint(c)) {
   11.36 ++	    if (i + 1 < len && iswprint(c)) {
   11.37 + 		wchar_t wc = (wchar_t) c;
   11.38 + 		char s[MB_CUR_MAX + 1];
   11.39 + 		int  sz = wctomb(s, wc);
   11.40 +@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) {
   11.41 + 			putchar(BELL);
   11.42 + 	    }
   11.43 + #else
   11.44 +-	    if (i < len && isprint(c)) {
   11.45 ++	    if (i + 1 < len && isprint(c)) {
   11.46 + 	        mvaddch(y, x + cells, c);
   11.47 + 		if (use_def) {
   11.48 + 		    clrtoeol();
   11.49 +@@ -2405,7 +2410,7 @@ change_id(int i) {
   11.50 + 
   11.51 +     sprintf(def, "%02X", new_id);
   11.52 +     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
   11.53 +-    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
   11.54 ++    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
   11.55 + 	return;
   11.56 + 
   11.57 +     if (len != GS_DEFAULT) {
   11.58 +-- 
   11.59 +1.7.2.1
   11.60 +