wok-next rev 20861

gnutls: up (3.5.18); add libpsl and publicsuffix-list; sed: up (4.5); tar: up (1.30); tcpdump: up (4.9.2); wget: up (1.19.5); xz: up (5.2.4)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Jun 28 00:30:02 2018 +0300 (2018-06-28)
parents 8014b67fd367
children 25585466953b
files gnutls/.icon.png gnutls/receipt libpsl/receipt publicsuffix-list/receipt sed/receipt sed/stuff/patches/ru.po.patch tar/receipt tcpdump/receipt wget/receipt xz/receipt
line diff
     1.1 Binary file gnutls/.icon.png has changed
     2.1 --- a/gnutls/receipt	Wed Jun 27 16:49:04 2018 +0300
     2.2 +++ b/gnutls/receipt	Thu Jun 28 00:30:02 2018 +0300
     2.3 @@ -1,21 +1,21 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="gnutls"
     2.7 -VERSION="3.5.9"
     2.8 +VERSION="3.5.18"
     2.9  CATEGORY="security"
    2.10  SHORT_DESC="GNU Transport Layer Security Library"
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12  LICENSE="GPL3"
    2.13 -WEB_SITE="http://gnutls.org/"
    2.14 +WEB_SITE="https://gnutls.org/"
    2.15  
    2.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.17 -WGET_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$TARBALL"
    2.18 -TARBALL_MD5="0ab25eb6a1509345dd085bc21a387951"
    2.19 +WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v${VERSION%.*}/$TARBALL"
    2.20 +TARBALL_SHA1="3f56903c4eba1af9440c64ef86688f984834f0d5"
    2.21  
    2.22  BUILD_DEPENDS_arm="libtasn1-dev ncurses-dev readline-dev nettle-dev \
    2.23  libgpg-error-dev libgcrypt-dev openssl-dev gmp-dev lzip"
    2.24  BUILD_DEPENDS="nettle-dev libtasn1-dev libunistring-dev gettext openssl-dev \
    2.25 -libidn-dev unbound-dev p11-kit-dev"
    2.26 +libidn2-dev unbound-dev p11-kit-dev zlib-dev"
    2.27  SPLIT="libgnutls gnutls-dev"
    2.28  
    2.29  compile_rules() {
    2.30 @@ -40,10 +40,9 @@
    2.31  	case $PACKAGE in
    2.32  		gnutls)
    2.33  			copy bin/
    2.34 -			DEPENDS="cacerts gmp libffi libgnutls libidn libtasn1 libunistring \
    2.35 -			nettle p11-kit zlib"
    2.36  			DEPENDS_arm="nettle libgpg-error ncurses readline zlib \
    2.37  			gcc-lib-base libgnutls openssl libtasn1"
    2.38 +			DEPENDS="libgnutls libtasn1"
    2.39  			case $ARCH in
    2.40  				arm*) DEPENDS=$DEPENDS_arm;;
    2.41  			esac
    2.42 @@ -51,13 +50,13 @@
    2.43  		libgnutls)
    2.44  			copy *.so*
    2.45  			CAT="security|shared libraries"
    2.46 -			DEPENDS="cacerts gmp libidn libtasn1 libunistring nettle p11-kit \
    2.47 -			unbound zlib"
    2.48 +			DEPENDS="gmp libidn2 libp11-kit libtasn1 libunistring nettle \
    2.49 +			unbound zlib   cacerts"
    2.50  			;;
    2.51  		*-dev)
    2.52  			copy @dev
    2.53 -			DEPENDS="gnutls libgnutls gmp-dev openssl-dev libffi-dev \
    2.54 -			libidn-dev libtasn1-dev libunistring-dev nettle-dev p11-kit-dev \
    2.55 +			DEPENDS="gnutls libgnutls \
    2.56 +			gmp-dev libidn2-dev libtasn1-dev nettle-dev p11-kit-dev \
    2.57  			unbound-dev zlib-dev"
    2.58  			;;
    2.59  	esac
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/libpsl/receipt	Thu Jun 28 00:30:02 2018 +0300
     3.3 @@ -0,0 +1,40 @@
     3.4 +# SliTaz package receipt v2.
     3.5 +
     3.6 +PACKAGE="libpsl"
     3.7 +VERSION="0.20.2"
     3.8 +CATEGORY="network"
     3.9 +SHORT_DESC="C library for the Public Suffix List"
    3.10 +MAINTAINER="al.bobylev@gmail.com"
    3.11 +LICENSE="MIT"
    3.12 +WEB_SITE="https://rockdaboot.github.io/libpsl/"
    3.13 +
    3.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.15 +WGET_URL="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$VERSION/$TARBALL"
    3.16 +
    3.17 +BUILD_DEPENDS="gettext libidn2-dev libunistring-dev publicsuffix-list"
    3.18 +SPLIT="libpsl-dev"
    3.19 +
    3.20 +compile_rules() {
    3.21 +	rm -r list # remove outdated list
    3.22 +
    3.23 +	./configure \
    3.24 +		--disable-static \
    3.25 +		--with-psl-file=/usr/share/publicsuffix/effective_tld_names.dat \
    3.26 +		--with-psl-testfile=/usr/share/publicsuffix/test_psl.txt \
    3.27 +		$CONFIGURE_ARGS &&
    3.28 +	fix libtool &&
    3.29 +	make &&
    3.30 +	make install
    3.31 +}
    3.32 +
    3.33 +genpkg_rules() {
    3.34 +	case $PACKAGE in
    3.35 +		libpsl)
    3.36 +			copy @std
    3.37 +			DEPENDS="libidn2 libunistring"
    3.38 +			;;
    3.39 +		*-dev)
    3.40 +			copy @dev
    3.41 +			;;
    3.42 +	esac
    3.43 +}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/publicsuffix-list/receipt	Thu Jun 28 00:30:02 2018 +0300
     4.3 @@ -0,0 +1,30 @@
     4.4 +# SliTaz package receipt v2.
     4.5 +
     4.6 +PACKAGE="publicsuffix-list"
     4.7 +VERSION="latest"
     4.8 +CATEGORY="network"
     4.9 +SHORT_DESC="Public Suffix List"
    4.10 +MAINTAINER="al.bobylev@gmail.com"
    4.11 +LICENSE="MPL2"
    4.12 +WEB_SITE="https://publicsuffix.org/"
    4.13 +
    4.14 +compile_rules() {
    4.15 +	mkdir -p $src
    4.16 +	cd       $src
    4.17 +	wget https://github.com/publicsuffix/list/archive/master.tar.gz
    4.18 +	tar -xf master.tar.gz || return 1
    4.19 +	cd list-master
    4.20 +
    4.21 +	mkdir -p $install/usr/share/publicsuffix/
    4.22 +	cp public_suffix_list.dat tests/test_psl.txt \
    4.23 +		$install/usr/share/publicsuffix/
    4.24 +	ln -s public_suffix_list.dat \
    4.25 +		$install/usr/share/publicsuffix/effective_tld_names.dat
    4.26 +
    4.27 +	cook_pick_docs README.md
    4.28 +}
    4.29 +
    4.30 +genpkg_rules() {
    4.31 +	VERSION="$(date -u -r $src/list-master/public_suffix_list.dat +%Y%m%d-%H%M)"
    4.32 +	copy @std
    4.33 +}
     5.1 --- a/sed/receipt	Wed Jun 27 16:49:04 2018 +0300
     5.2 +++ b/sed/receipt	Thu Jun 28 00:30:02 2018 +0300
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="sed"
     5.7 -VERSION="4.4"
     5.8 +VERSION="4.5"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="GNU stream editor"
    5.11  MAINTAINER="paul@slitaz.org"
    5.12 @@ -21,7 +21,9 @@
    5.13  	./configure \
    5.14  		--bindir=/bin \
    5.15  		$CONFIGURE_ARGS &&
    5.16 -	make $MAKEFLAGS && make html && make install || return 1
    5.17 +	make $MAKEFLAGS &&
    5.18 +	make html &&
    5.19 +	make install || return 1
    5.20  
    5.21  	cook_pick_docs doc/sed.html
    5.22  }
     6.1 --- a/sed/stuff/patches/ru.po.patch	Wed Jun 27 16:49:04 2018 +0300
     6.2 +++ b/sed/stuff/patches/ru.po.patch	Thu Jun 28 00:30:02 2018 +0300
     6.3 @@ -5,12 +5,12 @@
     6.4   msgid ""
     6.5   msgstr ""
     6.6  -"Project-Id-Version: sed 4.2.2.177\n"
     6.7 -+"Project-Id-Version: sed 4.4\n"
     6.8 ++"Project-Id-Version: sed 4.5\n"
     6.9   "Report-Msgid-Bugs-To: bug-gnu-utils@gnu.org\n"
    6.10 - "POT-Creation-Date: 2017-02-03 17:17-0800\n"
    6.11 + "POT-Creation-Date: 2018-03-31 18:40-0700\n"
    6.12  -"PO-Revision-Date: 2016-12-06 19:25+0300\n"
    6.13  -"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
    6.14 -+"PO-Revision-Date: 2017-06-03 12:21+0300\n"
    6.15 ++"PO-Revision-Date: 2018-06-27 23:42+0300\n"
    6.16  +"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
    6.17   "Language-Team: Russian <gnu@d07.ru>\n"
    6.18   "Language: ru\n"
    6.19 @@ -22,77 +22,81 @@
    6.20  -"X-Generator: Lokalize 1.5\n"
    6.21  +"X-Generator: Poedit 1.8.6\n"
    6.22   
    6.23 - #: lib/closeout.c:112
    6.24 + #: lib/closeout.c:122
    6.25   msgid "write error"
    6.26  @@ -37,7 +37,7 @@
    6.27   
    6.28 - #: lib/dfa.c:1071
    6.29 + #: lib/dfa.c:1079
    6.30   msgid "invalid character class"
    6.31  -msgstr "неправильный класс символов"
    6.32  +msgstr "недопустимый класс символов"
    6.33   
    6.34 - #: lib/dfa.c:1207
    6.35 + #: lib/dfa.c:1205
    6.36   msgid "character class syntax is [[:space:]], not [:space:]"
    6.37  @@ -49,11 +49,11 @@
    6.38   
    6.39 - #: lib/dfa.c:1436
    6.40 + #: lib/dfa.c:1433
    6.41   msgid "invalid content of \\{\\}"
    6.42  -msgstr "неправильное содержимое в \\{\\}"
    6.43  +msgstr "недопустимое содержимое в \\{\\}"
    6.44   
    6.45 - #: lib/dfa.c:1439
    6.46 + #: lib/dfa.c:1436
    6.47   msgid "regular expression too big"
    6.48  -msgstr "регулярное выражение слишком большое"
    6.49  +msgstr "регулярное выражение слишком длинное"
    6.50   
    6.51 - #: lib/dfa.c:1853
    6.52 + #: lib/dfa.c:1850
    6.53   msgid "unbalanced ("
    6.54 -@@ -84,17 +84,17 @@
    6.55 - #: lib/getopt.c:654 lib/getopt.c:658
    6.56 +@@ -72,29 +72,29 @@
    6.57 + msgstr "Неизвестная системная ошибка"
    6.58 + 
    6.59 + #: lib/getopt.c:278
    6.60 +-#, fuzzy, c-format
    6.61 ++#, c-format
    6.62 + msgid "%s: option '%s%s' is ambiguous\n"
    6.63 +-msgstr "%s: двусмысленный параметр «%s»\n"
    6.64 ++msgstr "%s: двусмысленный параметр «%s%s»\n"
    6.65 + 
    6.66 + #: lib/getopt.c:284
    6.67 +-#, fuzzy, c-format
    6.68 ++#, c-format
    6.69 + msgid "%s: option '%s%s' is ambiguous; possibilities:"
    6.70 +-msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
    6.71 ++msgstr "%s: двусмысленный параметр «%s%s»; возможные варианты:"
    6.72 + 
    6.73 + #: lib/getopt.c:319
    6.74 +-#, fuzzy, c-format
    6.75 ++#, c-format
    6.76 + msgid "%s: unrecognized option '%s%s'\n"
    6.77 +-msgstr "%s: нераспознанный параметр «%c%s»\n"
    6.78 ++msgstr "%s: нераспознанный параметр «%s%s»\n"
    6.79 + 
    6.80 + #: lib/getopt.c:345
    6.81 +-#, fuzzy, c-format
    6.82 ++#, c-format
    6.83 + msgid "%s: option '%s%s' doesn't allow an argument\n"
    6.84 +-msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
    6.85 ++msgstr "%s: параметр «%s%s» не допускает использование аргумента\n"
    6.86 + 
    6.87 + #: lib/getopt.c:360
    6.88 +-#, fuzzy, c-format
    6.89 ++#, c-format
    6.90 + msgid "%s: option '%s%s' requires an argument\n"
    6.91 +-msgstr "%s: для параметра «--%s» требуется аргумент\n"
    6.92 ++msgstr "%s: параметр «%s%s» требует аргумент\n"
    6.93 + 
    6.94 + #: lib/getopt.c:621
    6.95   #, c-format
    6.96 - msgid "%s: option '--%s' doesn't allow an argument\n"
    6.97 --msgstr "%s: у параметра «--%s» не может быть аргумента\n"
    6.98 -+msgstr "%s: параметр «--%s» не допускает использование аргумента\n"
    6.99 - 
   6.100 - #: lib/getopt.c:667 lib/getopt.c:672
   6.101 - #, c-format
   6.102 - msgid "%s: option '%c%s' doesn't allow an argument\n"
   6.103 --msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
   6.104 -+msgstr "%s: параметр «%c%s» не допускает использование аргумента\n"
   6.105 - 
   6.106 - #: lib/getopt.c:715 lib/getopt.c:734
   6.107 - #, c-format
   6.108 - msgid "%s: option '--%s' requires an argument\n"
   6.109 --msgstr "%s: для параметра «--%s» требуется аргумент\n"
   6.110 -+msgstr "%s: параметр «--%s» требует аргумент\n"
   6.111 - 
   6.112 - #: lib/getopt.c:772 lib/getopt.c:775
   6.113 - #, c-format
   6.114 -@@ -114,7 +114,7 @@
   6.115 - #: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136
   6.116 +@@ -104,7 +104,7 @@
   6.117 + #: lib/getopt.c:636 lib/getopt.c:682
   6.118   #, c-format
   6.119   msgid "%s: option requires an argument -- '%c'\n"
   6.120  -msgstr "%s: для параметра требуется аргумент — «%c»\n"
   6.121  +msgstr "%s: параметр требует аргумент — «%c»\n"
   6.122   
   6.123 - #: lib/getopt.c:964 lib/getopt.c:980
   6.124 - #, c-format
   6.125 -@@ -124,12 +124,12 @@
   6.126 - #: lib/getopt.c:1004 lib/getopt.c:1022
   6.127 - #, c-format
   6.128 - msgid "%s: option '-W %s' doesn't allow an argument\n"
   6.129 --msgstr "%s: с параметром «-W %s» нельзя использовать аргумент\n"
   6.130 -+msgstr "%s: параметр «-W %s» не допускает использование аргумента\n"
   6.131 - 
   6.132 - #: lib/getopt.c:1043 lib/getopt.c:1061
   6.133 - #, c-format
   6.134 - msgid "%s: option '-W %s' requires an argument\n"
   6.135 --msgstr "%s: для параметра «-W %s» требуется аргумент\n"
   6.136 -+msgstr "%s: параметр «-W %s» требует аргумент\n"
   6.137 - 
   6.138   #: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34
   6.139   msgid "memory exhausted"
   6.140 -@@ -178,7 +178,7 @@
   6.141 +@@ -153,7 +153,7 @@
   6.142   
   6.143   #: lib/regcomp.c:144
   6.144   msgid "Invalid collation character"
   6.145 @@ -101,7 +105,7 @@
   6.146   
   6.147   #: lib/regcomp.c:147
   6.148   msgid "Invalid character class name"
   6.149 -@@ -198,7 +198,7 @@
   6.150 +@@ -173,7 +173,7 @@
   6.151   
   6.152   #: lib/regcomp.c:159
   6.153   msgid "Unmatched ( or \\("
   6.154 @@ -110,7 +114,7 @@
   6.155   
   6.156   #: lib/regcomp.c:162
   6.157   msgid "Unmatched \\{"
   6.158 -@@ -226,7 +226,7 @@
   6.159 +@@ -201,7 +201,7 @@
   6.160   
   6.161   #: lib/regcomp.c:180
   6.162   msgid "Regular expression too big"
   6.163 @@ -119,8 +123,20 @@
   6.164   
   6.165   #: lib/regcomp.c:183
   6.166   msgid "Unmatched ) or \\)"
   6.167 -@@ -271,7 +271,7 @@
   6.168 - "Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl."
   6.169 +@@ -234,7 +234,6 @@
   6.170 + msgstr "©"
   6.171 + 
   6.172 + #: lib/version-etc.c:86
   6.173 +-#, fuzzy
   6.174 + msgid ""
   6.175 + "\n"
   6.176 + "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl."
   6.177 +@@ -244,10 +243,10 @@
   6.178 + "\n"
   6.179 + msgstr ""
   6.180 + "\n"
   6.181 +-"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl."
   6.182 ++"Лицензия GPLv3+: GNU GPL версии 3 или новее <https://gnu.org/licenses/gpl."
   6.183   "html>\n"
   6.184   "Это свободное ПО: вы можете продавать и распространять его.\n"
   6.185  -"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
   6.186 @@ -128,7 +144,25 @@
   6.187   "\n"
   6.188   
   6.189   #. TRANSLATORS: %s denotes an author name.
   6.190 -@@ -469,35 +469,35 @@
   6.191 +@@ -383,14 +382,13 @@
   6.192 + msgstr "Домашняя страница %s: <%s>\n"
   6.193 + 
   6.194 + #: lib/version-etc.c:253
   6.195 +-#, fuzzy, c-format
   6.196 ++#, c-format
   6.197 + msgid "%s home page: <https://www.gnu.org/software/%s/>\n"
   6.198 +-msgstr "Домашняя страница %s: <http://www.gnu.org/software/%s/>\n"
   6.199 ++msgstr "Домашняя страница %s: <https://www.gnu.org/software/%s/>\n"
   6.200 + 
   6.201 + #: lib/version-etc.c:256
   6.202 +-#, fuzzy
   6.203 + msgid "General help using GNU software: <https://www.gnu.org/gethelp/>\n"
   6.204 +-msgstr "Справка по работе с программами GNU: <http://www.gnu.org/gethelp/>\n"
   6.205 ++msgstr "Справка по работе с программами GNU: <https://www.gnu.org/gethelp/>\n"
   6.206 + 
   6.207 + #: sed/compile.c:146
   6.208 + msgid "multiple `!'s"
   6.209 +@@ -446,35 +444,35 @@
   6.210   
   6.211   #: sed/compile.c:165
   6.212   msgid "unterminated `s' command"
   6.213 @@ -172,7 +206,7 @@
   6.214   
   6.215   #: sed/compile.c:179
   6.216   msgid "delimiter character is not a single-byte character"
   6.217 -@@ -514,7 +514,7 @@
   6.218 +@@ -491,7 +489,7 @@
   6.219   #: sed/compile.c:184
   6.220   #, c-format
   6.221   msgid "unknown command: `%c'"
   6.222 @@ -181,45 +215,67 @@
   6.223   
   6.224   #: sed/compile.c:186
   6.225   msgid "incomplete command"
   6.226 -@@ -541,12 +541,12 @@
   6.227 - #: sed/compile.c:1639
   6.228 +@@ -518,12 +516,12 @@
   6.229 + #: sed/compile.c:1644
   6.230   #, c-format
   6.231   msgid "can't find label for jump to `%s'"
   6.232  -msgstr "невозможно найти метку для перехода к `%s'"
   6.233  +msgstr "невозможно найти метку для перехода к «%s»"
   6.234   
   6.235 - #: sed/execute.c:264 sed/execute.c:281
   6.236 + #: sed/execute.c:254 sed/execute.c:271
   6.237   #, c-format
   6.238   msgid "case conversion produced an invalid character"
   6.239  -msgstr "при преобразовании регистра получился некорректный символ"
   6.240  +msgstr "при преобразовании регистра получился недопустимый символ"
   6.241   
   6.242 - #: sed/execute.c:575
   6.243 + #: sed/execute.c:565
   6.244   #, c-format
   6.245 -@@ -586,11 +586,11 @@
   6.246 +@@ -563,11 +561,11 @@
   6.247   
   6.248 - #: sed/execute.c:1160
   6.249 + #: sed/execute.c:1150
   6.250   msgid "option `e' not supported"
   6.251  -msgstr "опция `e' не поддерживается"
   6.252  +msgstr "параметр «e» не поддерживается"
   6.253   
   6.254 - #: sed/execute.c:1349
   6.255 + #: sed/execute.c:1339
   6.256   msgid "`e' command not supported"
   6.257  -msgstr "команда `e' не поддерживается"
   6.258  +msgstr "команда «e» не поддерживается"
   6.259   
   6.260 - #: sed/execute.c:1675
   6.261 + #: sed/execute.c:1665
   6.262   msgid "no input files"
   6.263 -@@ -603,7 +603,7 @@
   6.264 - #: sed/regexp.c:138
   6.265 +@@ -580,11 +578,11 @@
   6.266 + #: sed/regexp.c:141
   6.267   #, c-format
   6.268   msgid "invalid reference \\%d on `s' command's RHS"
   6.269  -msgstr "недопустимая ссылка \\%d на RHS команды `s'"
   6.270  +msgstr "недопустимая ссылка \\%d на RHS команды «s»"
   6.271   
   6.272 + #: sed/regexp.c:259
   6.273 + msgid "regex input buffer length larger than INT_MAX"
   6.274 +-msgstr ""
   6.275 ++msgstr "длина входного буфера регулярного выражения превышает INT_MAX"
   6.276 + 
   6.277   #: sed/sed.c:35
   6.278   msgid "Jay Fenlason"
   6.279 -@@ -641,7 +641,7 @@
   6.280 +@@ -603,13 +601,13 @@
   6.281 + msgstr "Паоло Бонзини (Paolo Bonzini)"
   6.282 + 
   6.283 + #: sed/sed.c:113
   6.284 +-#, fuzzy, c-format
   6.285 ++#, c-format
   6.286 + msgid ""
   6.287 + "GNU sed home page: <https://www.gnu.org/software/sed/>.\n"
   6.288 + "General help using GNU software: <https://www.gnu.org/gethelp/>.\n"
   6.289 + msgstr ""
   6.290 +-"Домашняя страница GNU sed: <http://www.gnu.org/software/sed/>.\n"
   6.291 +-"Справка по работе с программами GNU: <http://www.gnu.org/gethelp/>.\n"
   6.292 ++"Домашняя страница GNU sed: <https://www.gnu.org/software/sed/>.\n"
   6.293 ++"Справка по работе с программами GNU: <https://www.gnu.org/gethelp/>.\n"
   6.294 + 
   6.295 + #: sed/sed.c:120
   6.296 + #, c-format
   6.297 +@@ -622,7 +620,7 @@
   6.298   "                 use Perl 5's regular expressions syntax in the script.\n"
   6.299   msgstr ""
   6.300   "  -R, --regexp-perl\n"
   6.301 @@ -228,7 +284,7 @@
   6.302   "Perl 5.\n"
   6.303   
   6.304   #: sed/sed.c:134
   6.305 -@@ -650,7 +650,7 @@
   6.306 +@@ -631,7 +629,7 @@
   6.307   "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n"
   6.308   "\n"
   6.309   msgstr ""
   6.310 @@ -237,7 +293,7 @@
   6.311   "[входной-файл]...\n"
   6.312   "\n"
   6.313   
   6.314 -@@ -661,7 +661,7 @@
   6.315 +@@ -642,7 +640,7 @@
   6.316   "                 suppress automatic printing of pattern space\n"
   6.317   msgstr ""
   6.318   "  -n, --quiet, --silent\n"
   6.319 @@ -246,25 +302,29 @@
   6.320   
   6.321   #: sed/sed.c:140
   6.322   #, c-format
   6.323 -@@ -670,7 +670,7 @@
   6.324 +@@ -650,8 +648,8 @@
   6.325 + "  -e script, --expression=script\n"
   6.326   "                 add the script to the commands to be executed\n"
   6.327   msgstr ""
   6.328 - "  -e script, --expression=script\n"
   6.329 +-"  -e script, --expression=script\n"
   6.330  -"                 добавление скрипта в исполняемые команды\n"
   6.331 ++"  -e скрипт, --expression=скрипт\n"
   6.332  +"                 добавить скрипт в исполняемые команды\n"
   6.333   
   6.334   #: sed/sed.c:142
   6.335   #, c-format
   6.336 -@@ -680,7 +680,7 @@
   6.337 +@@ -660,8 +658,8 @@
   6.338 + "                 add the contents of script-file to the commands to be "
   6.339   "executed\n"
   6.340   msgstr ""
   6.341 - "  -f script-file, --file=script-file\n"
   6.342 +-"  -f script-file, --file=script-file\n"
   6.343  -"                 добавление содержимого файла-скрипта в исполняемые команды\n"
   6.344 ++"  -f файл-скрипта, --file=файл-скрипта\n"
   6.345  +"                 добавить содержимое файла-скрипта в исполняемые команды\n"
   6.346   
   6.347   #: sed/sed.c:146
   6.348   #, c-format
   6.349 -@@ -698,7 +698,7 @@
   6.350 +@@ -679,7 +677,7 @@
   6.351   "                 edit files in place (makes backup if SUFFIX supplied)\n"
   6.352   msgstr ""
   6.353   "  -i[СУФФИКС], --in-place[=СУФФИКС]\n"
   6.354 @@ -273,7 +333,7 @@
   6.355   "СУФФИКС)\n"
   6.356   
   6.357   #: sed/sed.c:153
   6.358 -@@ -719,7 +719,7 @@
   6.359 +@@ -700,7 +698,7 @@
   6.360   "                 specify the desired line-wrap length for the `l' command\n"
   6.361   msgstr ""
   6.362   "  -l N, --line-length=N\n"
   6.363 @@ -282,7 +342,7 @@
   6.364   
   6.365   #: sed/sed.c:159
   6.366   #, c-format
   6.367 -@@ -728,7 +728,7 @@
   6.368 +@@ -709,7 +707,7 @@
   6.369   "                 disable all GNU extensions.\n"
   6.370   msgstr ""
   6.371   "  --posix\n"
   6.372 @@ -291,16 +351,18 @@
   6.373   
   6.374   #: sed/sed.c:161
   6.375   #, c-format
   6.376 -@@ -738,7 +738,7 @@
   6.377 +@@ -719,8 +717,8 @@
   6.378   "                 (for portability use POSIX -E).\n"
   6.379   msgstr ""
   6.380   "  -E, -r, --regexp-extended\n"
   6.381  -"                 использование в скрипте расширенных регулярных выражений\n"
   6.382 +-"                 (для переносимости используйте -E (POSIX)\n"
   6.383  +"                 использовать в скрипте расширенные регулярные выражения\n"
   6.384 - "                 (для переносимости используйте -E (POSIX)\n"
   6.385 ++"                 (для переносимости используйте POSIX-ключ -E).\n"
   6.386   
   6.387   #: sed/sed.c:167
   6.388 -@@ -749,8 +749,8 @@
   6.389 + #, c-format
   6.390 +@@ -730,17 +728,18 @@
   6.391   "                 continuous long stream.\n"
   6.392   msgstr ""
   6.393   "  -s, --separate\n"
   6.394 @@ -310,13 +372,16 @@
   6.395  +"                 длинного непрерывного потока.\n"
   6.396   
   6.397   #: sed/sed.c:170
   6.398 - #, c-format
   6.399 -@@ -759,7 +759,7 @@
   6.400 - "                 operate in sandbox mode.\n"
   6.401 +-#, fuzzy, c-format
   6.402 ++#, c-format
   6.403 + msgid ""
   6.404 + "      --sandbox\n"
   6.405 + "                 operate in sandbox mode (disable e/r/w commands).\n"
   6.406   msgstr ""
   6.407   "      --sandbox\n"
   6.408  -"                 работать в режиме «песочницы»\n"
   6.409 -+"                 работать в режиме «песочницы».\n"
   6.410 ++"                 работать в режиме «песочницы» (команды «e», «r» и «w»\n"
   6.411 ++"                 отключены).\n"
   6.412   
   6.413   #: sed/sed.c:172
   6.414   #, c-format
     7.1 --- a/tar/receipt	Wed Jun 27 16:49:04 2018 +0300
     7.2 +++ b/tar/receipt	Thu Jun 28 00:30:02 2018 +0300
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt v2.
     7.5  
     7.6  PACKAGE="tar"
     7.7 -VERSION="1.29"
     7.8 +VERSION="1.30"
     7.9  CATEGORY="utilities"
    7.10  SHORT_DESC="GNU tar archiving tools"
    7.11  MAINTAINER="pankso@slitaz.org"
    7.12 @@ -9,7 +9,7 @@
    7.13  WEB_SITE="https://www.gnu.org/software/tar/"
    7.14  LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/tar.html"
    7.15  
    7.16 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    7.17 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.18  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    7.19  
    7.20  BUILD_DEPENDS="acl-dev gettext texinfo"
    7.21 @@ -19,12 +19,13 @@
    7.22  	./configure \
    7.23  		--bindir=/bin \
    7.24  		$CONFIGURE_ARGS &&
    7.25 -	make && make install &&
    7.26 -	make -C doc install-html docdir=/usr/share/doc/tar-$VERSION
    7.27 +	make &&
    7.28 +	make install &&
    7.29 +	make -C doc install-html
    7.30  }
    7.31  
    7.32  genpkg_rules() {
    7.33  	copy @std
    7.34 -	DEPENDS="acl attr"
    7.35 +	DEPENDS="acl"
    7.36  	TAGS="LFS archive compression"
    7.37  }
     8.1 --- a/tcpdump/receipt	Wed Jun 27 16:49:04 2018 +0300
     8.2 +++ b/tcpdump/receipt	Thu Jun 28 00:30:02 2018 +0300
     8.3 @@ -1,32 +1,32 @@
     8.4 -# SliTaz package receipt.
     8.5 +# SliTaz package receipt v2.
     8.6  
     8.7  PACKAGE="tcpdump"
     8.8 -VERSION="4.4.0"
     8.9 +VERSION="4.9.2"
    8.10  CATEGORY="security"
    8.11 -SHORT_DESC="cli wire sniffer"
    8.12 +SHORT_DESC="Powerful command-line packet analyzer"
    8.13  MAINTAINER="sdaigl@lacitec.on.ca"
    8.14  LICENSE="BSD"
    8.15 +WEB_SITE="http://www.tcpdump.org/"
    8.16 +
    8.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.18 -WEB_SITE="http://www.tcpdump.org/"
    8.19  WGET_URL="http://www.tcpdump.org/release/$TARBALL"
    8.20 -TAGS="network security"
    8.21  
    8.22 -DEPENDS="openssl libpcap"
    8.23 -BUILD_DEPENDS="libpcap libpcap-dev openssl-dev"
    8.24 +BUILD_DEPENDS="libpcap-dev openssl-dev libcap-ng-dev"
    8.25  
    8.26 -# Rules to configure and make the package.
    8.27 -compile_rules()
    8.28 -{
    8.29 -	cd $src
    8.30 -	./configure --prefix=/usr --infodir=/usr/share/info \
    8.31 -	--mandir=/usr/share/man $CONFIGURE_ARGS
    8.32 -	make
    8.33 -	make DESTDIR=$DESTDIR install
    8.34 +compile_rules() {
    8.35 +	./configure \
    8.36 +		--with-system-libpcap \
    8.37 +		--with-crypto \
    8.38 +		--with-cap-ng \
    8.39 +		$CONFIGURE_ARGS &&
    8.40 +	make &&
    8.41 +	make install || return 1
    8.42 +
    8.43 +	find $install -type f -name "tcpdump.$VERSION" -delete # the same as un-suffixed one
    8.44  }
    8.45  
    8.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.47 -genpkg_rules()
    8.48 -{
    8.49 -	mkdir -p $fs/usr
    8.50 -	cp -a $install/usr/sbin $fs/usr
    8.51 +genpkg_rules() {
    8.52 +	copy @std
    8.53 +	DEPENDS="libcap-ng libpcap openssl"
    8.54 +	TAGS="network security"
    8.55  }
     9.1 --- a/wget/receipt	Wed Jun 27 16:49:04 2018 +0300
     9.2 +++ b/wget/receipt	Thu Jun 28 00:30:02 2018 +0300
     9.3 @@ -1,34 +1,49 @@
     9.4  # SliTaz package receipt v2.
     9.5  
     9.6  PACKAGE="wget"
     9.7 -VERSION="1.19.1"
     9.8 +VERSION="1.19.5"
     9.9  CATEGORY="network"
    9.10  SHORT_DESC="GNU Wget - the non-interactive network downloader"
    9.11  MAINTAINER="sygne@ombres.eu"
    9.12  LICENSE="GPL3"
    9.13  WEB_SITE="https://www.gnu.org/software/wget/"
    9.14  
    9.15 -TARBALL="$PACKAGE-$VERSION.tar.xz"
    9.16 +TARBALL="$PACKAGE-$VERSION.tar.lz"
    9.17  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    9.18  
    9.19 -BUILD_DEPENDS="openssl-dev libidn-dev util-linux-uuid-dev gettext zlib-dev \
    9.20 -perl pcre-dev"
    9.21 +BUILD_DEPENDS="lzip openssl-dev libidn2-dev util-linux-uuid-dev gettext \
    9.22 +zlib-dev perl pcre-dev libpsl-dev gnutls-dev"
    9.23 +SPLIT="wget+gnutls:gnutls"
    9.24  
    9.25  compile_rules() {
    9.26  	case "$ARCH" in
    9.27  		arm) ARCH_ARGS="--with-libssl-prefix=/cross/$ARCH/sysroot/usr/lib" ;;
    9.28  	esac
    9.29  
    9.30 +	case $SET in
    9.31 +		'')     SET_ARGS='--with-ssl=openssl';;
    9.32 +		gnutls) SET_ARGS='--with-ssl=gnutls';;
    9.33 +	esac
    9.34 +
    9.35  	./configure \
    9.36 -		--with-ssl=openssl \
    9.37 -		--with-openssl \
    9.38  		$ARCH_ARGS \
    9.39 +		$SET_ARGS \
    9.40  		$CONFIGURE_ARGS &&
    9.41  	make DESTDIR=$DESTDIR install
    9.42  }
    9.43  
    9.44  genpkg_rules() {
    9.45  	copy @std
    9.46 -	DEPENDS="libpcre openssl util-linux-uuid zlib"
    9.47 +	case $PACKAGE in
    9.48 +		wget)
    9.49 +			DEPENDS="libidn2 libpcre libpsl openssl util-linux-uuid zlib"
    9.50 +			;;
    9.51 +		wget+gnutls)
    9.52 +			DEPENDS="libgnutls libidn2 libpcre libpsl nettle util-linux-uuid \
    9.53 +			zlib"
    9.54 +			CAT="network|using GNUTLS instead of OpenSSL"
    9.55 +			PROVIDE="wget"
    9.56 +			;;
    9.57 +	esac
    9.58  	CONFIG_FILES="/etc/wgetrc"
    9.59  }
    10.1 --- a/xz/receipt	Wed Jun 27 16:49:04 2018 +0300
    10.2 +++ b/xz/receipt	Thu Jun 28 00:30:02 2018 +0300
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt v2.
    10.5  
    10.6  PACKAGE="xz"
    10.7 -VERSION="5.2.3"
    10.8 +VERSION="5.2.4"
    10.9  CATEGORY="base-system"
   10.10  SHORT_DESC="XZ Utils"
   10.11  MAINTAINER="pascal.bellard@slitaz.org"