# HG changeset patch # User Christophe Lincoln # Date 1335190745 -7200 # Node ID d35ad056f90e2d9b42d6ad6066b5230108395733 # Parent 80a234c03f3560a0bcb459d9bee486487a42b1a5 Up: util-linux (2.21.1) no longer util-linux-ng diff -r 80a234c03f35 -r d35ad056f90e util-linux-blkid-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-blkid-dev/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-blkid-dev" +VERSION="2.21.1" +CATEGORY="development" +SHORT_DESC="The blkid devel files from Util linux NG." +MAINTAINER="pankso@slitaz.org" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include + cp -a $_pkg/usr/lib/libblkid.*a $fs/usr/lib + cp -a $_pkg/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig + cp -a $_pkg/usr/include/blkid $fs/usr/include +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-blkid/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-blkid/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,31 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-blkid" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The blkid utility and library from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base util-linux-uuid" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/lib $fs/sbin $fs/bin $fs/usr/lib + cp -a $install/sbin/blkid $fs/sbin + cp -a $install/bin/lsblk $fs/bin + cp -a $install/lib/libblkid.so* $fs/lib + cp -a $install/usr/lib/libblkid.so* $fs/usr/lib +} + +# Overlap busybox +pre_install() +{ + rm -f $1/sbin/blkid +} + +post_remove() +{ + ln -s /bin/busybox /sbin/blkid +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-blockdev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-blockdev/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,28 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-blockdev" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The blockdev utility from Util linux NG." +MAINTAINER="devel@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/sbin + cp -a $_pkg/sbin/blockdev $fs/sbin +} + +# Overlap busybox +pre_install() +{ + rm -f $1/sbin/blockdev +} + +post_remove() +{ + ln -s /bin/busybox /sbin/blockdev +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-cfdisk/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-cfdisk/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-cfdisk" +VERSION="2.21.1" +CATEGORY="system-tools" +SHORT_DESC="The cfdisk utility from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base ncurses" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/sbin $fs/usr/share/applications + cp -a $_pkg/sbin/cfdisk $fs/sbin + cp stuff/cfdisk.desktop $fs/usr/share/applications +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-cfdisk/stuff/cfdisk.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-cfdisk/stuff/cfdisk.desktop Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Cfdisk Partition Editor +Name[es]=Editor de particiones Cfdisk +Name[fi]=Cfdisk levyosioiden muokkain +Name[fr]=Editeur de partition Cfdisk +Name[hu]=Cfdisk partíciószerkesztő +Name[it]=Editor di partizioni Cfdisk +Name[pt]=CFdisk Editor de Partições +Name[zh_CN]=Cfdisk分区编辑工具 +Exec=subox xterm -e cfdisk +Icon=drive-harddisk +Terminal=false +Type=Application +Categories=Application;System; diff -r 80a234c03f35 -r d35ad056f90e util-linux-cramfs/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-cramfs/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,17 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-cramfs" +VERSION="2.21.1" +CATEGORY="system-tools" +SHORT_DESC="The cramfs utilities from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="zlib" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/sbin + cp -a $_pkg/sbin/*cramfs $fs/sbin +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-flock/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-flock/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,28 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-flock" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The flock utility from Util linux NG." +MAINTAINER="liupeng " +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin + cp -a $_pkg/usr/bin/flock $fs/usr/bin +} + +# Overlap busybox +pre_install() +{ + rm -f $1/usr/bin/blkid +} + +post_remove() +{ + ln -s /bin/busybox /usr/bin/blkid +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-getopt/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-getopt/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-getopt" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The getopt utility from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin $fs/usr/share + cp -a $install/usr/bin/getopt $fs/usr/bin + cp -a $install/usr/share/getopt $fs/usr/share +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-minix/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-minix/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,16 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-minix" +VERSION="2.21.1" +CATEGORY="system-tools" +SHORT_DESC="The minix utilities from Util linux NG." +MAINTAINER="pankso@slitaz.org" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/sbin + cp -a $_pkg/sbin/*minix $fs/sbin +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-mount/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-mount/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,19 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-mount" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The mount utilities and libmount library from Util linux." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/lib $fs/bin + cp -a $install/bin/findmnt $fs/bin + cp -a $install/bin/*mount* $fs/bin + cp -a $install/lib/libmount.so* $fs/lib +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-blkid-dev/receipt --- a/util-linux-ng-blkid-dev/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-blkid-dev" -VERSION="2.19.1" -CATEGORY="development" -SHORT_DESC="The blkid devel files from Util linux NG." -MAINTAINER="pankso@slitaz.org" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include - cp -a $_pkg/usr/lib/libblkid.*a $fs/usr/lib - cp -a $_pkg/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig - cp -a $_pkg/usr/include/blkid $fs/usr/include -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-blkid/receipt --- a/util-linux-ng-blkid/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-blkid" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The blkid utility and library from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base util-linux-ng-uuid" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/lib $fs/sbin $fs/usr/lib - cp -a $_pkg/sbin/blkid $fs/sbin - cp -a $_pkg/lib/libblkid.so* $fs/lib - cp -a $_pkg/usr/lib/libblkid.so* $fs/usr/lib -} - -# Overlap busybox -pre_install() -{ - rm -f $1/sbin/blkid -} - -post_remove() -{ - ln -s /bin/busybox /sbin/blkid -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-blockdev/receipt --- a/util-linux-ng-blockdev/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-blockdev" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The blockdev utility from Util linux NG." -MAINTAINER="devel@slitaz.org" -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/sbin - cp -a $_pkg/sbin/blockdev $fs/sbin -} - -# Overlap busybox -pre_install() -{ - rm -f $1/sbin/blockdev -} - -post_remove() -{ - ln -s /bin/busybox /sbin/blockdev -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-cfdisk/receipt --- a/util-linux-ng-cfdisk/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-cfdisk" -VERSION="2.19.1" -CATEGORY="system-tools" -SHORT_DESC="The cfdisk utility from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base ncurses" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/sbin $fs/usr/share/applications - cp -a $_pkg/sbin/cfdisk $fs/sbin - cp stuff/cfdisk.desktop $fs/usr/share/applications -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-cfdisk/stuff/cfdisk.desktop --- a/util-linux-ng-cfdisk/stuff/cfdisk.desktop Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Cfdisk Partition Editor -Name[es]=Editor de particiones Cfdisk -Name[fi]=Cfdisk levyosioiden muokkain -Name[fr]=Editeur de partition Cfdisk -Name[hu]=Cfdisk partíciószerkesztő -Name[it]=Editor di partizioni Cfdisk -Name[pt]=CFdisk Editor de Partições -Name[zh_CN]=Cfdisk分区编辑工具 -Exec=subox xterm -e cfdisk -Icon=drive-harddisk -Terminal=false -Type=Application -Categories=Application;System; diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-cramfs/receipt --- a/util-linux-ng-cramfs/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-cramfs" -VERSION="2.19.1" -CATEGORY="system-tools" -SHORT_DESC="The cramfs utilities from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="zlib" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/sbin - cp -a $_pkg/sbin/*cramfs $fs/sbin -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-flock/receipt --- a/util-linux-ng-flock/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-flock" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The flock utility from Util linux NG." -MAINTAINER="liupeng " -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $_pkg/usr/bin/flock $fs/usr/bin -} - -# Overlap busybox -pre_install() -{ - rm -f $1/usr/bin/blkid -} - -post_remove() -{ - ln -s /bin/busybox /usr/bin/blkid -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-getopt/receipt --- a/util-linux-ng-getopt/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-getopt" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The getopt utility from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $_pkg/usr/bin/getopt $fs/usr/bin -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-minix/receipt --- a/util-linux-ng-minix/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-minix" -VERSION="2.19.1" -CATEGORY="system-tools" -SHORT_DESC="The minix utilities from Util linux NG." -MAINTAINER="pankso@slitaz.org" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/sbin - cp -a $_pkg/sbin/*minix $fs/sbin -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-partx/receipt --- a/util-linux-ng-partx/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-partx" -VERSION="2.19.1" -CATEGORY="system-tools" -SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/sbin - for i in addpart delpart partx; do - cp -a $_pkg/usr/sbin/$i $fs/usr/sbin - done -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-setterm/receipt --- a/util-linux-ng-setterm/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt - -PACKAGE="util-linux-ng-setterm" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The setterm utility from Util linux NG." -MAINTAINER="devel@slitaz.org" -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $_pkg/usr/bin/setterm $fs/usr/bin -} - diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-sfdisk/receipt --- a/util-linux-ng-sfdisk/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-sfdisk" -VERSION="2.19.1" -CATEGORY="system-tools" -SHORT_DESC="The sfdisk utility from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base ncurses" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/sbin - cp -a $_pkg/sbin/sfdisk $fs/sbin -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-uuid-dev/receipt --- a/util-linux-ng-uuid-dev/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-uuid-dev" -VERSION="2.19.1" -CATEGORY="development" -SHORT_DESC="The uuid devel files from Util linux NG." -MAINTAINER="pankso@slitaz.org" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include - cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib - cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig - cp -a $_pkg/usr/include/uuid $fs/usr/include -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng-uuid/receipt --- a/util-linux-ng-uuid/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng-uuid" -VERSION="2.19.1" -CATEGORY="base-system" -SHORT_DESC="The uuid utility and library from Util linux NG." -MAINTAINER="pankso@slitaz.org" -DEPENDS="glibc-base" -WANTED="util-linux-ng" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin - cp -a $_pkg/usr/sbin/uuidd $fs/usr/sbin - cp -a $_pkg/usr/bin/uuidgen $fs/usr/bin - cp -a $_pkg/lib/libuuid.so* $fs/lib - cd $fs/usr/lib - ln -s /lib/libuuid.so.1.3.0 libuuid.so - #cp -a $_pkg/usr/lib/libuuid.so* $fs/usr/lib -} - -post_install() -{ - # Remove old libuuid from e2fsprogs package - rm $1/lib/libuuid.so.1.2 2>/dev/null - rm -rf $1/var/lib/tazpkg/installed/libuuid 2>/dev/null -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng/receipt --- a/util-linux-ng/receipt Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="util-linux-ng" -VERSION="2.19.1" -CATEGORY="meta" -SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." -MAINTAINER="pankso@slitaz.org" -SOURCE="util-linux" -TARBALL="$SOURCE-$VERSION.tar.bz2" -WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" -WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.19/$TARBALL" -COOK_OPT="!fs" -LOCALE="" - -DEPENDS="" -BUILD_DEPENDS="ncurses-dev zlib-dev" - -# 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 - grep -qs 'define u8' fdisk/fdisksunlabel.c || - sed -i 's|#include |#define u8 __u8\n&|' fdisk/fdisksunlabel.c - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-fsprobe=builtin \ - --enable-partx \ - $CONFIGURE_ARGS && - make && - make install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin -} diff -r 80a234c03f35 -r d35ad056f90e util-linux-ng/stuff/fix-findmnt.patch --- a/util-linux-ng/stuff/fix-findmnt.patch Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -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 80a234c03f35 -r d35ad056f90e util-linux-ng/stuff/util-linux-ng-cfdisk.patch --- a/util-linux-ng/stuff/util-linux-ng-cfdisk.patch Mon Apr 23 16:15:50 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -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 - diff -r 80a234c03f35 -r d35ad056f90e util-linux-partx/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-partx/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,19 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-partx" +VERSION="2.21.1" +CATEGORY="system-tools" +SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/sbin + for i in addpart delpart partx; do + cp -a $_pkg/usr/sbin/$i $fs/usr/sbin + done +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-setterm/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-setterm/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt + +PACKAGE="util-linux-setterm" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The setterm utility from Util linux NG." +MAINTAINER="devel@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin + cp -a $_pkg/usr/bin/setterm $fs/usr/bin +} + diff -r 80a234c03f35 -r d35ad056f90e util-linux-sfdisk/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-sfdisk/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,17 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-sfdisk" +VERSION="2.21.1" +CATEGORY="system-tools" +SHORT_DESC="The sfdisk utility from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base ncurses" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/sbin + cp -a $_pkg/sbin/sfdisk $fs/sbin +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-uuid-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-uuid-dev/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-uuid-dev" +VERSION="2.21.1" +CATEGORY="development" +SHORT_DESC="The uuid devel files from Util linux NG." +MAINTAINER="pankso@slitaz.org" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include + cp -a $_pkg/usr/lib/libuuid.*a $fs/usr/lib + cp -a $_pkg/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig + cp -a $_pkg/usr/include/uuid $fs/usr/include +} diff -r 80a234c03f35 -r d35ad056f90e util-linux-uuid/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux-uuid/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,29 @@ +# SliTaz package receipt. + +PACKAGE="util-linux-uuid" +VERSION="2.21.1" +CATEGORY="base-system" +SHORT_DESC="The uuid utility and library from Util linux NG." +MAINTAINER="pankso@slitaz.org" +DEPENDS="glibc-base" +WANTED="util-linux" +WEB_SITE="http://kernel.org/~kzak/util-linux/" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin + cp -a $_pkg/usr/sbin/uuidd $fs/usr/sbin + cp -a $_pkg/usr/bin/uuidgen $fs/usr/bin + cp -a $_pkg/lib/libuuid.so* $fs/lib + cd $fs/usr/lib + ln -s /lib/libuuid.so.1.3.0 libuuid.so + #cp -a $_pkg/usr/lib/libuuid.so* $fs/usr/lib +} + +post_install() +{ + # Remove old libuuid from e2fsprogs package + rm $1/lib/libuuid.so.1.2 2>/dev/null + rm -rf $1/var/lib/tazpkg/installed/libuuid 2>/dev/null +} diff -r 80a234c03f35 -r d35ad056f90e util-linux/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux/receipt Mon Apr 23 16:19:05 2012 +0200 @@ -0,0 +1,35 @@ +# SliTaz package receipt. + +PACKAGE="util-linux" +VERSION="2.21.1" +CATEGORY="meta" +SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." +MAINTAINER="pankso@slitaz.org" +SOURCE="util-linux" +TARBALL="$SOURCE-$VERSION.tar.xz" +WEB_SITE="http://kernel.org/~kzak/util-linux/" +WGET_URL="http://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/$TARBALL" +COOK_OPT="!fs" +LOCALE="" + +DEPENDS="" +BUILD_DEPENDS="ncurses-dev zlib-dev" + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-fsprobe=builtin \ + --enable-partx \ + $CONFIGURE_ARGS && + make && make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin +} diff -r 80a234c03f35 -r d35ad056f90e util-linux/stuff/fix-findmnt.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux/stuff/fix-findmnt.patch Mon Apr 23 16:19:05 2012 +0200 @@ -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 80a234c03f35 -r d35ad056f90e util-linux/stuff/util-linux-ng-cfdisk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/util-linux/stuff/util-linux-ng-cfdisk.patch Mon Apr 23 16:19:05 2012 +0200 @@ -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 +