wok-current rev 19253
Up util-linux* (2.28); use new cook functions here.
line diff
1.1 --- a/util-linux-blkid-dev/receipt Thu Jun 30 22:26:22 2016 +0300 1.2 +++ b/util-linux-blkid-dev/receipt Thu Jun 30 22:48:07 2016 +0300 1.3 @@ -1,22 +1,19 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="util-linux-blkid-dev" 1.7 -VERSION="2.24" 1.8 +VERSION="2.28" 1.9 CATEGORY="development" 1.10 -SHORT_DESC="The blkid devel files from Util linux NG." 1.11 +SHORT_DESC="The blkid from Util Linux, development files" 1.12 MAINTAINER="pankso@slitaz.org" 1.13 -LICENSE="GPL2" 1.14 -WANTED="util-linux" 1.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 1.16 +LICENSE="LGPL2.1" 1.17 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 1.18 HOST_ARCH="i486 arm" 1.19 1.20 -DEPENDS="pkg-config util-linux-uuid-dev util-linux-blkid" 1.21 +WANTED="util-linux" 1.22 +DEPENDS="util-linux-blkid util-linux-uuid-dev" 1.23 1.24 # Rules to gen a SliTaz package suitable for Tazpkg. 1.25 genpkg_rules() 1.26 { 1.27 - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 1.28 - cp -a $install/usr/lib/libblkid.*a $fs/usr/lib 1.29 - cp -a $install/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig 1.30 - cp -a $install/usr/include/blkid $fs/usr/include 1.31 + cook_copy_files blkid.h blkid.pc libblkid.*a 1.32 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/util-linux-blkid/description.txt Thu Jun 30 22:48:07 2016 +0300 2.3 @@ -0,0 +1,2 @@ 2.4 + * `blkid` - locate/print block device attributes 2.5 + * `lsblk` - list block devices
3.1 --- a/util-linux-blkid/receipt Thu Jun 30 22:26:22 2016 +0300 3.2 +++ b/util-linux-blkid/receipt Thu Jun 30 22:48:07 2016 +0300 3.3 @@ -1,35 +1,24 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="util-linux-blkid" 3.7 -VERSION="2.24" 3.8 +VERSION="2.28" 3.9 CATEGORY="base-system" 3.10 -SHORT_DESC="The blkid utility and library from Util linux NG." 3.11 +SHORT_DESC="The blkid utility from Util Linux" 3.12 MAINTAINER="pankso@slitaz.org" 3.13 -LICENSE="GPL2" 3.14 -WANTED="util-linux" 3.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 3.16 +LICENSE="LGPL2.1" 3.17 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 3.18 HOST_ARCH="i486 arm" 3.19 3.20 -DEPENDS="glibc-base util-linux-uuid util-linux-mount" 3.21 +WANTED="util-linux" 3.22 +DEPENDS="glibc-base udev util-linux-mount util-linux-uuid" 3.23 3.24 # Rules to gen a SliTaz package suitable for Tazpkg. 3.25 genpkg_rules() 3.26 { 3.27 - mkdir -p $fs/lib $fs/sbin $fs/bin $fs/usr/lib 3.28 - cp -a $install/sbin/blkid $fs/sbin 3.29 - cp -a $install/bin/lsblk $fs/bin 3.30 - cp -a $install/lib/libblkid.so* $fs/lib 3.31 - cp -a $install/usr/lib/libblkid.so* $fs/usr/lib 3.32 -} 3.33 - 3.34 -# Remove old package 3.35 -post_install() 3.36 -{ 3.37 - [ ! -d "$INSTALLED/util-linux-ng-blkid" ] || 3.38 - rm -rf $INSTALLED/util-linux-ng-blkid 3.39 + cook_copy_files lsblk lsblk.8* blkid blkid.8* libblkid.so* libblkid.3* 3.40 } 3.41 3.42 post_remove() 3.43 { 3.44 - ln -s ../bin/busybox "$1/sbin/blkid" 3.45 + ln -s /bin/busybox "$1/sbin/blkid" 3.46 }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/util-linux-blockdev/description.txt Thu Jun 30 22:48:07 2016 +0300 4.3 @@ -0,0 +1,1 @@ 4.4 + * `blockdev` - call block device ioctls from the command line
5.1 --- a/util-linux-blockdev/receipt Thu Jun 30 22:26:22 2016 +0300 5.2 +++ b/util-linux-blockdev/receipt Thu Jun 30 22:48:07 2016 +0300 5.3 @@ -1,30 +1,23 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="util-linux-blockdev" 5.7 -VERSION="2.24" 5.8 +VERSION="2.28" 5.9 CATEGORY="base-system" 5.10 -SHORT_DESC="The blockdev utility from Util linux NG." 5.11 +SHORT_DESC="The blockdev utility from Util Linux" 5.12 MAINTAINER="devel@slitaz.org" 5.13 LICENSE="GPL2" 5.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 5.15 + 5.16 WANTED="util-linux" 5.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 5.18 - 5.19 DEPENDS="glibc-base" 5.20 5.21 # Rules to gen a SliTaz package suitable for Tazpkg. 5.22 genpkg_rules() 5.23 { 5.24 - mkdir -p $fs/sbin 5.25 - cp -a $install/sbin/blockdev $fs/sbin 5.26 -} 5.27 - 5.28 -# Overlap busybox 5.29 -pre_install() 5.30 -{ 5.31 - rm -f "$1/sbin/blockdev" 5.32 + cook_copy_files blockdev blockdev.8* 5.33 } 5.34 5.35 post_remove() 5.36 { 5.37 - ln -s /bin/busybox /sbin/blockdev 5.38 + ln -s /bin/busybox "$1/sbin/blockdev" 5.39 }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/util-linux-cfdisk/description.txt Thu Jun 30 22:48:07 2016 +0300 6.3 @@ -0,0 +1,1 @@ 6.4 + * `cfdisk` - display or manipulate a disk partition table
7.1 --- a/util-linux-cfdisk/receipt Thu Jun 30 22:26:22 2016 +0300 7.2 +++ b/util-linux-cfdisk/receipt Thu Jun 30 22:48:07 2016 +0300 7.3 @@ -1,21 +1,22 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="util-linux-cfdisk" 7.7 -VERSION="2.24" 7.8 +VERSION="2.28" 7.9 CATEGORY="system-tools" 7.10 -SHORT_DESC="The cfdisk utility from Util linux NG." 7.11 +SHORT_DESC="The cfdisk utility from Util Linux" 7.12 MAINTAINER="pankso@slitaz.org" 7.13 LICENSE="GPL2" 7.14 -WANTED="util-linux" 7.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 7.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 7.17 HOST_ARCH="i486 arm" 7.18 7.19 -DEPENDS="glibc-base ncursesw" 7.20 +WANTED="util-linux" 7.21 +DEPENDS="glibc-base libtinfo ncursesw util-linux-blkid util-linux-fdisk \ 7.22 +util-linux-mount util-linux-smartcols util-linux-uuid" 7.23 7.24 # Rules to gen a SliTaz package suitable for Tazpkg. 7.25 genpkg_rules() 7.26 { 7.27 - mkdir -p $fs/sbin $fs/usr/share/applications 7.28 - cp -a $install/sbin/cfdisk $fs/sbin 7.29 + cook_copy_files cfdisk cfdisk.8* 7.30 + mkdir -p $fs/usr/share/applications 7.31 cp $stuff/cfdisk.desktop $fs/usr/share/applications 7.32 }
8.1 --- a/util-linux-cfdisk/stuff/cfdisk.desktop Thu Jun 30 22:26:22 2016 +0300 8.2 +++ b/util-linux-cfdisk/stuff/cfdisk.desktop Thu Jun 30 22:48:07 2016 +0300 8.3 @@ -1,16 +1,16 @@ 8.4 [Desktop Entry] 8.5 -Encoding=UTF-8 8.6 +Type=Application 8.7 Name=Cfdisk Partition Editor 8.8 Name[es]=Editor de particiones Cfdisk 8.9 Name[fi]=Cfdisk levyosioiden muokkain 8.10 Name[fr]=Editeur de partition Cfdisk 8.11 -Name[hu]=Cfdisk partÃciószerkesztÅ 8.12 +Name[hu]=Cfdisk partíciószerkesztő 8.13 Name[it]=Editor di partizioni Cfdisk 8.14 Name[pt]=Editor de Partições Cfdisk 8.15 Name[pt_BR]=Editor de Partições Cfdisk 8.16 +Name[ru]=Редактор разделов Cfdisk 8.17 Name[zh_CN]=Cfdisk分区编辑工具 8.18 -Exec=subox xterm -e cfdisk 8.19 -Icon=drive-harddisk 8.20 +Exec=subox terminal -e cfdisk 8.21 +Icon=disk-partition-manager 8.22 Terminal=false 8.23 -Type=Application 8.24 -Categories=Application;System; 8.25 +Categories=System;Filesystem;
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/util-linux-column/description.txt Thu Jun 30 22:48:07 2016 +0300 9.3 @@ -0,0 +1,1 @@ 9.4 + * `column` - columnate lists
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/util-linux-column/receipt Thu Jun 30 22:48:07 2016 +0300 10.3 @@ -0,0 +1,19 @@ 10.4 +# SliTaz package receipt. 10.5 + 10.6 +PACKAGE="util-linux-column" 10.7 +VERSION="2.28" 10.8 +CATEGORY="base-system" 10.9 +SHORT_DESC="The column utility from Util Linux" 10.10 +MAINTAINER="al.bobylev@gmail.com" 10.11 +LICENSE="GPL2" 10.12 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 10.13 +HOST_ARCH="i486 arm" 10.14 + 10.15 +WANTED="util-linux" 10.16 +DEPENDS="glibc-base" 10.17 + 10.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 10.19 +genpkg_rules() 10.20 +{ 10.21 + cook_copy_files column* 10.22 +}
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/util-linux-cramfs/description.txt Thu Jun 30 22:48:07 2016 +0300 11.3 @@ -0,0 +1,2 @@ 11.4 + * `fsck.cramfs` - fsck compressed ROM file system 11.5 + * `mkfs.cramfs` - make compressed ROM file system
12.1 --- a/util-linux-cramfs/receipt Thu Jun 30 22:26:22 2016 +0300 12.2 +++ b/util-linux-cramfs/receipt Thu Jun 30 22:48:07 2016 +0300 12.3 @@ -1,20 +1,19 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="util-linux-cramfs" 12.7 -VERSION="2.24" 12.8 +VERSION="2.28" 12.9 CATEGORY="system-tools" 12.10 -SHORT_DESC="The cramfs utilities from Util linux NG." 12.11 +SHORT_DESC="The cramfs utilities from Util Linux" 12.12 MAINTAINER="pankso@slitaz.org" 12.13 LICENSE="GPL2" 12.14 -WANTED="util-linux" 12.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 12.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 12.17 HOST_ARCH="i486 arm" 12.18 12.19 -DEPENDS="zlib" 12.20 +WANTED="util-linux" 12.21 +DEPENDS="glibc-base zlib" 12.22 12.23 # Rules to gen a SliTaz package suitable for Tazpkg. 12.24 genpkg_rules() 12.25 { 12.26 - mkdir -p $fs/sbin 12.27 - cp -a $install/sbin/*cramfs $fs/sbin 12.28 + cook_copy_files *.cramfs *.cramfs.8* 12.29 }
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/util-linux-eject/description.txt Thu Jun 30 22:48:07 2016 +0300 13.3 @@ -0,0 +1,1 @@ 13.4 + * `eject` - eject removable media
14.1 --- a/util-linux-eject/receipt Thu Jun 30 22:26:22 2016 +0300 14.2 +++ b/util-linux-eject/receipt Thu Jun 30 22:48:07 2016 +0300 14.3 @@ -1,32 +1,24 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="util-linux-eject" 14.7 -VERSION="2.24" 14.8 +VERSION="2.28" 14.9 CATEGORY="base-system" 14.10 -SHORT_DESC="The eject utility from Util linux NG." 14.11 +SHORT_DESC="The eject utility from Util Linux" 14.12 MAINTAINER="pankso@slitaz.org" 14.13 LICENSE="GPL2" 14.14 -WANTED="util-linux" 14.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 14.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 14.17 HOST_ARCH="i486 arm" 14.18 14.19 -DEPENDS="glibc-base util-linux-mount" 14.20 +WANTED="util-linux" 14.21 +DEPENDS="glibc-base util-linux-blkid util-linux-mount util-linux-uuid" 14.22 14.23 # Rules to gen a SliTaz package suitable for Tazpkg. 14.24 genpkg_rules() 14.25 { 14.26 - mkdir -p $fs/usr/bin 14.27 - cp -a $install/usr/bin/eject $fs/usr/bin 14.28 -} 14.29 - 14.30 -# Overlap busybox 14.31 -pre_install() 14.32 -{ 14.33 - rm -f $root/usr/bin/eject 14.34 + cook_copy_files eject* 14.35 } 14.36 14.37 post_remove() 14.38 { 14.39 - cd $root/usr/bin 14.40 - ln -s ../../bin/busybox eject 14.41 + ln -s /bin/busybox "$1/usr/bin/eject" 14.42 }
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/util-linux-fdisk-dev/receipt Thu Jun 30 22:48:07 2016 +0300 15.3 @@ -0,0 +1,19 @@ 15.4 +# SliTaz package receipt. 15.5 + 15.6 +PACKAGE="util-linux-fdisk-dev" 15.7 +VERSION="2.28" 15.8 +CATEGORY="development" 15.9 +SHORT_DESC="The fdisk utility from Util Linux, development files" 15.10 +MAINTAINER="al.bobylev@gmail.com" 15.11 +LICENSE="GPL2" 15.12 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 15.13 +HOST_ARCH="i486 arm" 15.14 + 15.15 +WANTED="util-linux" 15.16 +DEPENDS="util-linux-fdisk util-linux-blkid-dev util-linux-uuid-dev" 15.17 + 15.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 15.19 +genpkg_rules() 15.20 +{ 15.21 + cook_copy_files libfdisk.h libfdisk.*a fdisk.pc 15.22 +}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/util-linux-fdisk/description.txt Thu Jun 30 22:48:07 2016 +0300 16.3 @@ -0,0 +1,1 @@ 16.4 + * `fdisk` - manipulate disk partition table
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/util-linux-fdisk/receipt Thu Jun 30 22:48:07 2016 +0300 17.3 @@ -0,0 +1,24 @@ 17.4 +# SliTaz package receipt. 17.5 + 17.6 +PACKAGE="util-linux-fdisk" 17.7 +VERSION="2.28" 17.8 +CATEGORY="system-tools" 17.9 +SHORT_DESC="The fdisk utility from Util Linux" 17.10 +MAINTAINER="al.bobylev@gmail.com" 17.11 +LICENSE="GPL2" 17.12 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 17.13 +HOST_ARCH="i486 arm" 17.14 + 17.15 +WANTED="util-linux" 17.16 +DEPENDS="glibc-base libtinfo readline util-linux-blkid util-linux-uuid" 17.17 + 17.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 17.19 +genpkg_rules() 17.20 +{ 17.21 + cook_copy_files fdisk fdisk.8* libfdisk.so* 17.22 +} 17.23 + 17.24 +post_remove() 17.25 +{ 17.26 + ln -s /bin/busybox "$1/sbin/fdisk" 17.27 +}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/util-linux-flock/description.txt Thu Jun 30 22:48:07 2016 +0300 18.3 @@ -0,0 +1,1 @@ 18.4 + * `flock` - manage locks from shell scripts
19.1 --- a/util-linux-flock/receipt Thu Jun 30 22:26:22 2016 +0300 19.2 +++ b/util-linux-flock/receipt Thu Jun 30 22:48:07 2016 +0300 19.3 @@ -1,30 +1,23 @@ 19.4 # SliTaz package receipt. 19.5 19.6 PACKAGE="util-linux-flock" 19.7 -VERSION="2.24" 19.8 +VERSION="2.28" 19.9 CATEGORY="base-system" 19.10 -SHORT_DESC="The flock utility from Util linux NG." 19.11 +SHORT_DESC="The flock utility from Util Linux" 19.12 MAINTAINER="lufeng369@slitaz.org" 19.13 LICENSE="GPL2" 19.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 19.15 + 19.16 WANTED="util-linux" 19.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 19.18 - 19.19 DEPENDS="glibc-base" 19.20 19.21 # Rules to gen a SliTaz package suitable for Tazpkg. 19.22 genpkg_rules() 19.23 { 19.24 - mkdir -p $fs/usr/bin 19.25 - cp -a $install/usr/bin/flock $fs/usr/bin 19.26 -} 19.27 - 19.28 -# Overlap busybox 19.29 -pre_install() 19.30 -{ 19.31 - rm -f "$1/usr/bin/flock" 19.32 + cook_copy_files flock flock.1* 19.33 } 19.34 19.35 post_remove() 19.36 { 19.37 - ln -s /bin/busybox /usr/bin/flock 19.38 + ln -s /bin/busybox "$1/usr/bin/flock" 19.39 }
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/util-linux-getopt/description.txt Thu Jun 30 22:48:07 2016 +0300 20.3 @@ -0,0 +1,1 @@ 20.4 + * `getopt` - parse command options (enhanced)
21.1 --- a/util-linux-getopt/receipt Thu Jun 30 22:26:22 2016 +0300 21.2 +++ b/util-linux-getopt/receipt Thu Jun 30 22:48:07 2016 +0300 21.3 @@ -1,21 +1,19 @@ 21.4 # SliTaz package receipt. 21.5 21.6 PACKAGE="util-linux-getopt" 21.7 -VERSION="2.24" 21.8 +VERSION="2.28" 21.9 CATEGORY="base-system" 21.10 -SHORT_DESC="The getopt utility from Util linux NG." 21.11 +SHORT_DESC="The getopt utility from Util Linux" 21.12 MAINTAINER="pankso@slitaz.org" 21.13 LICENSE="GPL2" 21.14 -WANTED="util-linux" 21.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 21.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 21.17 HOST_ARCH="i486 arm" 21.18 21.19 +WANTED="util-linux" 21.20 DEPENDS="glibc-base" 21.21 21.22 # Rules to gen a SliTaz package suitable for Tazpkg. 21.23 genpkg_rules() 21.24 { 21.25 - mkdir -p $fs/usr/bin $fs/usr/share 21.26 - cp -a $install/usr/bin/getopt $fs/usr/bin 21.27 - cp -a $install/usr/share/doc/util-linux/getopt $fs/usr/share 21.28 + cook_copy_files getopt* 21.29 }
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/util-linux-minix/description.txt Thu Jun 30 22:48:07 2016 +0300 22.3 @@ -0,0 +1,2 @@ 22.4 + * `fsck.minix` - check consistency of Minix filesystem 22.5 + * `mkfs.minix` - make a Minix filesystem
23.1 --- a/util-linux-minix/receipt Thu Jun 30 22:26:22 2016 +0300 23.2 +++ b/util-linux-minix/receipt Thu Jun 30 22:48:07 2016 +0300 23.3 @@ -1,17 +1,18 @@ 23.4 # SliTaz package receipt. 23.5 23.6 PACKAGE="util-linux-minix" 23.7 -VERSION="2.24" 23.8 +VERSION="2.28" 23.9 CATEGORY="system-tools" 23.10 -SHORT_DESC="The minix utilities from Util linux NG." 23.11 +SHORT_DESC="The minix utilities from Util Linux" 23.12 MAINTAINER="pankso@slitaz.org" 23.13 LICENSE="GPL2" 23.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 23.15 + 23.16 WANTED="util-linux" 23.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 23.18 +DEPENDS="glibc-base" 23.19 23.20 # Rules to gen a SliTaz package suitable for Tazpkg. 23.21 genpkg_rules() 23.22 { 23.23 - mkdir -p $fs/sbin 23.24 - cp -a $install/sbin/*minix $fs/sbin 23.25 + cook_copy_files *.minix* 23.26 }
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/util-linux-mkfs/description.txt Thu Jun 30 22:48:07 2016 +0300 24.3 @@ -0,0 +1,5 @@ 24.4 + * `mkfs` - build a Linux filesystem 24.5 + * `mkfs.bfs` - make an SCO bfs filesystem 24.6 + * `mkfs.cramfs` - make compressed ROM file system 24.7 + * `mkfs.minix` - make a Minix filesystem 24.8 + * `mkswap` - set up a Linux swap area
25.1 --- a/util-linux-mkfs/receipt Thu Jun 30 22:26:22 2016 +0300 25.2 +++ b/util-linux-mkfs/receipt Thu Jun 30 22:48:07 2016 +0300 25.3 @@ -1,21 +1,24 @@ 25.4 # SliTaz package receipt. 25.5 25.6 PACKAGE="util-linux-mkfs" 25.7 -VERSION="2.24" 25.8 +VERSION="2.28" 25.9 CATEGORY="base-system" 25.10 -SHORT_DESC="The mkfs utility and library from Util linux." 25.11 +SHORT_DESC="The mkfs utilities from Util Linux" 25.12 MAINTAINER="pankso@slitaz.org" 25.13 LICENSE="GPL2" 25.14 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 25.15 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 25.16 HOST_ARCH="i486 arm" 25.17 25.18 +WANTED="util-linux" 25.19 DEPENDS="glibc-base util-linux-blkid util-linux-uuid zlib" 25.20 -WANTED="util-linux" 25.21 - 25.22 25.23 # Rules to gen a SliTaz package suitable for Tazpkg. 25.24 genpkg_rules() 25.25 { 25.26 - mkdir -p $fs/sbin 25.27 - cp -a $install/sbin/mk* $fs/sbin 25.28 + cook_copy_files mk* 25.29 } 25.30 + 25.31 +post_remove() 25.32 +{ 25.33 + ln -s /bin/busybox "$1/sbin/mkswap" 25.34 +}
26.1 --- a/util-linux-mount-dev/receipt Thu Jun 30 22:26:22 2016 +0300 26.2 +++ b/util-linux-mount-dev/receipt Thu Jun 30 22:48:07 2016 +0300 26.3 @@ -1,22 +1,19 @@ 26.4 # SliTaz package receipt. 26.5 26.6 PACKAGE="util-linux-mount-dev" 26.7 -VERSION="2.24" 26.8 -CATEGORY="base-system" 26.9 -SHORT_DESC="Libmount devel files." 26.10 +VERSION="2.28" 26.11 +CATEGORY="development" 26.12 +SHORT_DESC="The mount utilities from Util Linux, development files" 26.13 MAINTAINER="pankso@slitaz.org" 26.14 -LICENSE="GPL2" 26.15 -WANTED="util-linux" 26.16 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 26.17 +LICENSE="LGPL2.1" 26.18 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 26.19 HOST_ARCH="i486 arm" 26.20 26.21 -DEPENDS="util-linux-blkid-dev util-linux-mount pkg-config" 26.22 +WANTED="util-linux" 26.23 +DEPENDS="util-linux-mount util-linux-blkid-dev util-linux-uuid-dev" 26.24 26.25 # Rules to gen a SliTaz package suitable for Tazpkg. 26.26 genpkg_rules() 26.27 { 26.28 - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 26.29 - cp -a $install/usr/lib/libmount.*a $fs/usr/lib 26.30 - cp -a $install/usr/lib/pkgconfig/mount.pc $fs/usr/lib/pkgconfig 26.31 - cp -a $install/usr/include/libmount $fs/usr/include 26.32 + cook_copy_files libmount.h libmount.*a mount.pc 26.33 }
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/util-linux-mount/description.txt Thu Jun 30 22:48:07 2016 +0300 27.3 @@ -0,0 +1,4 @@ 27.4 + * `findmnt` - find a filesystem 27.5 + * `mount` - mount a filesystem 27.6 + * `mountpoint` - see if a directory or file is a mountpoint 27.7 + * `umount` - unmount file systems
28.1 --- a/util-linux-mount/receipt Thu Jun 30 22:26:22 2016 +0300 28.2 +++ b/util-linux-mount/receipt Thu Jun 30 22:48:07 2016 +0300 28.3 @@ -1,23 +1,19 @@ 28.4 # SliTaz package receipt. 28.5 28.6 PACKAGE="util-linux-mount" 28.7 -VERSION="2.24" 28.8 +VERSION="2.28" 28.9 CATEGORY="base-system" 28.10 -SHORT_DESC="The mount utilities and libmount library from Util linux." 28.11 +SHORT_DESC="The mount utilities from Util Linux" 28.12 MAINTAINER="pankso@slitaz.org" 28.13 LICENSE="GPL2" 28.14 -WANTED="util-linux" 28.15 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 28.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 28.17 HOST_ARCH="i486 arm" 28.18 28.19 -DEPENDS="glibc-base" 28.20 +WANTED="util-linux" 28.21 +DEPENDS="glibc-base util-linux-blkid util-linux-uuid util-linux-smartcols udev" 28.22 28.23 # Rules to gen a SliTaz package suitable for Tazpkg. 28.24 genpkg_rules() 28.25 { 28.26 - mkdir -p $fs/lib $fs/bin $fs/usr/lib 28.27 - cp -a $install/bin/findmnt $fs/bin 28.28 - cp -a $install/bin/*mount* $fs/bin 28.29 - cp -a $install/lib/libmount.so* $fs/lib 28.30 - ln -sf ../../lib/libmount.so.1.1.0 $fs/usr/lib/libmount.so 28.31 + cook_copy_files findmnt* mount mount.8* libmount.so* mountpoint* umount* 28.32 }
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/util-linux-partx/description.txt Thu Jun 30 22:48:07 2016 +0300 29.3 @@ -0,0 +1,5 @@ 29.4 + * `addpart` - tell the kernel about the existence of a partition 29.5 + * `delpart` - tell the kernel to forget about a partition 29.6 + * `partx` - tell the kernel about the presence and numbering of on-disk 29.7 + partitions 29.8 + * `resizepart` - tell the kernel about the new size of a partition
30.1 --- a/util-linux-partx/receipt Thu Jun 30 22:26:22 2016 +0300 30.2 +++ b/util-linux-partx/receipt Thu Jun 30 22:48:07 2016 +0300 30.3 @@ -1,21 +1,18 @@ 30.4 # SliTaz package receipt. 30.5 30.6 PACKAGE="util-linux-partx" 30.7 -VERSION="2.24" 30.8 +VERSION="2.28" 30.9 CATEGORY="system-tools" 30.10 -SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." 30.11 +SHORT_DESC="The partx utilities from Util Linux NG" 30.12 MAINTAINER="pankso@slitaz.org" 30.13 LICENSE="GPL2" 30.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 30.15 + 30.16 WANTED="util-linux" 30.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 30.18 - 30.19 -DEPENDS="glibc-base" 30.20 +DEPENDS="glibc-base util-linux-blkid util-linux-uuid util-linux-smartcols" 30.21 30.22 # Rules to gen a SliTaz package suitable for Tazpkg. 30.23 genpkg_rules() 30.24 { 30.25 - mkdir -p $fs/usr/sbin 30.26 - for i in addpart delpart partx; do 30.27 - cp -a $install/usr/sbin/$i $fs/usr/sbin 30.28 - done 30.29 + cook_copy_files addpart* delpart* partx* resizepart* 30.30 }
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/util-linux-setterm/description.txt Thu Jun 30 22:48:07 2016 +0300 31.3 @@ -0,0 +1,1 @@ 31.4 + * `setterm` - set terminal attributes
32.1 --- a/util-linux-setterm/receipt Thu Jun 30 22:26:22 2016 +0300 32.2 +++ b/util-linux-setterm/receipt Thu Jun 30 22:48:07 2016 +0300 32.3 @@ -1,20 +1,18 @@ 32.4 # SliTaz package receipt 32.5 32.6 PACKAGE="util-linux-setterm" 32.7 -VERSION="2.24" 32.8 +VERSION="2.28" 32.9 CATEGORY="base-system" 32.10 -SHORT_DESC="The setterm utility from Util linux NG." 32.11 +SHORT_DESC="The setterm utility from Util Linux" 32.12 MAINTAINER="devel@slitaz.org" 32.13 LICENSE="GPL2" 32.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 32.15 + 32.16 WANTED="util-linux" 32.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 32.18 - 32.19 -DEPENDS="glibc-base" 32.20 +DEPENDS="glibc-base libtinfo" 32.21 32.22 # Rules to gen a SliTaz package suitable for Tazpkg. 32.23 genpkg_rules() 32.24 { 32.25 - mkdir -p $fs/usr/bin 32.26 - cp -a $install/usr/bin/setterm $fs/usr/bin 32.27 + cook_copy_files setterm* 32.28 } 32.29 -
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/util-linux-sfdisk/description.txt Thu Jun 30 22:48:07 2016 +0300 33.3 @@ -0,0 +1,1 @@ 33.4 + * `sfdisk` - display or manipulate a disk partition table
34.1 --- a/util-linux-sfdisk/receipt Thu Jun 30 22:26:22 2016 +0300 34.2 +++ b/util-linux-sfdisk/receipt Thu Jun 30 22:48:07 2016 +0300 34.3 @@ -1,19 +1,19 @@ 34.4 # SliTaz package receipt. 34.5 34.6 PACKAGE="util-linux-sfdisk" 34.7 -VERSION="2.24" 34.8 +VERSION="2.28" 34.9 CATEGORY="system-tools" 34.10 -SHORT_DESC="The sfdisk utility from Util linux NG." 34.11 +SHORT_DESC="The sfdisk utility from Util Linux" 34.12 MAINTAINER="pankso@slitaz.org" 34.13 LICENSE="GPL2" 34.14 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 34.15 + 34.16 WANTED="util-linux" 34.17 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 34.18 - 34.19 -DEPENDS="glibc-base ncurses" 34.20 +DEPENDS="glibc-base libtinfo readline util-linux-blkid util-linux-fdisk \ 34.21 +util-linux-smartcols util-linux-uuid" 34.22 34.23 # Rules to gen a SliTaz package suitable for Tazpkg. 34.24 genpkg_rules() 34.25 { 34.26 - mkdir -p $fs/sbin 34.27 - cp -a $install/sbin/sfdisk $fs/sbin 34.28 + cook_copy_files sfdisk* 34.29 }
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/util-linux-smartcols-dev/receipt Thu Jun 30 22:48:07 2016 +0300 35.3 @@ -0,0 +1,19 @@ 35.4 +# SliTaz package receipt. 35.5 + 35.6 +PACKAGE="util-linux-smartcols-dev" 35.7 +VERSION="2.28" 35.8 +CATEGORY="development" 35.9 +SHORT_DESC="The smartcols library from Util Linux, development files" 35.10 +MAINTAINER="al.bobylev@gmail.com" 35.11 +LICENSE="LGPL2.1" 35.12 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 35.13 +HOST_ARCH="i486 arm" 35.14 + 35.15 +WANTED="util-linux" 35.16 +DEPENDS="util-linux-smartcols" 35.17 + 35.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 35.19 +genpkg_rules() 35.20 +{ 35.21 + cook_copy_files libsmartcols.h libsmartcols.*a smartcols.pc 35.22 +}
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/util-linux-smartcols/receipt Thu Jun 30 22:48:07 2016 +0300 36.3 @@ -0,0 +1,18 @@ 36.4 +# SliTaz package receipt. 36.5 + 36.6 +PACKAGE="util-linux-smartcols" 36.7 +VERSION="2.28" 36.8 +CATEGORY="system-tools" 36.9 +SHORT_DESC="The smartcols library from Util Linux" 36.10 +MAINTAINER="al.bobylev@gmail.com" 36.11 +LICENSE="GPL2" 36.12 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 36.13 + 36.14 +WANTED="util-linux" 36.15 +DEPENDS="glibc-base" 36.16 + 36.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 36.18 +genpkg_rules() 36.19 +{ 36.20 + cook_copy_files libsmartcols.so* 36.21 +}
37.1 --- a/util-linux-uuid-dev/receipt Thu Jun 30 22:26:22 2016 +0300 37.2 +++ b/util-linux-uuid-dev/receipt Thu Jun 30 22:48:07 2016 +0300 37.3 @@ -1,22 +1,19 @@ 37.4 # SliTaz package receipt. 37.5 37.6 PACKAGE="util-linux-uuid-dev" 37.7 -VERSION="2.24" 37.8 +VERSION="2.28" 37.9 CATEGORY="development" 37.10 -SHORT_DESC="The uuid devel files from Util linux NG." 37.11 +SHORT_DESC="The uuid utility and library from Util linux, development files" 37.12 MAINTAINER="pankso@slitaz.org" 37.13 LICENSE="GPL2" 37.14 -WANTED="util-linux" 37.15 -WEB_SITE="http://freecode.com/projects/util-linux/" 37.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 37.17 HOST_ARCH="i486 arm" 37.18 37.19 -DEPENDS="pkg-config util-linux-uuid" 37.20 +WANTED="util-linux" 37.21 +DEPENDS="util-linux-uuid" 37.22 37.23 # Rules to gen a SliTaz package suitable for Tazpkg. 37.24 genpkg_rules() 37.25 { 37.26 - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include 37.27 - cp -a $install/usr/lib/libuuid.*a $fs/usr/lib 37.28 - cp -a $install/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig 37.29 - cp -a $install/usr/include/uuid $fs/usr/include 37.30 + cook_copy_files uuid.h libuuid.*a uuid.pc 37.31 }
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 38.2 +++ b/util-linux-uuid/description.txt Thu Jun 30 22:48:07 2016 +0300 38.3 @@ -0,0 +1,2 @@ 38.4 + * `uuidgen` - create a new UUID value 38.5 + * `uuidd` - UUID generation daemon
39.1 --- a/util-linux-uuid/receipt Thu Jun 30 22:26:22 2016 +0300 39.2 +++ b/util-linux-uuid/receipt Thu Jun 30 22:48:07 2016 +0300 39.3 @@ -1,35 +1,19 @@ 39.4 # SliTaz package receipt. 39.5 39.6 PACKAGE="util-linux-uuid" 39.7 -VERSION="2.24" 39.8 +VERSION="2.28" 39.9 CATEGORY="base-system" 39.10 -SHORT_DESC="The uuid utility and library from Util linux NG." 39.11 +SHORT_DESC="The uuid utility and library from Util Linux" 39.12 MAINTAINER="pankso@slitaz.org" 39.13 LICENSE="GPL2" 39.14 -WANTED="util-linux" 39.15 -WEB_SITE="http://freecode.com/projects/util-linux/" 39.16 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 39.17 HOST_ARCH="i486 arm" 39.18 39.19 -DEPENDS="ncursesw" 39.20 +WANTED="util-linux" 39.21 +DEPENDS="glibc-base" 39.22 39.23 # Rules to gen a SliTaz package suitable for Tazpkg. 39.24 genpkg_rules() 39.25 { 39.26 - mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin 39.27 - cp -a $install/usr/sbin/uuidd $fs/usr/sbin 39.28 - cp -a $install/usr/bin/uuidgen $fs/usr/bin 39.29 - cp -a $install/lib/libuuid.so* $fs/lib 39.30 - cd $fs/usr/lib 39.31 - # Be compatible with /cross/*/sysroot 39.32 - ln -s ../../lib/libuuid.so.1.3.0 libuuid.so 39.33 + cook_copy_files libuuid.so* uuidgen* uuidd* uuid*3* 39.34 } 39.35 - 39.36 -# Remove old package 39.37 -post_install() 39.38 -{ 39.39 - if [ -d "$1$INSTALLED/util-linux-ng-uuid" ]; then 39.40 - echo "Removing old: util-linux-ng-uuid" 39.41 - rm -rf "$1$INSTALLED/util-linux-ng-uuid" 39.42 - fi 39.43 - true 39.44 -}
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 40.2 +++ b/util-linux-whereis/description.txt Thu Jun 30 22:48:07 2016 +0300 40.3 @@ -0,0 +1,1 @@ 40.4 + * `whereis` - locate the binary, source, and manual page files for a command
41.1 --- a/util-linux-whereis/receipt Thu Jun 30 22:26:22 2016 +0300 41.2 +++ b/util-linux-whereis/receipt Thu Jun 30 22:48:07 2016 +0300 41.3 @@ -1,20 +1,19 @@ 41.4 # SliTaz package receipt. 41.5 41.6 PACKAGE="util-linux-whereis" 41.7 -VERSION="2.24" 41.8 +VERSION="2.28" 41.9 CATEGORY="base-system" 41.10 -SHORT_DESC="The whereis utility and library from Util linux." 41.11 +SHORT_DESC="The whereis utility from Util Linux" 41.12 MAINTAINER="pankso@slitaz.org" 41.13 LICENSE="GPL2" 41.14 -WEB_SITE="http://kernel.org/~kzak/util-linux/" 41.15 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 41.16 +HOST_ARCH="i486 arm" 41.17 41.18 +WANTED="util-linux" 41.19 DEPENDS="glibc-base" 41.20 -WANTED="util-linux" 41.21 -HOST_ARCH="i486 arm" 41.22 41.23 # Rules to gen a SliTaz package suitable for Tazpkg. 41.24 genpkg_rules() 41.25 { 41.26 - mkdir -p $fs/usr/bin 41.27 - cp -a $install/usr/bin/whereis $fs/usr/bin 41.28 + cook_copy_files whereis* 41.29 }
42.1 --- a/util-linux/receipt Thu Jun 30 22:26:22 2016 +0300 42.2 +++ b/util-linux/receipt Thu Jun 30 22:48:07 2016 +0300 42.3 @@ -1,20 +1,24 @@ 42.4 # SliTaz package receipt. 42.5 42.6 PACKAGE="util-linux" 42.7 -VERSION="2.24" 42.8 +VERSION="2.28" 42.9 CATEGORY="meta" 42.10 -SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." 42.11 +SHORT_DESC="Random collection of Linux utilities (meta package)" 42.12 MAINTAINER="pankso@slitaz.org" 42.13 -LICENSE="GPL2" 42.14 -SOURCE="util-linux" 42.15 -TARBALL="$SOURCE-$VERSION.tar.xz" 42.16 -WEB_SITE="http://freecode.com/projects/util-linux/" 42.17 +LICENSE="GPL2 LGPL2.1 BSD PublicDomain" 42.18 +WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 42.19 +TARBALL="$PACKAGE-$VERSION.tar.xz" 42.20 WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/$TARBALL" 42.21 HOST_ARCH="i486 arm" 42.22 -LOCALE="" 42.23 42.24 -DEPENDS="ncurses" 42.25 -BUILD_DEPENDS="wget ncurses-dev zlib-dev udev-dev" 42.26 +DEPENDS="" 42.27 +BUILD_DEPENDS="udev-dev ncursesw-dev libcap-ng-dev readline-dev python-dev" 42.28 +SPLIT="util-linux-blkid util-linux-blkid-dev util-linux-blockdev \ 42.29 +util-linux-cfdisk util-linux-column util-linux-cramfs util-linux-eject \ 42.30 +util-linux-fdisk util-linux-fdisk-dev util-linux-flock util-linux-getopt \ 42.31 +util-linux-minix util-linux-mkfs util-linux-mount util-linux-mount-dev \ 42.32 +util-linux-partx util-linux-setterm util-linux-sfdisk util-linux-smartcols \ 42.33 +util-linux-smartcols-dev util-linux-uuid util-linux-uuid-dev util-linux-whereis" 42.34 42.35 # Rules to configure and make the package. 42.36 compile_rules() 42.37 @@ -23,17 +27,12 @@ 42.38 case "$ARCH" in 42.39 arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;; 42.40 esac 42.41 + 42.42 ./configure \ 42.43 --prefix=/usr \ 42.44 --sysconfdir=/etc \ 42.45 - --with-fsprobe=builtin \ 42.46 - --enable-partx \ 42.47 $CONFIGURE_ARGS && 42.48 make && make install 42.49 + 42.50 + cook_compress_manpages 42.51 } 42.52 - 42.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 42.54 -genpkg_rules() 42.55 -{ 42.56 - mkdir -p $fs/usr/bin 42.57 -}
43.1 --- a/util-linux/stuff/fix-findmnt.patch Thu Jun 30 22:26:22 2016 +0300 43.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 43.3 @@ -1,24 +0,0 @@ 43.4 -commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 43.5 -Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 43.6 -Date: Sun Jul 4 20:02:57 2010 +0200 43.7 - 43.8 - libmount: fix merge_optstr (do not truncate 3 trailing characters) 43.9 - 43.10 - I believe this is the correct fix. 43.11 - 43.12 - Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> 43.13 - 43.14 -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c 43.15 -index 5dbcfa6..680e1fc 100644 43.16 ---- a/shlibs/mount/src/tab_parse.c 43.17 -+++ b/shlibs/mount/src/tab_parse.c 43.18 -@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) 43.19 - if (!strcmp(vfs, fs)) 43.20 - return strdup(vfs); /* e.g. "aaa" and "aaa" */ 43.21 - 43.22 -- sz = strlen(vfs) + strlen(fs) + 2; 43.23 -+ /* leave space for leading "r[ow],", "," and trailing zero */ 43.24 -+ sz = strlen(vfs) + strlen(fs) + 5; 43.25 - res = malloc(sz); 43.26 - if (!res) 43.27 - return NULL;
44.1 --- a/util-linux/stuff/util-linux-ng-cfdisk.patch Thu Jun 30 22:26:22 2016 +0300 44.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 44.3 @@ -1,57 +0,0 @@ 44.4 -From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 44.5 -From: Karel Zak <kzak@redhat.com> 44.6 -Date: Mon, 19 Jul 2010 22:52:58 +0200 44.7 -Subject: [PATCH] cfdisk: get_string not calculating correct limits 44.8 - 44.9 -Reported-by: James L. Hammons <jlhamm@acm.org> 44.10 -Signed-off-by: Karel Zak <kzak@redhat.com> 44.11 ---- 44.12 - fdisk/cfdisk.c | 11 ++++++++--- 44.13 - 1 files changed, 8 insertions(+), 3 deletions(-) 44.14 - 44.15 -diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c 44.16 -index 7fa0b19..e7955fe 100644 44.17 ---- a/fdisk/cfdisk.c 44.18 -+++ b/fdisk/cfdisk.c 44.19 -@@ -421,6 +421,11 @@ fdexit(int ret) { 44.20 - exit(ret); 44.21 - } 44.22 - 44.23 -+/* 44.24 -+ * Note that @len is size of @str buffer. 44.25 -+ * 44.26 -+ * Returns number of read bytes (without \0). 44.27 -+ */ 44.28 - static int 44.29 - get_string(char *str, int len, char *def) { 44.30 - size_t cells = 0, i = 0; 44.31 -@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { 44.32 - break; 44.33 - default: 44.34 - #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) 44.35 -- if (i < len && iswprint(c)) { 44.36 -+ if (i + 1 < len && iswprint(c)) { 44.37 - wchar_t wc = (wchar_t) c; 44.38 - char s[MB_CUR_MAX + 1]; 44.39 - int sz = wctomb(s, wc); 44.40 -@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { 44.41 - putchar(BELL); 44.42 - } 44.43 - #else 44.44 -- if (i < len && isprint(c)) { 44.45 -+ if (i + 1 < len && isprint(c)) { 44.46 - mvaddch(y, x + cells, c); 44.47 - if (use_def) { 44.48 - clrtoeol(); 44.49 -@@ -2405,7 +2410,7 @@ change_id(int i) { 44.50 - 44.51 - sprintf(def, "%02X", new_id); 44.52 - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); 44.53 -- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) 44.54 -+ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) 44.55 - return; 44.56 - 44.57 - if (len != GS_DEFAULT) { 44.58 --- 44.59 -1.7.2.1 44.60 -