wok-current rev 12480
Up: util-linux (2.21.1) no longer util-linux-ng
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Apr 23 16:19:05 2012 +0200 (2012-04-23) |
parents | 80a234c03f35 |
children | 73641efed1cc |
files | util-linux-blkid-dev/receipt util-linux-blkid/receipt util-linux-blockdev/receipt util-linux-cfdisk/receipt util-linux-cfdisk/stuff/cfdisk.desktop util-linux-cramfs/receipt util-linux-flock/receipt util-linux-getopt/receipt util-linux-minix/receipt util-linux-mount/receipt util-linux-ng-blkid-dev/receipt util-linux-ng-blkid/receipt util-linux-ng-blockdev/receipt util-linux-ng-cfdisk/receipt util-linux-ng-cfdisk/stuff/cfdisk.desktop util-linux-ng-cramfs/receipt util-linux-ng-flock/receipt util-linux-ng-getopt/receipt util-linux-ng-minix/receipt util-linux-ng-partx/receipt util-linux-ng-setterm/receipt util-linux-ng-sfdisk/receipt util-linux-ng-uuid-dev/receipt util-linux-ng-uuid/receipt util-linux-ng/receipt util-linux-ng/stuff/fix-findmnt.patch util-linux-ng/stuff/util-linux-ng-cfdisk.patch util-linux-partx/receipt util-linux-setterm/receipt util-linux-sfdisk/receipt util-linux-uuid-dev/receipt util-linux-uuid/receipt util-linux/receipt util-linux/stuff/fix-findmnt.patch util-linux/stuff/util-linux-ng-cfdisk.patch |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/util-linux-blkid-dev/receipt Mon Apr 23 16:19:05 2012 +0200 1.3 @@ -0,0 +1,18 @@ 1.4 +# SliTaz package receipt. 1.5 + 1.6 +PACKAGE="util-linux-blkid-dev" 1.7 +VERSION="2.21.1" 1.8 +CATEGORY="development" 1.9 +SHORT_DESC="The blkid devel files from Util linux NG." 1.10 +MAINTAINER="pankso@slitaz.org" 1.11 +WANTED="util-linux" 1.12 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 1.13 + 1.14 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.15 +genpkg_rules() 1.16 +{ 1.17 + mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 1.18 + cp -a $_pkg/usr/lib/libblkid.*a $fs/usr/lib 1.19 + cp -a $_pkg/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig 1.20 + cp -a $_pkg/usr/include/blkid $fs/usr/include 1.21 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/util-linux-blkid/receipt Mon Apr 23 16:19:05 2012 +0200 2.3 @@ -0,0 +1,31 @@ 2.4 +# SliTaz package receipt. 2.5 + 2.6 +PACKAGE="util-linux-blkid" 2.7 +VERSION="2.21.1" 2.8 +CATEGORY="base-system" 2.9 +SHORT_DESC="The blkid utility and library from Util linux NG." 2.10 +MAINTAINER="pankso@slitaz.org" 2.11 +DEPENDS="glibc-base util-linux-uuid" 2.12 +WANTED="util-linux" 2.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 2.14 + 2.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 2.16 +genpkg_rules() 2.17 +{ 2.18 + mkdir -p $fs/lib $fs/sbin $fs/bin $fs/usr/lib 2.19 + cp -a $install/sbin/blkid $fs/sbin 2.20 + cp -a $install/bin/lsblk $fs/bin 2.21 + cp -a $install/lib/libblkid.so* $fs/lib 2.22 + cp -a $install/usr/lib/libblkid.so* $fs/usr/lib 2.23 +} 2.24 + 2.25 +# Overlap busybox 2.26 +pre_install() 2.27 +{ 2.28 + rm -f $1/sbin/blkid 2.29 +} 2.30 + 2.31 +post_remove() 2.32 +{ 2.33 + ln -s /bin/busybox /sbin/blkid 2.34 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/util-linux-blockdev/receipt Mon Apr 23 16:19:05 2012 +0200 3.3 @@ -0,0 +1,28 @@ 3.4 +# SliTaz package receipt. 3.5 + 3.6 +PACKAGE="util-linux-blockdev" 3.7 +VERSION="2.21.1" 3.8 +CATEGORY="base-system" 3.9 +SHORT_DESC="The blockdev utility from Util linux NG." 3.10 +MAINTAINER="devel@slitaz.org" 3.11 +DEPENDS="glibc-base" 3.12 +WANTED="util-linux" 3.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 3.14 + 3.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 3.16 +genpkg_rules() 3.17 +{ 3.18 + mkdir -p $fs/sbin 3.19 + cp -a $_pkg/sbin/blockdev $fs/sbin 3.20 +} 3.21 + 3.22 +# Overlap busybox 3.23 +pre_install() 3.24 +{ 3.25 + rm -f $1/sbin/blockdev 3.26 +} 3.27 + 3.28 +post_remove() 3.29 +{ 3.30 + ln -s /bin/busybox /sbin/blockdev 3.31 +}
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/util-linux-cfdisk/receipt Mon Apr 23 16:19:05 2012 +0200 4.3 @@ -0,0 +1,18 @@ 4.4 +# SliTaz package receipt. 4.5 + 4.6 +PACKAGE="util-linux-cfdisk" 4.7 +VERSION="2.21.1" 4.8 +CATEGORY="system-tools" 4.9 +SHORT_DESC="The cfdisk utility from Util linux NG." 4.10 +MAINTAINER="pankso@slitaz.org" 4.11 +DEPENDS="glibc-base ncurses" 4.12 +WANTED="util-linux" 4.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 4.14 + 4.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 4.16 +genpkg_rules() 4.17 +{ 4.18 + mkdir -p $fs/sbin $fs/usr/share/applications 4.19 + cp -a $_pkg/sbin/cfdisk $fs/sbin 4.20 + cp stuff/cfdisk.desktop $fs/usr/share/applications 4.21 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/util-linux-cfdisk/stuff/cfdisk.desktop Mon Apr 23 16:19:05 2012 +0200 5.3 @@ -0,0 +1,15 @@ 5.4 +[Desktop Entry] 5.5 +Encoding=UTF-8 5.6 +Name=Cfdisk Partition Editor 5.7 +Name[es]=Editor de particiones Cfdisk 5.8 +Name[fi]=Cfdisk levyosioiden muokkain 5.9 +Name[fr]=Editeur de partition Cfdisk 5.10 +Name[hu]=Cfdisk partÃciószerkesztÅ 5.11 +Name[it]=Editor di partizioni Cfdisk 5.12 +Name[pt]=CFdisk Editor de Partições 5.13 +Name[zh_CN]=Cfdisk分区编辑工具 5.14 +Exec=subox xterm -e cfdisk 5.15 +Icon=drive-harddisk 5.16 +Terminal=false 5.17 +Type=Application 5.18 +Categories=Application;System;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/util-linux-cramfs/receipt Mon Apr 23 16:19:05 2012 +0200 6.3 @@ -0,0 +1,17 @@ 6.4 +# SliTaz package receipt. 6.5 + 6.6 +PACKAGE="util-linux-cramfs" 6.7 +VERSION="2.21.1" 6.8 +CATEGORY="system-tools" 6.9 +SHORT_DESC="The cramfs utilities from Util linux NG." 6.10 +MAINTAINER="pankso@slitaz.org" 6.11 +DEPENDS="zlib" 6.12 +WANTED="util-linux" 6.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 6.14 + 6.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 6.16 +genpkg_rules() 6.17 +{ 6.18 + mkdir -p $fs/sbin 6.19 + cp -a $_pkg/sbin/*cramfs $fs/sbin 6.20 +}
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/util-linux-flock/receipt Mon Apr 23 16:19:05 2012 +0200 7.3 @@ -0,0 +1,28 @@ 7.4 +# SliTaz package receipt. 7.5 + 7.6 +PACKAGE="util-linux-flock" 7.7 +VERSION="2.21.1" 7.8 +CATEGORY="base-system" 7.9 +SHORT_DESC="The flock utility from Util linux NG." 7.10 +MAINTAINER="liupeng <hipeng@yahoo.com>" 7.11 +DEPENDS="glibc-base" 7.12 +WANTED="util-linux" 7.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 7.14 + 7.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 7.16 +genpkg_rules() 7.17 +{ 7.18 + mkdir -p $fs/usr/bin 7.19 + cp -a $_pkg/usr/bin/flock $fs/usr/bin 7.20 +} 7.21 + 7.22 +# Overlap busybox 7.23 +pre_install() 7.24 +{ 7.25 + rm -f $1/usr/bin/blkid 7.26 +} 7.27 + 7.28 +post_remove() 7.29 +{ 7.30 + ln -s /bin/busybox /usr/bin/blkid 7.31 +}
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/util-linux-getopt/receipt Mon Apr 23 16:19:05 2012 +0200 8.3 @@ -0,0 +1,18 @@ 8.4 +# SliTaz package receipt. 8.5 + 8.6 +PACKAGE="util-linux-getopt" 8.7 +VERSION="2.21.1" 8.8 +CATEGORY="base-system" 8.9 +SHORT_DESC="The getopt utility from Util linux NG." 8.10 +MAINTAINER="pankso@slitaz.org" 8.11 +DEPENDS="glibc-base" 8.12 +WANTED="util-linux" 8.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 8.14 + 8.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 8.16 +genpkg_rules() 8.17 +{ 8.18 + mkdir -p $fs/usr/bin $fs/usr/share 8.19 + cp -a $install/usr/bin/getopt $fs/usr/bin 8.20 + cp -a $install/usr/share/getopt $fs/usr/share 8.21 +}
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/util-linux-minix/receipt Mon Apr 23 16:19:05 2012 +0200 9.3 @@ -0,0 +1,16 @@ 9.4 +# SliTaz package receipt. 9.5 + 9.6 +PACKAGE="util-linux-minix" 9.7 +VERSION="2.21.1" 9.8 +CATEGORY="system-tools" 9.9 +SHORT_DESC="The minix utilities from Util linux NG." 9.10 +MAINTAINER="pankso@slitaz.org" 9.11 +WANTED="util-linux" 9.12 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 9.13 + 9.14 +# Rules to gen a SliTaz package suitable for Tazpkg. 9.15 +genpkg_rules() 9.16 +{ 9.17 + mkdir -p $fs/sbin 9.18 + cp -a $_pkg/sbin/*minix $fs/sbin 9.19 +}
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/util-linux-mount/receipt Mon Apr 23 16:19:05 2012 +0200 10.3 @@ -0,0 +1,19 @@ 10.4 +# SliTaz package receipt. 10.5 + 10.6 +PACKAGE="util-linux-mount" 10.7 +VERSION="2.21.1" 10.8 +CATEGORY="base-system" 10.9 +SHORT_DESC="The mount utilities and libmount library from Util linux." 10.10 +MAINTAINER="pankso@slitaz.org" 10.11 +DEPENDS="glibc-base" 10.12 +WANTED="util-linux" 10.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 10.14 + 10.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 10.16 +genpkg_rules() 10.17 +{ 10.18 + mkdir -p $fs/lib $fs/bin 10.19 + cp -a $install/bin/findmnt $fs/bin 10.20 + cp -a $install/bin/*mount* $fs/bin 10.21 + cp -a $install/lib/libmount.so* $fs/lib 10.22 +}
11.1 --- a/util-linux-ng-blkid-dev/receipt Mon Apr 23 16:15:50 2012 +0200 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,18 +0,0 @@ 11.4 -# SliTaz package receipt. 11.5 - 11.6 -PACKAGE="util-linux-ng-blkid-dev" 11.7 -VERSION="2.19.1" 11.8 -CATEGORY="development" 11.9 -SHORT_DESC="The blkid devel files from Util linux NG." 11.10 -MAINTAINER="pankso@slitaz.org" 11.11 -WANTED="util-linux-ng" 11.12 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 11.13 - 11.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.15 -genpkg_rules() 11.16 -{ 11.17 - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 11.18 - cp -a $_pkg/usr/lib/libblkid.*a $fs/usr/lib 11.19 - cp -a $_pkg/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig 11.20 - cp -a $_pkg/usr/include/blkid $fs/usr/include 11.21 -}
12.1 --- a/util-linux-ng-blkid/receipt Mon Apr 23 16:15:50 2012 +0200 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,30 +0,0 @@ 12.4 -# SliTaz package receipt. 12.5 - 12.6 -PACKAGE="util-linux-ng-blkid" 12.7 -VERSION="2.19.1" 12.8 -CATEGORY="base-system" 12.9 -SHORT_DESC="The blkid utility and library from Util linux NG." 12.10 -MAINTAINER="pankso@slitaz.org" 12.11 -DEPENDS="glibc-base util-linux-ng-uuid" 12.12 -WANTED="util-linux-ng" 12.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 12.14 - 12.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.16 -genpkg_rules() 12.17 -{ 12.18 - mkdir -p $fs/lib $fs/sbin $fs/usr/lib 12.19 - cp -a $_pkg/sbin/blkid $fs/sbin 12.20 - cp -a $_pkg/lib/libblkid.so* $fs/lib 12.21 - cp -a $_pkg/usr/lib/libblkid.so* $fs/usr/lib 12.22 -} 12.23 - 12.24 -# Overlap busybox 12.25 -pre_install() 12.26 -{ 12.27 - rm -f $1/sbin/blkid 12.28 -} 12.29 - 12.30 -post_remove() 12.31 -{ 12.32 - ln -s /bin/busybox /sbin/blkid 12.33 -}
13.1 --- a/util-linux-ng-blockdev/receipt Mon Apr 23 16:15:50 2012 +0200 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,28 +0,0 @@ 13.4 -# SliTaz package receipt. 13.5 - 13.6 -PACKAGE="util-linux-ng-blockdev" 13.7 -VERSION="2.19.1" 13.8 -CATEGORY="base-system" 13.9 -SHORT_DESC="The blockdev utility from Util linux NG." 13.10 -MAINTAINER="devel@slitaz.org" 13.11 -DEPENDS="glibc-base" 13.12 -WANTED="util-linux-ng" 13.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 13.14 - 13.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.16 -genpkg_rules() 13.17 -{ 13.18 - mkdir -p $fs/sbin 13.19 - cp -a $_pkg/sbin/blockdev $fs/sbin 13.20 -} 13.21 - 13.22 -# Overlap busybox 13.23 -pre_install() 13.24 -{ 13.25 - rm -f $1/sbin/blockdev 13.26 -} 13.27 - 13.28 -post_remove() 13.29 -{ 13.30 - ln -s /bin/busybox /sbin/blockdev 13.31 -}
14.1 --- a/util-linux-ng-cfdisk/receipt Mon Apr 23 16:15:50 2012 +0200 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,18 +0,0 @@ 14.4 -# SliTaz package receipt. 14.5 - 14.6 -PACKAGE="util-linux-ng-cfdisk" 14.7 -VERSION="2.19.1" 14.8 -CATEGORY="system-tools" 14.9 -SHORT_DESC="The cfdisk utility from Util linux NG." 14.10 -MAINTAINER="pankso@slitaz.org" 14.11 -DEPENDS="glibc-base ncurses" 14.12 -WANTED="util-linux-ng" 14.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 14.14 - 14.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.16 -genpkg_rules() 14.17 -{ 14.18 - mkdir -p $fs/sbin $fs/usr/share/applications 14.19 - cp -a $_pkg/sbin/cfdisk $fs/sbin 14.20 - cp stuff/cfdisk.desktop $fs/usr/share/applications 14.21 -}
15.1 --- a/util-linux-ng-cfdisk/stuff/cfdisk.desktop Mon Apr 23 16:15:50 2012 +0200 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,15 +0,0 @@ 15.4 -[Desktop Entry] 15.5 -Encoding=UTF-8 15.6 -Name=Cfdisk Partition Editor 15.7 -Name[es]=Editor de particiones Cfdisk 15.8 -Name[fi]=Cfdisk levyosioiden muokkain 15.9 -Name[fr]=Editeur de partition Cfdisk 15.10 -Name[hu]=Cfdisk partÃciószerkesztÅ 15.11 -Name[it]=Editor di partizioni Cfdisk 15.12 -Name[pt]=CFdisk Editor de Partições 15.13 -Name[zh_CN]=Cfdisk分区编辑工具 15.14 -Exec=subox xterm -e cfdisk 15.15 -Icon=drive-harddisk 15.16 -Terminal=false 15.17 -Type=Application 15.18 -Categories=Application;System;
16.1 --- a/util-linux-ng-cramfs/receipt Mon Apr 23 16:15:50 2012 +0200 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,17 +0,0 @@ 16.4 -# SliTaz package receipt. 16.5 - 16.6 -PACKAGE="util-linux-ng-cramfs" 16.7 -VERSION="2.19.1" 16.8 -CATEGORY="system-tools" 16.9 -SHORT_DESC="The cramfs utilities from Util linux NG." 16.10 -MAINTAINER="pankso@slitaz.org" 16.11 -DEPENDS="zlib" 16.12 -WANTED="util-linux-ng" 16.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 16.14 - 16.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 16.16 -genpkg_rules() 16.17 -{ 16.18 - mkdir -p $fs/sbin 16.19 - cp -a $_pkg/sbin/*cramfs $fs/sbin 16.20 -}
17.1 --- a/util-linux-ng-flock/receipt Mon Apr 23 16:15:50 2012 +0200 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,28 +0,0 @@ 17.4 -# SliTaz package receipt. 17.5 - 17.6 -PACKAGE="util-linux-ng-flock" 17.7 -VERSION="2.19.1" 17.8 -CATEGORY="base-system" 17.9 -SHORT_DESC="The flock utility from Util linux NG." 17.10 -MAINTAINER="liupeng <hipeng@yahoo.com>" 17.11 -DEPENDS="glibc-base" 17.12 -WANTED="util-linux-ng" 17.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 17.14 - 17.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 17.16 -genpkg_rules() 17.17 -{ 17.18 - mkdir -p $fs/usr/bin 17.19 - cp -a $_pkg/usr/bin/flock $fs/usr/bin 17.20 -} 17.21 - 17.22 -# Overlap busybox 17.23 -pre_install() 17.24 -{ 17.25 - rm -f $1/usr/bin/blkid 17.26 -} 17.27 - 17.28 -post_remove() 17.29 -{ 17.30 - ln -s /bin/busybox /usr/bin/blkid 17.31 -}
18.1 --- a/util-linux-ng-getopt/receipt Mon Apr 23 16:15:50 2012 +0200 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,17 +0,0 @@ 18.4 -# SliTaz package receipt. 18.5 - 18.6 -PACKAGE="util-linux-ng-getopt" 18.7 -VERSION="2.19.1" 18.8 -CATEGORY="base-system" 18.9 -SHORT_DESC="The getopt utility from Util linux NG." 18.10 -MAINTAINER="pankso@slitaz.org" 18.11 -DEPENDS="glibc-base" 18.12 -WANTED="util-linux-ng" 18.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 18.14 - 18.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 18.16 -genpkg_rules() 18.17 -{ 18.18 - mkdir -p $fs/usr/bin 18.19 - cp -a $_pkg/usr/bin/getopt $fs/usr/bin 18.20 -}
19.1 --- a/util-linux-ng-minix/receipt Mon Apr 23 16:15:50 2012 +0200 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,16 +0,0 @@ 19.4 -# SliTaz package receipt. 19.5 - 19.6 -PACKAGE="util-linux-ng-minix" 19.7 -VERSION="2.19.1" 19.8 -CATEGORY="system-tools" 19.9 -SHORT_DESC="The minix utilities from Util linux NG." 19.10 -MAINTAINER="pankso@slitaz.org" 19.11 -WANTED="util-linux-ng" 19.12 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 19.13 - 19.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 19.15 -genpkg_rules() 19.16 -{ 19.17 - mkdir -p $fs/sbin 19.18 - cp -a $_pkg/sbin/*minix $fs/sbin 19.19 -}
20.1 --- a/util-linux-ng-partx/receipt Mon Apr 23 16:15:50 2012 +0200 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,19 +0,0 @@ 20.4 -# SliTaz package receipt. 20.5 - 20.6 -PACKAGE="util-linux-ng-partx" 20.7 -VERSION="2.19.1" 20.8 -CATEGORY="system-tools" 20.9 -SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." 20.10 -MAINTAINER="pankso@slitaz.org" 20.11 -DEPENDS="glibc-base" 20.12 -WANTED="util-linux-ng" 20.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 20.14 - 20.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 20.16 -genpkg_rules() 20.17 -{ 20.18 - mkdir -p $fs/usr/sbin 20.19 - for i in addpart delpart partx; do 20.20 - cp -a $_pkg/usr/sbin/$i $fs/usr/sbin 20.21 - done 20.22 -}
21.1 --- a/util-linux-ng-setterm/receipt Mon Apr 23 16:15:50 2012 +0200 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,18 +0,0 @@ 21.4 -# SliTaz package receipt 21.5 - 21.6 -PACKAGE="util-linux-ng-setterm" 21.7 -VERSION="2.19.1" 21.8 -CATEGORY="base-system" 21.9 -SHORT_DESC="The setterm utility from Util linux NG." 21.10 -MAINTAINER="devel@slitaz.org" 21.11 -DEPENDS="glibc-base" 21.12 -WANTED="util-linux-ng" 21.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 21.14 - 21.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 21.16 -genpkg_rules() 21.17 -{ 21.18 - mkdir -p $fs/usr/bin 21.19 - cp -a $_pkg/usr/bin/setterm $fs/usr/bin 21.20 -} 21.21 -
22.1 --- a/util-linux-ng-sfdisk/receipt Mon Apr 23 16:15:50 2012 +0200 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,17 +0,0 @@ 22.4 -# SliTaz package receipt. 22.5 - 22.6 -PACKAGE="util-linux-ng-sfdisk" 22.7 -VERSION="2.19.1" 22.8 -CATEGORY="system-tools" 22.9 -SHORT_DESC="The sfdisk utility from Util linux NG." 22.10 -MAINTAINER="pankso@slitaz.org" 22.11 -DEPENDS="glibc-base ncurses" 22.12 -WANTED="util-linux-ng" 22.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 22.14 - 22.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 22.16 -genpkg_rules() 22.17 -{ 22.18 - mkdir -p $fs/sbin 22.19 - cp -a $_pkg/sbin/sfdisk $fs/sbin 22.20 -}
23.1 --- a/util-linux-ng-uuid-dev/receipt Mon Apr 23 16:15:50 2012 +0200 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,18 +0,0 @@ 23.4 -# SliTaz package receipt. 23.5 - 23.6 -PACKAGE="util-linux-ng-uuid-dev" 23.7 -VERSION="2.19.1" 23.8 -CATEGORY="development" 23.9 -SHORT_DESC="The uuid devel files from Util linux NG." 23.10 -MAINTAINER="pankso@slitaz.org" 23.11 -WANTED="util-linux-ng" 23.12 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 23.13 - 23.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 23.15 -genpkg_rules() 23.16 -{ 23.17 - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 23.18 - cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib 23.19 - cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig 23.20 - cp -a $_pkg/usr/include/uuid $fs/usr/include 23.21 -}
24.1 --- a/util-linux-ng-uuid/receipt Mon Apr 23 16:15:50 2012 +0200 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,29 +0,0 @@ 24.4 -# SliTaz package receipt. 24.5 - 24.6 -PACKAGE="util-linux-ng-uuid" 24.7 -VERSION="2.19.1" 24.8 -CATEGORY="base-system" 24.9 -SHORT_DESC="The uuid utility and library from Util linux NG." 24.10 -MAINTAINER="pankso@slitaz.org" 24.11 -DEPENDS="glibc-base" 24.12 -WANTED="util-linux-ng" 24.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 24.14 - 24.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 24.16 -genpkg_rules() 24.17 -{ 24.18 - mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin 24.19 - cp -a $_pkg/usr/sbin/uuidd $fs/usr/sbin 24.20 - cp -a $_pkg/usr/bin/uuidgen $fs/usr/bin 24.21 - cp -a $_pkg/lib/libuuid.so* $fs/lib 24.22 - cd $fs/usr/lib 24.23 - ln -s /lib/libuuid.so.1.3.0 libuuid.so 24.24 - #cp -a $_pkg/usr/lib/libuuid.so* $fs/usr/lib 24.25 -} 24.26 - 24.27 -post_install() 24.28 -{ 24.29 - # Remove old libuuid from e2fsprogs package 24.30 - rm $1/lib/libuuid.so.1.2 2>/dev/null 24.31 - rm -rf $1/var/lib/tazpkg/installed/libuuid 2>/dev/null 24.32 -}
25.1 --- a/util-linux-ng/receipt Mon Apr 23 16:15:50 2012 +0200 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,46 +0,0 @@ 25.4 -# SliTaz package receipt. 25.5 - 25.6 -PACKAGE="util-linux-ng" 25.7 -VERSION="2.19.1" 25.8 -CATEGORY="meta" 25.9 -SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." 25.10 -MAINTAINER="pankso@slitaz.org" 25.11 -SOURCE="util-linux" 25.12 -TARBALL="$SOURCE-$VERSION.tar.bz2" 25.13 -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" 25.14 -WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.19/$TARBALL" 25.15 -COOK_OPT="!fs" 25.16 -LOCALE="" 25.17 - 25.18 -DEPENDS="" 25.19 -BUILD_DEPENDS="ncurses-dev zlib-dev" 25.20 - 25.21 -# Rules to configure and make the package. 25.22 -compile_rules() 25.23 -{ 25.24 - cd $src 25.25 - # fix findmnt 25.26 - patch -p1 -i $stuff/fix-findmnt.patch 25.27 - # fix cfdisk partition changing, included in next upstream release 25.28 - patch -p1 -i $stuff/util-linux-ng-cfdisk.patch 25.29 - 25.30 - if ! grep 'tty:x:4:' /etc/group; then 25.31 - addgroup -g 4 tty 25.32 - fi 25.33 - grep -qs 'define u8' fdisk/fdisksunlabel.c || 25.34 - sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' fdisk/fdisksunlabel.c 25.35 - ./configure \ 25.36 - --prefix=/usr \ 25.37 - --sysconfdir=/etc \ 25.38 - --with-fsprobe=builtin \ 25.39 - --enable-partx \ 25.40 - $CONFIGURE_ARGS && 25.41 - make && 25.42 - make install 25.43 -} 25.44 - 25.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 25.46 -genpkg_rules() 25.47 -{ 25.48 - mkdir -p $fs/usr/bin 25.49 -}
26.1 --- a/util-linux-ng/stuff/fix-findmnt.patch Mon Apr 23 16:15:50 2012 +0200 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,24 +0,0 @@ 26.4 -commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 26.5 -Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 26.6 -Date: Sun Jul 4 20:02:57 2010 +0200 26.7 - 26.8 - libmount: fix merge_optstr (do not truncate 3 trailing characters) 26.9 - 26.10 - I believe this is the correct fix. 26.11 - 26.12 - Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 26.13 - 26.14 -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c 26.15 -index 5dbcfa6..680e1fc 100644 26.16 ---- a/shlibs/mount/src/tab_parse.c 26.17 -+++ b/shlibs/mount/src/tab_parse.c 26.18 -@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) 26.19 - if (!strcmp(vfs, fs)) 26.20 - return strdup(vfs); /* e.g. "aaa" and "aaa" */ 26.21 - 26.22 -- sz = strlen(vfs) + strlen(fs) + 2; 26.23 -+ /* leave space for leading "r[ow],", "," and trailing zero */ 26.24 -+ sz = strlen(vfs) + strlen(fs) + 5; 26.25 - res = malloc(sz); 26.26 - if (!res) 26.27 - return NULL;
27.1 --- a/util-linux-ng/stuff/util-linux-ng-cfdisk.patch Mon Apr 23 16:15:50 2012 +0200 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,57 +0,0 @@ 27.4 -From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 27.5 -From: Karel Zak <kzak@redhat.com> 27.6 -Date: Mon, 19 Jul 2010 22:52:58 +0200 27.7 -Subject: [PATCH] cfdisk: get_string not calculating correct limits 27.8 - 27.9 -Reported-by: James L. Hammons <jlhamm@acm.org> 27.10 -Signed-off-by: Karel Zak <kzak@redhat.com> 27.11 ---- 27.12 - fdisk/cfdisk.c | 11 ++++++++--- 27.13 - 1 files changed, 8 insertions(+), 3 deletions(-) 27.14 - 27.15 -diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c 27.16 -index 7fa0b19..e7955fe 100644 27.17 ---- a/fdisk/cfdisk.c 27.18 -+++ b/fdisk/cfdisk.c 27.19 -@@ -421,6 +421,11 @@ fdexit(int ret) { 27.20 - exit(ret); 27.21 - } 27.22 - 27.23 -+/* 27.24 -+ * Note that @len is size of @str buffer. 27.25 -+ * 27.26 -+ * Returns number of read bytes (without \0). 27.27 -+ */ 27.28 - static int 27.29 - get_string(char *str, int len, char *def) { 27.30 - size_t cells = 0, i = 0; 27.31 -@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { 27.32 - break; 27.33 - default: 27.34 - #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) 27.35 -- if (i < len && iswprint(c)) { 27.36 -+ if (i + 1 < len && iswprint(c)) { 27.37 - wchar_t wc = (wchar_t) c; 27.38 - char s[MB_CUR_MAX + 1]; 27.39 - int sz = wctomb(s, wc); 27.40 -@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { 27.41 - putchar(BELL); 27.42 - } 27.43 - #else 27.44 -- if (i < len && isprint(c)) { 27.45 -+ if (i + 1 < len && isprint(c)) { 27.46 - mvaddch(y, x + cells, c); 27.47 - if (use_def) { 27.48 - clrtoeol(); 27.49 -@@ -2405,7 +2410,7 @@ change_id(int i) { 27.50 - 27.51 - sprintf(def, "%02X", new_id); 27.52 - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); 27.53 -- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) 27.54 -+ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) 27.55 - return; 27.56 - 27.57 - if (len != GS_DEFAULT) { 27.58 --- 27.59 -1.7.2.1 27.60 -
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/util-linux-partx/receipt Mon Apr 23 16:19:05 2012 +0200 28.3 @@ -0,0 +1,19 @@ 28.4 +# SliTaz package receipt. 28.5 + 28.6 +PACKAGE="util-linux-partx" 28.7 +VERSION="2.21.1" 28.8 +CATEGORY="system-tools" 28.9 +SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." 28.10 +MAINTAINER="pankso@slitaz.org" 28.11 +DEPENDS="glibc-base" 28.12 +WANTED="util-linux" 28.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 28.14 + 28.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 28.16 +genpkg_rules() 28.17 +{ 28.18 + mkdir -p $fs/usr/sbin 28.19 + for i in addpart delpart partx; do 28.20 + cp -a $_pkg/usr/sbin/$i $fs/usr/sbin 28.21 + done 28.22 +}
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/util-linux-setterm/receipt Mon Apr 23 16:19:05 2012 +0200 29.3 @@ -0,0 +1,18 @@ 29.4 +# SliTaz package receipt 29.5 + 29.6 +PACKAGE="util-linux-setterm" 29.7 +VERSION="2.21.1" 29.8 +CATEGORY="base-system" 29.9 +SHORT_DESC="The setterm utility from Util linux NG." 29.10 +MAINTAINER="devel@slitaz.org" 29.11 +DEPENDS="glibc-base" 29.12 +WANTED="util-linux" 29.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 29.14 + 29.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 29.16 +genpkg_rules() 29.17 +{ 29.18 + mkdir -p $fs/usr/bin 29.19 + cp -a $_pkg/usr/bin/setterm $fs/usr/bin 29.20 +} 29.21 +
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/util-linux-sfdisk/receipt Mon Apr 23 16:19:05 2012 +0200 30.3 @@ -0,0 +1,17 @@ 30.4 +# SliTaz package receipt. 30.5 + 30.6 +PACKAGE="util-linux-sfdisk" 30.7 +VERSION="2.21.1" 30.8 +CATEGORY="system-tools" 30.9 +SHORT_DESC="The sfdisk utility from Util linux NG." 30.10 +MAINTAINER="pankso@slitaz.org" 30.11 +DEPENDS="glibc-base ncurses" 30.12 +WANTED="util-linux" 30.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 30.14 + 30.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 30.16 +genpkg_rules() 30.17 +{ 30.18 + mkdir -p $fs/sbin 30.19 + cp -a $_pkg/sbin/sfdisk $fs/sbin 30.20 +}
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/util-linux-uuid-dev/receipt Mon Apr 23 16:19:05 2012 +0200 31.3 @@ -0,0 +1,18 @@ 31.4 +# SliTaz package receipt. 31.5 + 31.6 +PACKAGE="util-linux-uuid-dev" 31.7 +VERSION="2.21.1" 31.8 +CATEGORY="development" 31.9 +SHORT_DESC="The uuid devel files from Util linux NG." 31.10 +MAINTAINER="pankso@slitaz.org" 31.11 +WANTED="util-linux" 31.12 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 31.13 + 31.14 +# Rules to gen a SliTaz package suitable for Tazpkg. 31.15 +genpkg_rules() 31.16 +{ 31.17 + mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 31.18 + cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib 31.19 + cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig 31.20 + cp -a $_pkg/usr/include/uuid $fs/usr/include 31.21 +}
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/util-linux-uuid/receipt Mon Apr 23 16:19:05 2012 +0200 32.3 @@ -0,0 +1,29 @@ 32.4 +# SliTaz package receipt. 32.5 + 32.6 +PACKAGE="util-linux-uuid" 32.7 +VERSION="2.21.1" 32.8 +CATEGORY="base-system" 32.9 +SHORT_DESC="The uuid utility and library from Util linux NG." 32.10 +MAINTAINER="pankso@slitaz.org" 32.11 +DEPENDS="glibc-base" 32.12 +WANTED="util-linux" 32.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 32.14 + 32.15 +# Rules to gen a SliTaz package suitable for Tazpkg. 32.16 +genpkg_rules() 32.17 +{ 32.18 + mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin 32.19 + cp -a $_pkg/usr/sbin/uuidd $fs/usr/sbin 32.20 + cp -a $_pkg/usr/bin/uuidgen $fs/usr/bin 32.21 + cp -a $_pkg/lib/libuuid.so* $fs/lib 32.22 + cd $fs/usr/lib 32.23 + ln -s /lib/libuuid.so.1.3.0 libuuid.so 32.24 + #cp -a $_pkg/usr/lib/libuuid.so* $fs/usr/lib 32.25 +} 32.26 + 32.27 +post_install() 32.28 +{ 32.29 + # Remove old libuuid from e2fsprogs package 32.30 + rm $1/lib/libuuid.so.1.2 2>/dev/null 32.31 + rm -rf $1/var/lib/tazpkg/installed/libuuid 2>/dev/null 32.32 +}
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/util-linux/receipt Mon Apr 23 16:19:05 2012 +0200 33.3 @@ -0,0 +1,35 @@ 33.4 +# SliTaz package receipt. 33.5 + 33.6 +PACKAGE="util-linux" 33.7 +VERSION="2.21.1" 33.8 +CATEGORY="meta" 33.9 +SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." 33.10 +MAINTAINER="pankso@slitaz.org" 33.11 +SOURCE="util-linux" 33.12 +TARBALL="$SOURCE-$VERSION.tar.xz" 33.13 +WEB_SITE="http://kernel.org/~kzak/util-linux/" 33.14 +WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/$TARBALL" 33.15 +COOK_OPT="!fs" 33.16 +LOCALE="" 33.17 + 33.18 +DEPENDS="" 33.19 +BUILD_DEPENDS="ncurses-dev zlib-dev" 33.20 + 33.21 +# Rules to configure and make the package. 33.22 +compile_rules() 33.23 +{ 33.24 + cd $src 33.25 + ./configure \ 33.26 + --prefix=/usr \ 33.27 + --sysconfdir=/etc \ 33.28 + --with-fsprobe=builtin \ 33.29 + --enable-partx \ 33.30 + $CONFIGURE_ARGS && 33.31 + make && make install 33.32 +} 33.33 + 33.34 +# Rules to gen a SliTaz package suitable for Tazpkg. 33.35 +genpkg_rules() 33.36 +{ 33.37 + mkdir -p $fs/usr/bin 33.38 +}
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/util-linux/stuff/fix-findmnt.patch Mon Apr 23 16:19:05 2012 +0200 34.3 @@ -0,0 +1,24 @@ 34.4 +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 34.5 +Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 34.6 +Date: Sun Jul 4 20:02:57 2010 +0200 34.7 + 34.8 + libmount: fix merge_optstr (do not truncate 3 trailing characters) 34.9 + 34.10 + I believe this is the correct fix. 34.11 + 34.12 + Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 34.13 + 34.14 +diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c 34.15 +index 5dbcfa6..680e1fc 100644 34.16 +--- a/shlibs/mount/src/tab_parse.c 34.17 ++++ b/shlibs/mount/src/tab_parse.c 34.18 +@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) 34.19 + if (!strcmp(vfs, fs)) 34.20 + return strdup(vfs); /* e.g. "aaa" and "aaa" */ 34.21 + 34.22 +- sz = strlen(vfs) + strlen(fs) + 2; 34.23 ++ /* leave space for leading "r[ow],", "," and trailing zero */ 34.24 ++ sz = strlen(vfs) + strlen(fs) + 5; 34.25 + res = malloc(sz); 34.26 + if (!res) 34.27 + return NULL;
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/util-linux/stuff/util-linux-ng-cfdisk.patch Mon Apr 23 16:19:05 2012 +0200 35.3 @@ -0,0 +1,57 @@ 35.4 +From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 35.5 +From: Karel Zak <kzak@redhat.com> 35.6 +Date: Mon, 19 Jul 2010 22:52:58 +0200 35.7 +Subject: [PATCH] cfdisk: get_string not calculating correct limits 35.8 + 35.9 +Reported-by: James L. Hammons <jlhamm@acm.org> 35.10 +Signed-off-by: Karel Zak <kzak@redhat.com> 35.11 +--- 35.12 + fdisk/cfdisk.c | 11 ++++++++--- 35.13 + 1 files changed, 8 insertions(+), 3 deletions(-) 35.14 + 35.15 +diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c 35.16 +index 7fa0b19..e7955fe 100644 35.17 +--- a/fdisk/cfdisk.c 35.18 ++++ b/fdisk/cfdisk.c 35.19 +@@ -421,6 +421,11 @@ fdexit(int ret) { 35.20 + exit(ret); 35.21 + } 35.22 + 35.23 ++/* 35.24 ++ * Note that @len is size of @str buffer. 35.25 ++ * 35.26 ++ * Returns number of read bytes (without \0). 35.27 ++ */ 35.28 + static int 35.29 + get_string(char *str, int len, char *def) { 35.30 + size_t cells = 0, i = 0; 35.31 +@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { 35.32 + break; 35.33 + default: 35.34 + #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) 35.35 +- if (i < len && iswprint(c)) { 35.36 ++ if (i + 1 < len && iswprint(c)) { 35.37 + wchar_t wc = (wchar_t) c; 35.38 + char s[MB_CUR_MAX + 1]; 35.39 + int sz = wctomb(s, wc); 35.40 +@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { 35.41 + putchar(BELL); 35.42 + } 35.43 + #else 35.44 +- if (i < len && isprint(c)) { 35.45 ++ if (i + 1 < len && isprint(c)) { 35.46 + mvaddch(y, x + cells, c); 35.47 + if (use_def) { 35.48 + clrtoeol(); 35.49 +@@ -2405,7 +2410,7 @@ change_id(int i) { 35.50 + 35.51 + sprintf(def, "%02X", new_id); 35.52 + mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); 35.53 +- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) 35.54 ++ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) 35.55 + return; 35.56 + 35.57 + if (len != GS_DEFAULT) { 35.58 +-- 35.59 +1.7.2.1 35.60 +