# HG changeset patch # User Aleksej Bobylev # Date 1482355273 -7200 # Node ID 96871f3890f0d046e52860c5fbb9a69ff6bf811d # Parent 708211fae5b67e83018bbad2802aee1c8f6a18a2 Up: m4, make, patch, perl, sed, tar, texinfo, util-linux, xz. The end of the Chapter 5. diff -r 708211fae5b6 -r 96871f3890f0 liblzma-dev/receipt --- a/liblzma-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/liblzma-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,22 +1,19 @@ # SliTaz package receipt. PACKAGE="liblzma-dev" -VERSION="5.2.1" +VERSION="5.2.2" CATEGORY="development" SHORT_DESC="Compressor with a high compression ratio, development files." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain LGPL2.1 GPL2 GPL3" WEB_SITE="http://tukaani.org/xz" -WANTED="xz" HOST_ARCH="i486 arm x86_64" +WANTED="xz" DEPENDS="liblzma pkg-config" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/liblzma.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/include $fs/usr + cook_copy_files *.h *.la *.pc } diff -r 708211fae5b6 -r 96871f3890f0 liblzma/receipt --- a/liblzma/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/liblzma/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,19 +1,19 @@ # SliTaz package receipt. PACKAGE="liblzma" -VERSION="5.2.1" +VERSION="5.2.2" CATEGORY="misc" SHORT_DESC="Compressor library with a high compression ratio." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain LGPL2.1 GPL2 GPL3" -WEB_SITE="http://tukaani.org/xz" +WEB_SITE="http://tukaani.org/xz/" TAGS="compression" +HOST_ARCH="i486 arm x86_64" + WANTED="xz" -HOST_ARCH="i486 arm x86_64" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/liblzma.so* $fs/usr/lib + cook_copy_files liblzma.so* } diff -r 708211fae5b6 -r 96871f3890f0 m4/receipt --- a/m4/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/m4/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -6,10 +6,11 @@ SHORT_DESC="GNU traditional Unix macro processor." MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/m4/m4.html" +HOST_ARCH="i486 arm" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/m4/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -HOST_ARCH="i486 arm" DEPENDS="glibc-base" BUILD_DEPENDS="" @@ -17,15 +18,11 @@ # Rules to configure and make the package. compile_rules() { - cd $src - ./configure $CONFIGURE_ARGS && - make && - make install + ./configure $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr + cook_copy_files m4 } diff -r 708211fae5b6 -r 96871f3890f0 make/receipt --- a/make/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/make/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,30 +1,28 @@ # SliTaz package receipt. PACKAGE="make" -VERSION="4.1" +VERSION="4.2.1" CATEGORY="development" SHORT_DESC="GNU Make to generate executables and other files from source." MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/make/" -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" +WEB_SITE="https://www.gnu.org/software/make/" HOST_ARCH="i486 arm x86_64" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" + DEPENDS="glibc-base" -BUILD_DEPENDS="" +BUILD_DEPENDS="gettext" # Rules to configure and make the package. compile_rules() { - cd $src - ./configure $CONFIGURE_ARGS && - make && make install + ./configure $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr + cook_copy_files make } diff -r 708211fae5b6 -r 96871f3890f0 microperl/receipt --- a/microperl/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/microperl/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,13 +1,30 @@ # SliTaz package receipt. PACKAGE="microperl" -VERSION="5.12.3" +VERSION="5.24.0" CATEGORY="development" SHORT_DESC="A micro version of Perl." MAINTAINER="pankso@slitaz.org" LICENSE="GPL" -WEB_SITE="http://www.perl.org/" -WANTED="perl" +WEB_SITE="https://www.perl.org/" + +TARBALL="perl-$VERSION.tar.bz2" +WGET_URL="http://www.cpan.org/src/5.0/$TARBALL" + +DEPENDS="glibc-base" +SIBLINGS="perl" + +# Rules to configure and make the package. +compile_rules() +{ +# cp Makefile.micro Makefile.micro.orig + patch -p1 -i $stuff/microperl.patch + sed -i "s|usr/local|usr|; s|perl5/5.24|perl5/5.24.0|; s|unknown|$HOST_SYSTEM|" \ + uconfig.sh + + make -f Makefile.micro regen_uconfig && + make -f Makefile.micro +} # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 708211fae5b6 -r 96871f3890f0 microperl/stuff/microperl.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/microperl/stuff/microperl.patch Wed Dec 21 23:21:13 2016 +0200 @@ -0,0 +1,40 @@ +--- a/Makefile.micro ++++ b/Makefile.micro +@@ -1,7 +1,7 @@ + LD = $(CC) + CCFLAGS = -c + DEFINES = -DPERL_CORE -DPERL_MICRO -DSTANDARD_C -DPERL_USE_SAFE_PUTENV \ +- -DNO_MATHOMS ++ -DNO_MATHOMS -DUSE_PERLIO + OPTIMIZE = + CFLAGS = $(DEFINES) $(OPTIMIZE) + LDFLAGS = +@@ -14,7 +14,7 @@ + + all: microperl + +-O = uav$(_O) udeb$(_O) udoio$(_O) udoop$(_O) udquote$(_O) udump$(_O) \ ++O = uav$(_O) ucaretx$(_O) udeb$(_O) udoio$(_O) udoop$(_O) udquote$(_O) udump$(_O) \ + uglobals$(_O) ugv$(_O) uhv$(_O) umro$(_O)\ + umg$(_O) uperlmain$(_O) uop$(_O) ureentr$(_O) \ + upad$(_O) uperl$(_O) uperlio$(_O) uperly$(_O) upp$(_O) \ +@@ -66,6 +66,9 @@ + + uav$(_O): $(HE) av.c + $(CC) $(CCFLAGS) -o $@ $(CFLAGS) av.c ++ ++ucaretx$(_O): $(HE) caretx.c ++ $(CC) $(CCFLAGS) -o $@ $(CFLAGS) caretx.c + + udeb$(_O): $(HE) deb.c + $(CC) $(CCFLAGS) -o $@ $(CFLAGS) deb.c +--- a/EXTERN.h ++++ b/EXTERN.h +@@ -57,3 +57,7 @@ + #define INIT(x) + + #undef DOINIT ++ ++#define I_LIMITS ++#define I_FCNTL ++#define I_FLOAT diff -r 708211fae5b6 -r 96871f3890f0 microperl/stuff/miniperlmain.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/microperl/stuff/miniperlmain.patch Wed Dec 21 23:21:13 2016 +0200 @@ -0,0 +1,16 @@ +--- miniperlmain.c.orig ++++ miniperlmain.c +@@ -117,13 +117,6 @@ + if (!exitstatus) + perl_run(my_perl); + +- /* Unregister our signal handler before destroying my_perl */ +- for (i = 0; PL_sig_name[i]; i++) { +- if (rsignal_state(PL_sig_num[i]) == (Sighandler_t) PL_csighandlerp) { +- rsignal(PL_sig_num[i], (Sighandler_t) SIG_DFL); +- } +- } +- + exitstatus = perl_destruct(my_perl); + + perl_free(my_perl); diff -r 708211fae5b6 -r 96871f3890f0 patch/receipt --- a/patch/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/patch/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,21 +1,24 @@ # SliTaz package receipt. PACKAGE="patch" -VERSION="2.7.4" +VERSION="2.7.5" CATEGORY="utilities" SHORT_DESC="Utilitie to patch file with diff file." MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" +WEB_SITE="http://savannah.gnu.org/projects/patch/" +HOST_ARCH="i486 arm" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/patch/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -HOST_ARCH="i486 arm" + +DEPENDS="attr" +BUILD_DEPENDS="attr-dev" # Rules to configure and make the package. compile_rules() { - ./configure $CONFIGURE_ARGS && - make && make install + ./configure $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 708211fae5b6 -r 96871f3890f0 perl/receipt --- a/perl/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/perl/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,17 +1,20 @@ # SliTaz package receipt. PACKAGE="perl" -VERSION="5.12.3" +VERSION="5.24.0" CATEGORY="development" SHORT_DESC="Full Perl interpreter and modules." MAINTAINER="pankso@slitaz.org" LICENSE="GPL" +WEB_SITE="https://www.perl.org/" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -DEPENDS="libdb gdbm zlib" -BUILD_DEPENDS="db gdbm zlib less" -WEB_SITE="http://www.perl.org/" -WGET_URL="http://ftp.funet.fi/pub/CPAN/src/$TARBALL" +WGET_URL="http://www.cpan.org/src/5.0/$TARBALL" + +DEPENDS="zlib bzlib gdbm" +BUILD_DEPENDS="zlib-dev bzip2-dev less gdbm-dev" PROVIDE="microperl" +SIBLINGS="microperl" # Rules to compile & install the temporary toolchain. cook_tmp_toolchain() @@ -24,41 +27,33 @@ make perl utilities ext/Errno/pm_to_blib } || return 1 cp perl pod/pod2man /tools/bin - mkdir -p /tools/lib/perl5/5.12.3 - cp -R lib/* /tools/lib/perl5/5.12.3 + mkdir -p /tools/lib/perl5/$VERSION + cp -R lib/* /tools/lib/perl5/$VERSION } - # Rules to configure and make the package. -# compile_rules() { - cd $src - ./configure.gnu --prefix=/usr && - make && - make install - - # make microperl here - # patch to fix compiling microperl - patch -p0 -i $stuff/miniperlmain.patch - # Install in /usr (default is /usr/local). - sed -i s/'usr\/local'/'usr'/ uconfig.sh - # Sed to search mods in /usr/lib/perl5. - sed -i s/'perl5\/5.12'/'perl5'/ uconfig.sh - # Optimisation. - sed -i s/'unknown'/'$HOST_SYSTEM'/ uconfig.sh - # Make it! - make -f Makefile.micro regen_uconfig && - make -f Makefile.micro && - strip microperl + export BUILD_ZLIB=False + export BUILD_BZIP2=0 + sh Configure -des \ + -Dprefix=/usr \ + -Dvendorprefix=/usr \ + -Dman1dir=/usr/share/man/man1 \ + -Dman3dir=/usr/share/man/man3 \ + -Dpager="/usr/bin/less -isR" \ + -Duseshrplib && + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr + cook_copy_folders bin lib + + # Save space for duplicates + rm $fs/usr/bin/perl + ln -s perl$VERSION $fs/usr/bin/perl } # Pre install commands for Tazpkg. diff -r 708211fae5b6 -r 96871f3890f0 perl/stuff/miniperlmain.patch --- a/perl/stuff/miniperlmain.patch Mon Dec 19 06:26:53 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ ---- miniperlmain.c.orig -+++ miniperlmain.c -@@ -117,13 +117,6 @@ - if (!exitstatus) - perl_run(my_perl); - -- /* Unregister our signal handler before destroying my_perl */ -- for (i = 0; PL_sig_name[i]; i++) { -- if (rsignal_state(PL_sig_num[i]) == (Sighandler_t) PL_csighandlerp) { -- rsignal(PL_sig_num[i], (Sighandler_t) SIG_DFL); -- } -- } -- - exitstatus = perl_destruct(my_perl); - - perl_free(my_perl); diff -r 708211fae5b6 -r 96871f3890f0 sed/receipt --- a/sed/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/sed/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -3,28 +3,38 @@ PACKAGE="sed" VERSION="4.2.2" CATEGORY="development" -SHORT_DESC="Gnu stream editor." +SHORT_DESC="GNU stream editor." MAINTAINER="paul@slitaz.org" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/sed/" -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" +WEB_SITE="https://www.gnu.org/software/sed/" HOST_ARCH="i486 arm" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" + DEPENDS="acl" +BUILD_DEPENDS="acl-dev gettext texinfo" # Rules to configure and make the package. compile_rules() { + patch -p1 -i $stuff/ru.po.patch + msgfmt po/ru.po -o po/ru.gmo + ./configure \ + --bindir=/bin \ + --htmldir=/usr/share/doc/sed-$VERSION \ $CONFIGURE_ARGS && - make $MAKEFLAGS && make install + make $MAKEFLAGS && make html && make install && make -C doc install-html } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr + cook_copy_files sed } +post_remove() +{ + ln -s busybox "$1/bin/sed" +} diff -r 708211fae5b6 -r 96871f3890f0 sed/stuff/ru.po.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sed/stuff/ru.po.patch Wed Dec 21 23:21:13 2016 +0200 @@ -0,0 +1,392 @@ +--- a/po/ru.po ++++ b/po/ru.po +@@ -5,25 +5,27 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: sed 4.2.0\n" ++"Project-Id-Version: sed 4.2.2\n" + "Report-Msgid-Bugs-To: bug-gnu-utils@gnu.org\n" + "POT-Creation-Date: 2012-12-22 14:36+0100\n" +-"PO-Revision-Date: 2008-01-17 23:34+0200\n" +-"Last-Translator: Pavel Maryanov \n" ++"PO-Revision-Date: 2016-12-21 17:22+0200\n" ++"Last-Translator: Aleksej Bobylev \n" + "Language-Team: Russian \n" + "Language: ru\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=n>1;\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"X-Generator: Poedit 1.8.6\n" + + #: sed/compile.c:144 + msgid "multiple `!'s" +-msgstr "несколько символов `!'" ++msgstr "несколько символов «!»" + + #: sed/compile.c:145 + msgid "unexpected `,'" +-msgstr "непредвиденный символ `,'" ++msgstr "непредвиденный символ «,»" + + #: sed/compile.c:146 + msgid "invalid usage of +N or ~N as first address" +@@ -31,11 +33,11 @@ + + #: sed/compile.c:147 + msgid "unmatched `{'" +-msgstr "непарный символ `{'" ++msgstr "непарный символ «{»" + + #: sed/compile.c:148 + msgid "unexpected `}'" +-msgstr "непредвиденный символ `}'" ++msgstr "непредвиденный символ «}»" + + #: sed/compile.c:149 + msgid "extra characters after command" +@@ -43,15 +45,15 @@ + + #: sed/compile.c:150 + msgid "expected \\ after `a', `c' or `i'" +-msgstr "ожидалась \\ после `a', `c' или `i'" ++msgstr "ожидалась \\ после «a», «c» или «i»" + + #: sed/compile.c:151 + msgid "`}' doesn't want any addresses" +-msgstr "`}' не допускает указания каких-либо адресов" ++msgstr "«}» не допускает указания каких-либо адресов" + + #: sed/compile.c:152 + msgid ": doesn't want any addresses" +-msgstr "`:' не допускает указания каких-либо адресов" ++msgstr "«:» не допускает указания каких-либо адресов" + + #: sed/compile.c:153 + msgid "comments don't accept any addresses" +@@ -71,35 +73,35 @@ + + #: sed/compile.c:157 + msgid "unterminated `s' command" +-msgstr "незавершенная команда `s'" ++msgstr "незавершенная команда «s»" + + #: sed/compile.c:158 + msgid "unterminated `y' command" +-msgstr "незавершенная команда `y'" ++msgstr "незавершенная команда «y»" + + #: sed/compile.c:159 + msgid "unknown option to `s'" +-msgstr "неизвестный модификатор к `s'" ++msgstr "неизвестный модификатор к «s»" + + #: sed/compile.c:160 + msgid "multiple `p' options to `s' command" +-msgstr "несколько модификаторов `p' с командой `s'" ++msgstr "несколько модификаторов «p» с командой «s»" + + #: sed/compile.c:161 + msgid "multiple `g' options to `s' command" +-msgstr "несколько модификаторов `g' с командой `s'" ++msgstr "несколько модификаторов «g» с командой «s»" + + #: sed/compile.c:162 + msgid "multiple number options to `s' command" +-msgstr "несколько числовых модификаторов с командой `s'" ++msgstr "несколько числовых модификаторов с командой «s»" + + #: sed/compile.c:163 + msgid "number option to `s' command may not be zero" +-msgstr "числовой модификатор для команды `s' не может быть нулевым" ++msgstr "числовой модификатор для команды «s» не может быть нулевым" + + #: sed/compile.c:164 + msgid "strings for `y' command are different lengths" +-msgstr "строки для команды `y' имеют разную длину" ++msgstr "строки для команды «y» имеют разную длину" + + #: sed/compile.c:165 + msgid "delimiter character is not a single-byte character" +@@ -116,12 +118,11 @@ + #: sed/compile.c:168 + #, c-format + msgid "unknown command: `%c'" +-msgstr "неизвестная команда: `%c'" ++msgstr "неизвестная команда: «%c»" + + #: sed/compile.c:169 +-#, fuzzy + msgid "incomplete command" +-msgstr "отсутствует команда" ++msgstr "неполная команда" + + #: sed/compile.c:192 + #, c-format +@@ -136,7 +137,7 @@ + #: sed/compile.c:1657 + #, c-format + msgid "can't find label for jump to `%s'" +-msgstr "невозможно найти метку для перехода к `%s'" ++msgstr "невозможно найти метку для перехода к «%s»" + + #: sed/execute.c:595 + #, c-format +@@ -157,11 +158,13 @@ + #, c-format + msgid "%s: warning: failed to set default file creation context to %s: %s" + msgstr "" ++"%s: предупреждние: не удалось установить контекст создания файла по " ++"умолчанию в %s: %s" + + #: sed/execute.c:647 + #, c-format + msgid "%s: warning: failed to get security context of %s: %s" +-msgstr "" ++msgstr "%s: предупреждение: не удалось получить контекст безопасности %s: %s" + + #: sed/execute.c:664 sed/utils.c:211 + #, c-format +@@ -174,11 +177,11 @@ + + #: sed/execute.c:1195 + msgid "option `e' not supported" +-msgstr "опция `e' не поддерживается" ++msgstr "опция «e» не поддерживается" + + #: sed/execute.c:1375 + msgid "`e' command not supported" +-msgstr "команда `e' не поддерживается" ++msgstr "команда «e» не поддерживается" + + #: sed/execute.c:1725 + msgid "no input files" +@@ -195,23 +198,23 @@ + #: sed/regexp.c:129 + #, c-format + msgid "invalid reference \\%d on `s' command's RHS" +-msgstr "недопустимая ссылка \\%d на RHS команды `s'" ++msgstr "недопустимая ссылка \\%d на RHS команды «s»" + + #: sed/sed.c:32 + msgid "Jay Fenlason" +-msgstr "" ++msgstr "Jay Fenlason" + + #: sed/sed.c:33 + msgid "Tom Lord" +-msgstr "" ++msgstr "Tom Lord" + + #: sed/sed.c:34 + msgid "Ken Pizzini" +-msgstr "" ++msgstr "Ken Pizzini" + + #: sed/sed.c:35 + msgid "Paolo Bonzini" +-msgstr "" ++msgstr "Paolo Bonzini" + + #: sed/sed.c:79 + #, c-format +@@ -219,15 +222,18 @@ + "GNU sed home page: .\n" + "General help using GNU software: .\n" + msgstr "" ++"Домашняя страница GNU sed: .\n" ++"Общая справка по использованию программного обеспечения GNU: .\n" + + #: sed/sed.c:86 +-#, fuzzy, c-format ++#, c-format + msgid "" + "E-mail bug reports to: <%s>.\n" + "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" + msgstr "" +-"Отчеты об ошибках отправляйте по адресу: %s .\n" +-"Убедитесь, что включили где-либо в поле ``Тема:'' слово ``%s''.\n" ++"Отчеты об ошибках отправляйте по адресу: <%s>.\n" ++"Не забудьте включить слово «%s» где-нибудь в поле «Тема:».\n" + + #: sed/sed.c:99 + msgid "" +@@ -255,7 +261,7 @@ + " suppress automatic printing of pattern space\n" + msgstr "" + " -n, --quiet, --silent\n" +-" не выводить автоматически промежутки\n" ++" подавлять автоматический вывод шаблона\n" + + #: sed/sed.c:110 + #, c-format +@@ -263,8 +269,8 @@ + " -e script, --expression=script\n" + " add the script to the commands to be executed\n" + msgstr "" +-" -e script, --expression=script\n" +-" добавление скрипта в исполняемые команды\n" ++" -e script, --expression=скрипт\n" ++" добавить скрипт в исполняемые команды\n" + + #: sed/sed.c:112 + #, c-format +@@ -273,8 +279,8 @@ + " add the contents of script-file to the commands to be " + "executed\n" + msgstr "" +-" -f script-file, --file=script-file\n" +-" добавление содержимого файла-скрипта в исполняемые команды\n" ++" -f файл-скрипта, --file=файл-скрипта\n" ++" добавить содержимое файла-скрипта в исполняемые команды\n" + + #: sed/sed.c:115 + #, c-format +@@ -286,14 +292,14 @@ + " переходить по символьным ссылкам при обработке на месте\n" + + #: sed/sed.c:118 +-#, fuzzy, c-format ++#, c-format + msgid "" + " -i[SUFFIX], --in-place[=SUFFIX]\n" + " edit files in place (makes backup if SUFFIX supplied)\n" + msgstr "" + " -i[СУФФИКС], --in-place[=СУФФИКС]\n" +-" редактирование файлов на месте (создает копию, если указано " +-"расширение)\n" ++" редактировать файлы на месте (создать копию, если указан " ++"СУФФИКС)\n" + + #: sed/sed.c:121 + #, c-format +@@ -303,7 +309,7 @@ + "specially)\n" + msgstr "" + " -b, --binary\n" +-" открывать файлы в бинарном режиме (CR+LF не " ++" открывать файлы в двоичном режиме (CR+LF не " + "обрабатываются)\n" + + #: sed/sed.c:124 +@@ -313,7 +319,7 @@ + " specify the desired line-wrap length for the `l' command\n" + msgstr "" + " -l N, --line-length=N\n" +-" указание желаемой длины переносимой строки для команды `l'\n" ++" указать желаемую длину строки для команды «l»\n" + + #: sed/sed.c:126 + #, c-format +@@ -322,7 +328,7 @@ + " disable all GNU extensions.\n" + msgstr "" + " --posix\n" +-" отключение всех расширений GNU.\n" ++" отключить все расширения GNU.\n" + + #: sed/sed.c:128 + #, c-format +@@ -331,7 +337,7 @@ + " use extended regular expressions in the script.\n" + msgstr "" + " -r, --regexp-extended\n" +-" использование в скрипте расширенных регулярных выражений.\n" ++" использовать в скрипте расширенные регулярные выражения.\n" + + #: sed/sed.c:133 + #, c-format +@@ -342,8 +348,8 @@ + " long stream.\n" + msgstr "" + " -s, --separate\n" +-" допущение, что файлы разделены, а не в виде одного\n" +-" длинного непрерывного потока.\n" ++" рассматривать файлы как отдельные, а не в виде одного\n" ++" непрерывного длинного потока.\n" + + #: sed/sed.c:136 + #, c-format +@@ -354,8 +360,8 @@ + " the output buffers more often\n" + msgstr "" + " -u, --unbuffered\n" +-" загрузка минимального объема данных из входных файлов\n" +-" и более частый сброс на диск выходных буферов\n" ++" загрузить минимальный объем данных из входных файлов\n" ++" и более часто сбрасывать на диск выходные буферы\n" + + #: sed/sed.c:139 + #, c-format +@@ -363,16 +369,18 @@ + " -z, --null-data\n" + " separate lines by NUL characters\n" + msgstr "" ++" -z, --null-data\n" ++" разделять строки символами NUL\n" + + #: sed/sed.c:141 + #, c-format + msgid " --help display this help and exit\n" +-msgstr " --help вывод этой справки и выход\n" ++msgstr " --help вывести эту справку и выйти\n" + + #: sed/sed.c:142 + #, c-format + msgid " --version output version information and exit\n" +-msgstr " --version вывод информации о версии и выход\n" ++msgstr " --version вывести информацию о версии и выйти\n" + + #: sed/sed.c:143 + #, c-format +@@ -388,7 +396,7 @@ + "Если опция -e, --expression, -f, или --file не указана, тогда первый\n" + "неопциональный аргумент берется как скрипт sed для интерпретации. Все\n" + "оставшиеся аргументы являются именами входных файлов; если входные\n" +-"файлы не указаны, тогда читается стантартный ввод.\n" ++"файлы не указаны, тогда читается стандартный ввод.\n" + "\n" + + #: sed/utils.c:74 sed/utils.c:432 +@@ -411,7 +419,8 @@ + msgid "couldn't write %d item to %s: %s" + msgid_plural "couldn't write %d items to %s: %s" + msgstr[0] "невозможно записать %d элемент в %s: %s" +-msgstr[1] "невозможно записать %d элементов в %s: %s" ++msgstr[1] "невозможно записать %d элемента в %s: %s" ++msgstr[2] "невозможно записать %d элементов в %s: %s" + + #: sed/utils.c:244 sed/utils.c:267 + #, c-format +@@ -463,15 +472,15 @@ + + #: lib/regcomp.c:153 + msgid "Unmatched [ or [^" +-msgstr "Непарный символ [ или [^" ++msgstr "Непарный [ или [^" + + #: lib/regcomp.c:156 + msgid "Unmatched ( or \\(" +-msgstr "Непарный символ ( or \\(" ++msgstr "Непарный ( или \\(" + + #: lib/regcomp.c:159 + msgid "Unmatched \\{" +-msgstr "Непарный символ \\{" ++msgstr "Непарный \\{" + + #: lib/regcomp.c:162 + msgid "Invalid content of \\{\\}" +@@ -499,7 +508,7 @@ + + #: lib/regcomp.c:180 + msgid "Unmatched ) or \\)" +-msgstr "Непарный символ ) или \\)" ++msgstr "Непарный ) или \\)" + + #: lib/regcomp.c:705 + msgid "No previous regular expression" diff -r 708211fae5b6 -r 96871f3890f0 tar/receipt --- a/tar/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/tar/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,44 +1,39 @@ # SliTaz package receipt. PACKAGE="tar" -VERSION="1.26" +VERSION="1.29" CATEGORY="utilities" SHORT_DESC="GNU tar archiving tools." MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.gnu.org/software/tar/" -WGET_URL="http://ftp.gnu.org/gnu/$PACKAGE/$TARBALL" +WEB_SITE="https://www.gnu.org/software/tar/" TAGS="archive compression" HOST_ARCH="i486 arm" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" + +DEPENDS="acl attr" +BUILD_DEPENDS="acl-dev gettext texinfo" + # Rules to configure and make the package. compile_rules() { - # this is needed since configure can't be run as root with out it - export FORCE_UNSAFE_CONFIGURE=1 + FORCE_UNSAFE_CONFIGURE=1 \ ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/$PACKAGE \ - $CONFIGURE_ARGS - make - make DESTDIR=$DESTDIR install + --bindir=/bin \ + $CONFIGURE_ARGS && + make && make install && + make -C doc install-html docdir=/usr/share/doc/tar-1.29 } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs - cp -a $install/usr/bin $fs -} - -# Prevent erasing busybox... -pre_install() -{ - rm -f "$1/bin/tar" + cook_copy_folders bin libexec } post_remove() { - ln -s /bin/busybox /bin/tar + ln -s busybox "$1/bin/tar" } diff -r 708211fae5b6 -r 96871f3890f0 texinfo/receipt --- a/texinfo/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/texinfo/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,40 +1,32 @@ # SliTaz package receipt. PACKAGE="texinfo" -VERSION="4.13a" +VERSION="6.1" CATEGORY="development" SHORT_DESC="GNU documentation tools." MAINTAINER="rcx@zoominternet.net" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/texinfo/" -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" +WEB_SITE="https://www.gnu.org/software/texinfo/" TAGS="documentation" -DEPENDS="ncurses" -BUILD_DEPENDS="ncurses-dev" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -# Rules to compile & install the temporary toolchain by Tazwok. -cook_tmp_toolchain() -{ - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -ltinfo" - ./configure && - make $MAKEFLAGS && - make install -} +DEPENDS="libtinfo perl" +BUILD_DEPENDS="perl ncurses-dev gettext" # Rules to configure and make the package. compile_rules() { - export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -ltinfo" - ./configure $CONFIGURE_ARGS && + ./configure \ + --disable-static \ + $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share/$PACKAGE $fs/usr/share + cook_copy_folders bin texinfo + find $fs/usr/lib -name '*a' -delete } diff -r 708211fae5b6 -r 96871f3890f0 util-linux-bash-completion/receipt --- a/util-linux-bash-completion/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-bash-completion/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-bash-completion" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="shells" SHORT_DESC="The BASH completions from Util Linux" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-blkid-dev/receipt --- a/util-linux-blkid-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-blkid-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-blkid-dev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="development" SHORT_DESC="The blkid from Util Linux, development files" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-blkid/receipt --- a/util-linux-blkid/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-blkid/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-blkid" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The blkid utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-blockdev/receipt --- a/util-linux-blockdev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-blockdev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-blockdev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The blockdev utility from Util Linux" MAINTAINER="devel@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-cfdisk/receipt --- a/util-linux-cfdisk/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-cfdisk/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-cfdisk" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The cfdisk utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-column/receipt --- a/util-linux-column/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-column/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-column" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The column utility from Util Linux" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-cramfs/receipt --- a/util-linux-cramfs/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-cramfs/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-cramfs" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The cramfs utilities from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-eject/receipt --- a/util-linux-eject/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-eject/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-eject" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The eject utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-fdisk-dev/receipt --- a/util-linux-fdisk-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-fdisk-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-fdisk-dev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="development" SHORT_DESC="The fdisk utility from Util Linux, development files" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-fdisk/receipt --- a/util-linux-fdisk/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-fdisk/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-fdisk" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The fdisk utility from Util Linux" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-flock/receipt --- a/util-linux-flock/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-flock/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-flock" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The flock utility from Util Linux" MAINTAINER="lufeng369@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-getopt/receipt --- a/util-linux-getopt/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-getopt/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-getopt" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The getopt utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-manpages/receipt --- a/util-linux-manpages/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-manpages/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-manpages" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="doc" SHORT_DESC="The manual pages from Util Linux" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-minix/receipt --- a/util-linux-minix/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-minix/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-minix" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The minix utilities from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-mkfs/receipt --- a/util-linux-mkfs/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-mkfs/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-mkfs" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The mkfs utilities from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-mount-dev/receipt --- a/util-linux-mount-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-mount-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-mount-dev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="development" SHORT_DESC="The mount utilities from Util Linux, development files" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-mount/receipt --- a/util-linux-mount/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-mount/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-mount" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The mount utilities from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-partx/receipt --- a/util-linux-partx/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-partx/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-partx" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The partx utilities from Util Linux NG" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-setterm/receipt --- a/util-linux-setterm/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-setterm/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="util-linux-setterm" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The setterm utility from Util Linux" MAINTAINER="devel@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-sfdisk/receipt --- a/util-linux-sfdisk/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-sfdisk/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-sfdisk" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The sfdisk utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-smartcols-dev/receipt --- a/util-linux-smartcols-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-smartcols-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-smartcols-dev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="development" SHORT_DESC="The smartcols library from Util Linux, development files" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-smartcols/receipt --- a/util-linux-smartcols/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-smartcols/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-smartcols" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="system-tools" SHORT_DESC="The smartcols library from Util Linux" MAINTAINER="al.bobylev@gmail.com" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-uuid-dev/receipt --- a/util-linux-uuid-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-uuid-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-uuid-dev" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="development" SHORT_DESC="The uuid utility and library from Util linux, development files" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-uuid/receipt --- a/util-linux-uuid/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-uuid/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-uuid" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The uuid utility and library from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux-whereis/receipt --- a/util-linux-whereis/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux-whereis/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-whereis" -VERSION="2.28" +VERSION="2.28.1" CATEGORY="base-system" SHORT_DESC="The whereis utility from Util Linux" MAINTAINER="pankso@slitaz.org" diff -r 708211fae5b6 -r 96871f3890f0 util-linux/receipt --- a/util-linux/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/util-linux/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,24 +1,28 @@ # SliTaz package receipt. PACKAGE="util-linux" -VERSION="2.28" +VERSION="2.28.1" +VER=$(echo $VERSION | cut -d. -f1,2) CATEGORY="meta" SHORT_DESC="Random collection of Linux utilities (meta package)" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2 LGPL2.1 BSD PublicDomain" WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" -TARBALL="$PACKAGE-$VERSION.tar.xz" -WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/$TARBALL" HOST_ARCH="i486 arm" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="https://www.kernel.org/pub/linux/utils/$PACKAGE/v$VER/$TARBALL" + DEPENDS="" -BUILD_DEPENDS="udev-dev ncursesw-dev libcap-ng-dev readline-dev python-dev" -SPLIT="util-linux-blkid util-linux-blkid-dev util-linux-blockdev \ -util-linux-cfdisk util-linux-column util-linux-cramfs util-linux-eject \ -util-linux-fdisk util-linux-fdisk-dev util-linux-flock util-linux-getopt \ -util-linux-minix util-linux-mkfs util-linux-mount util-linux-mount-dev \ -util-linux-partx util-linux-setterm util-linux-sfdisk util-linux-smartcols \ -util-linux-smartcols-dev util-linux-uuid util-linux-uuid-dev util-linux-whereis" +BUILD_DEPENDS="udev-dev ncursesw-dev libcap-ng-dev readline-dev python-dev \ +glib gtk-doc libxslt gettext ncurses-dev libtinfo zlib-dev" +SPLIT="util-linux-bash-completion util-linux-blkid util-linux-blkid-dev \ +util-linux-blockdev util-linux-cfdisk util-linux-column util-linux-cramfs \ +util-linux-eject util-linux-fdisk util-linux-fdisk-dev util-linux-flock \ +util-linux-getopt util-linux-manpages util-linux-minix util-linux-mkfs \ +util-linux-mount util-linux-mount-dev util-linux-partx util-linux-setterm \ +util-linux-sfdisk util-linux-smartcols util-linux-smartcols-dev \ +util-linux-uuid util-linux-uuid-dev util-linux-whereis" # Rules to configure and make the package. compile_rules() @@ -28,9 +32,20 @@ arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;; esac + mkdir -p $install/var/lib/hwclock ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - $CONFIGURE_ARGS && + ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --docdir=/usr/share/doc/util-linux-2.28.1 \ + --disable-chfn-chsh \ + --disable-login \ + --disable-nologin \ + --disable-su \ + --disable-setpriv \ + --disable-runuser \ + --disable-pylibmount \ + --disable-static \ + --without-python \ + --without-systemd \ + --without-systemdsystemunitdir && make && make install } diff -r 708211fae5b6 -r 96871f3890f0 xz-dev/receipt --- a/xz-dev/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/xz-dev/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,23 +1,20 @@ # SliTaz package receipt. PACKAGE="xz-dev" -VERSION="5.2.1" +VERSION="5.2.2" CATEGORY="base-system" SHORT_DESC="XZ and liblzma devel files" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain LGPL2.1 GPL2 GPL3" WEB_SITE="http://tukaani.org/xz" +HOST_ARCH="i486 arm x86_64" + PROVIDE="liblzma-dev" WANTED="xz" -HOST_ARCH="i486 arm x86_64" - DEPENDS="xz pkg-config" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cook_copy_files *.h *.la *.pc } diff -r 708211fae5b6 -r 96871f3890f0 xz-tools/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xz-tools/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -0,0 +1,21 @@ +# SliTaz package receipt. + +PACKAGE="xz-tools" +VERSION="5.2.2" +CATEGORY="utilities" +SHORT_DESC="Misc commandline utilities from the XZ project" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="PublicDomain LGPL2.1 GPL2 GPL3" +WEB_SITE="http://tukaani.org/xz/" +TAGS="compression" +HOST_ARCH="i486 arm x86_64" + +DEPENDS="liblzma" +WANTED="xz" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + cook_copy_folders bin + cook_split_rm xz liblzma +} diff -r 708211fae5b6 -r 96871f3890f0 xz/receipt --- a/xz/receipt Mon Dec 19 06:26:53 2016 +0200 +++ b/xz/receipt Wed Dec 21 23:21:13 2016 +0200 @@ -1,33 +1,46 @@ # SliTaz package receipt. PACKAGE="xz" -VERSION="5.2.1" +VERSION="5.2.2" CATEGORY="base-system" SHORT_DESC="General-purpose data compressor with a high compression ratio." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain LGPL2.1 GPL2 GPL3" -TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://tukaani.org/xz" -WGET_URL="$WEB_SITE/$TARBALL" +WEB_SITE="http://tukaani.org/xz/" TAGS="compression archive" HOST_ARCH="i486 arm x86_64" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$WEB_SITE$TARBALL" + DEPENDS="liblzma" -BUILD_DEPENDS="" +BUILD_DEPENDS="gettext" +SPLIT="xz-tools liblzma liblzma-dev" # Rules to configure and make the package. compile_rules() { + sed -e '/mf\.buffer = NULL/a next->coder->mf.size = 0;' \ + -i $src/src/liblzma/lz/lz_encoder.c + ./configure \ - --enable-dynamic=yes \ + --disable-static \ + --docdir=/usr/share/doc/xz-$VERSION \ --enable-small \ $CONFIGURE_ARGS && make && make install + + mkdir -p $install/bin $install/lib + for i in lzma unlzma lzcat xz unxz xzcat; do + mv $install/usr/bin/$i $install/bin + done + mv $install/usr/lib/liblzma.so.* $install/lib + ln -sf ../../lib/$(readlink $install/usr/lib/liblzma.so) \ + $install/usr/lib/liblzma.so } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/lib - cp -a $install/usr/bin/xz $fs/usr/bin + cp -a $install/bin $install/lib $fs }