wok-next rev 21135
Up libgcrypt (1.8.4), libpgp-error (1.34), libxml2 (2.9.9), libxslt (1.1.33).
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jan 20 16:02:24 2019 +0200 (2019-01-20) |
| parents | 7f6d8049fcec |
| children | 994f7b97ebea |
| files | libgcrypt/receipt libgpg-error/receipt libxml2/receipt libxml2/stuff/patches/libxml2-2.9.8-python3_hack-1.patch libxml2/stuff/patches/series libxslt/receipt |
line diff
1.1 --- a/libgcrypt/receipt Sun Jan 20 15:38:18 2019 +0200 1.2 +++ b/libgcrypt/receipt Sun Jan 20 16:02:24 2019 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="libgcrypt" 1.7 -VERSION="1.8.3" 1.8 +VERSION="1.8.4" 1.9 CATEGORY="security" 1.10 SHORT_DESC="Cryptographic library based on GnuPG" 1.11 MAINTAINER="devel@slitaz.org" 1.12 @@ -11,30 +11,20 @@ 1.13 1.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.15 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$TARBALL" 1.16 +TARBALL_SHA1="4a8ef9db6922f3a31992aca5640b4198a69b58fc" 1.17 # https://www.gnupg.org/download/integrity_check.html 1.18 -TARBALL_SHA1="13bd2ce69e59ab538e959911dfae80ea309636e3" 1.19 1.20 COOKOPTS="force-arch" # different configs 1.21 1.22 BUILD_DEPENDS="libgpg-error-dev" 1.23 SPLIT="$PACKAGE-dev" 1.24 1.25 +DEPENDS_std="libgpg-error" 1.26 +DEPENDS_dev="$PACKAGE libgpg-error-dev" 1.27 + 1.28 compile_rules() { 1.29 ./configure $CONFIGURE_ARGS && 1.30 fix libtool && 1.31 make && 1.32 make install 1.33 } 1.34 - 1.35 -genpkg_rules() { 1.36 - case $PACKAGE in 1.37 - libgcrypt) 1.38 - copy @std 1.39 - DEPENDS="libgpg-error" 1.40 - ;; 1.41 - *-dev) 1.42 - copy @dev 1.43 - DEPENDS="libgcrypt libgpg-error-dev" 1.44 - ;; 1.45 - esac 1.46 -}
2.1 --- a/libgpg-error/receipt Sun Jan 20 15:38:18 2019 +0200 2.2 +++ b/libgpg-error/receipt Sun Jan 20 16:02:24 2019 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="libgpg-error" 2.7 -VERSION="1.33" 2.8 +VERSION="1.34" 2.9 CATEGORY="security" 2.10 SHORT_DESC="Commons error messages for GnuPG" 2.11 MAINTAINER="devel@slitaz.org" 2.12 @@ -11,7 +11,7 @@ 2.13 2.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.15 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$TARBALL" 2.16 -TARBALL_SHA1="bd40bf4cb6a0b725f5ea91b68d6ae5aeb387a750" 2.17 +TARBALL_SHA1="0a3e67e428a2e051a94cabd9fb140bf49fdc13d0" 2.18 # https://www.gnupg.org/download/integrity_check.html 2.19 2.20 COOKOPTS="force-arch" # different configs, .h, .pc 2.21 @@ -19,7 +19,8 @@ 2.22 BUILD_DEPENDS="gettext-dev" 2.23 SPLIT="$PACKAGE-dev $PACKAGE" 2.24 2.25 -COPY_dev="@dev common-lisp/" 2.26 +COPY_dev="@dev *.so common-lisp/" 2.27 +DEPENDS_dev="$PACKAGE" 2.28 2.29 compile_rules() { 2.30 ./configure $CONFIGURE_ARGS &&
3.1 --- a/libxml2/receipt Sun Jan 20 15:38:18 2019 +0200 3.2 +++ b/libxml2/receipt Sun Jan 20 16:02:24 2019 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="libxml2" 3.7 -VERSION="2.9.8" 3.8 +VERSION="2.9.9" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="XML C parser and toolkit" 3.11 MAINTAINER="devel@slitaz.org" 3.12 @@ -11,16 +11,16 @@ 3.13 3.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.15 WGET_URL="http://xmlsoft.org/sources/$TARBALL" 3.16 -TARBALL_SHA1="66bcefd98a6b7573427cf66f9d3841b59eb5b8c3" 3.17 +TARBALL_SHA1="96686d1dd9fddf3b35a28b1e2e4bbacac889add3" 3.18 3.19 BUILD_DEPENDS="zlib-dev xz-dev python3-dev python-dev ncurses-dev readline-dev" 3.20 SPLIT="$PACKAGE-tools $PACKAGE-python $PACKAGE-python3 $PACKAGE-dev" 3.21 3.22 -COPY_std="libxml2.so*" 3.23 +COPY_std="libxml2.so.*" 3.24 COPY_tools="xmllint xmlcatalog" 3.25 -COPY_python="python2.*/site-packages/*.py python2.*/site-packages/*.so" 3.26 -COPY_python3="python3.*/site-packages/*.py python3.*/site-packages/*.so" 3.27 -COPY_dev="@dev *.sh" 3.28 +COPY_python="python2.*/*/*.py python2.*/*/*.so" 3.29 +COPY_python3="python3.*/*/*.py python3.*/*/*.so" 3.30 +COPY_dev="@dev *.sh libxml2.so" 3.31 3.32 DEPENDS_std="liblzma zlib" 3.33 DEPENDS_tools="$PACKAGE readline" 3.34 @@ -29,11 +29,10 @@ 3.35 DEPENDS_dev="xz-dev zlib-dev $PACKAGE-tools" 3.36 3.37 CAT_tools="system-tools|utilities" 3.38 -CAT_python="development|adapter for the Python" 3.39 +CAT_python="development|adapter for the Python2" 3.40 +CAT_python3="development|adapter for the Python3" 3.41 3.42 compile_rules() { 3.43 - sed -i '/_PyVerify_fd/,+1d' python/types.c 3.44 - 3.45 ./configure \ 3.46 --disable-static \ 3.47 --with-history \
4.1 --- a/libxml2/stuff/patches/libxml2-2.9.8-python3_hack-1.patch Sun Jan 20 15:38:18 2019 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,41 +0,0 @@ 4.4 -Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr> 4.5 -Date: 2017-11-23 4.6 -Initial Package Version: 2.9.7 4.7 -Upstream Status: Bug reported (https://bugzilla.gnome.org/show_bug.cgi?id=789714) 4.8 -Origin: Jan Majetek/OpenSuse (https://bugzilla.opensuse.org/show_bug.cgi?id=1065270) 4.9 -Description: Fix a segfault in the Python 3 module. It is only a hack. 4.10 - 4.11 -Index: libxml2-2.9.5/python/libxml.c 4.12 -=================================================================== 4.13 ---- libxml2-2.9.5.orig/python/libxml.c 4.14 -+++ libxml2-2.9.5/python/libxml.c 4.15 -@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU 4.16 - PyObject *message; 4.17 - PyObject *result; 4.18 - char str[1000]; 4.19 -+ unsigned char *ptr = (unsigned char *)str; 4.20 - 4.21 - #ifdef DEBUG_ERROR 4.22 - printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); 4.23 -@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU 4.24 - str[999] = 0; 4.25 - va_end(ap); 4.26 - 4.27 -+#if PY_MAJOR_VERSION >= 3 4.28 -+ /* Ensure the error string doesn't start at UTF8 continuation. */ 4.29 -+ while (*ptr && (*ptr & 0xc0) == 0x80) 4.30 -+ ptr++; 4.31 -+#endif 4.32 -+ 4.33 - list = PyTuple_New(2); 4.34 - PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); 4.35 - Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); 4.36 -- message = libxml_charPtrConstWrap(str); 4.37 -+ message = libxml_charPtrConstWrap(ptr); 4.38 - PyTuple_SetItem(list, 1, message); 4.39 - result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); 4.40 -+ /* Forget any errors caused in the error handler. */ 4.41 -+ PyErr_Clear(); 4.42 - Py_XDECREF(list); 4.43 - Py_XDECREF(result); 4.44 - }
5.1 --- a/libxml2/stuff/patches/series Sun Jan 20 15:38:18 2019 +0200 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,2 +0,0 @@ 5.4 -# from BLFS 5.5 -libxml2-2.9.8-python3_hack-1.patch
6.1 --- a/libxslt/receipt Sun Jan 20 15:38:18 2019 +0200 6.2 +++ b/libxslt/receipt Sun Jan 20 16:02:24 2019 +0200 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt v2. 6.5 6.6 PACKAGE="libxslt" 6.7 -VERSION="1.1.32" 6.8 +VERSION="1.1.33" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="XSLT support for libxml2" 6.11 MAINTAINER="devel@slitaz.org" 6.12 @@ -11,9 +11,21 @@ 6.13 6.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 6.15 WGET_URL="http://xmlsoft.org/sources/$TARBALL" 6.16 +TARBALL_SHA1="7dcda921d9d3d3325449dae5cf84dbb102d26928" 6.17 6.18 BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev libxml2-dev zlib-dev python-dev" 6.19 SPLIT="$PACKAGE-python $PACKAGE-dev" 6.20 + 6.21 +COPY_std="xsltproc lib/*.so.*" 6.22 +COPY_python="python2*/*/*.py python2*/*/*.so" 6.23 +COPY_dev="@dev xsltConf.sh libxslt.so libexslt.so" 6.24 + 6.25 +DEPENDS_std="libgcrypt libxml2" # libgpg-error liblzma zlib 6.26 +DEPENDS_python="$PACKAGE libxml2 python" # libgcrypt libgpg-error liblzma zlib 6.27 +DEPENDS_dev="$PACKAGE libgcrypt-dev libgpg-error-dev libxml2-dev" # xz-dev zlib-dev 6.28 + 6.29 +CAT_python="development|python module" 6.30 + 6.31 COOKOPTS="skip-log-errors" 6.32 6.33 compile_rules() { 6.34 @@ -24,25 +36,7 @@ 6.35 $CONFIGURE_ARGS && 6.36 fix libtool && 6.37 make && 6.38 - make install 6.39 + make install || return 1 6.40 + 6.41 + find $install -name '*.sh' -exec chmod +x '{}' \; 6.42 } 6.43 - 6.44 -genpkg_rules() { 6.45 - case $PACKAGE in 6.46 - libxslt) 6.47 - copy xsltproc libxslt.so* libexslt.so* 6.48 - DEPENDS="libgcrypt libgpg-error liblzma libxml2 zlib" 6.49 - ;; 6.50 - libxslt-python) 6.51 - copy python*/ 6.52 - find $fs -name '*.la' -delete 6.53 - DEPENDS="libgcrypt libgpg-error liblzma libxml2 libxslt python zlib" 6.54 - CAT="development|python module" 6.55 - ;; 6.56 - libxslt-dev) 6.57 - copy @dev xsltConf.sh 6.58 - DEPENDS="libxslt libxslt-python libgcrypt-dev libgpg-error-dev \ 6.59 - libxml2-dev xz-dev zlib-dev" 6.60 - ;; 6.61 - esac 6.62 -}