From c01ee3e65304c6ff4a85a5f74ea1aed6a315a2da Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 30 Jun 2021 03:45:31 +0000 Subject: Wed Jun 30 03:45:31 UTC 2021 a/kernel-firmware-20210629_d79c267-noarch-1.txz: Upgraded. ap/cups-2.3.3op2-x86_64-1.txz: Upgraded. kde/lokalize-21.04.2-x86_64-2.txz: Rebuilt. Recompiled against hunspell-1.7.0. kde/sonnet-5.83.0-x86_64-2.txz: Rebuilt. Recompiled against hunspell-1.7.0. l/enchant-2.3.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/gtkspell-2.0.16-x86_64-7.txz: Rebuilt. Recompiled against enchant-2.3.0. l/hunspell-1.7.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-urllib3-1.26.6-x86_64-2.txz: Rebuilt. Don't build python2 version. l/python2-module-collection-2.7.18-x86_64-4.txz: Rebuilt. Upgraded to urllib3-1.25.11 for compatibility with requests. Thanks to USUARIONUEVO. l/qt5-5.15.2-x86_64-10.txz: Rebuilt. Recompiled against hunspell-1.7.0. n/php-7.4.21-x86_64-1.txz: Upgraded. This update fixes bugs and security issues: Core: SSRF bypass in FILTER_VALIDATE_URL. PDO_Firebird: Stack buffer overflow in firebird_info_cb. PDO_Firebird: SIGSEGV in firebird_handle_doer. PDO_Firebird: SIGSEGV in firebird_stmt_execute. PDO_Firebird: Crash while parsing blob data in firebird_fetch_blob. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-21705 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-21704 (* Security fix *) xap/pan-0.146-x86_64-5.txz: Rebuilt. Recompiled against enchant-2.3.0. extra/php8/php8-8.0.8-x86_64-1.txz: Upgraded. --- source/l/enchant/enchant.SlackBuild | 18 ++++++++++---- source/l/gtkspell/gtkspell.SlackBuild | 6 +++-- source/l/gtkspell/gtkspell.enchant-2.diff | 28 ++++++++++++++++++++++ source/l/gtkspell/slack-desc | 2 +- source/l/hunspell/hunspell.SlackBuild | 6 ++--- source/l/hunspell/slack-desc | 2 +- source/l/python-urllib3/python-urllib3.SlackBuild | 3 +-- .../python2-module-collection.SlackBuild | 16 ++++++------- source/l/qt5/qt5.SlackBuild | 2 +- 9 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 source/l/gtkspell/gtkspell.enchant-2.diff (limited to 'source/l') diff --git a/source/l/enchant/enchant.SlackBuild b/source/l/enchant/enchant.SlackBuild index bff2a6663..2213d2a86 100755 --- a/source/l/enchant/enchant.SlackBuild +++ b/source/l/enchant/enchant.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2007 Alex Elliott -# Copyright 2008, 2009, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2013, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=enchant -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-$VERSION -tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 chown -R root:root . find . \ @@ -79,6 +79,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +./bootstrap + +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/gtkspell/gtkspell.SlackBuild b/source/l/gtkspell/gtkspell.SlackBuild index 395789417..b4d6eb3f0 100755 --- a/source/l/gtkspell/gtkspell.SlackBuild +++ b/source/l/gtkspell/gtkspell.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gtkspell VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,6 +78,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/gtkspell.enchant-2.diff.gz | patch -p1 --verbose || exit 1 + # Regenerate build system to fix newer gtk-doc dropping gtkdoc-mktmpl: gtkdocize autoreconf -vif diff --git a/source/l/gtkspell/gtkspell.enchant-2.diff b/source/l/gtkspell/gtkspell.enchant-2.diff new file mode 100644 index 000000000..e83595089 --- /dev/null +++ b/source/l/gtkspell/gtkspell.enchant-2.diff @@ -0,0 +1,28 @@ +--- ./gtkspell/gtkspell.c.orig 2009-10-09 14:01:47.000000000 -0500 ++++ ./gtkspell/gtkspell.c 2021-06-29 14:00:00.570508124 -0500 +@@ -277,7 +277,7 @@ + get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click); + word = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE); + +- enchant_dict_add_to_pwl( spell->speller, word, strlen(word)); ++ enchant_dict_add( spell->speller, word, strlen(word)); + + gtkspell_recheck_all(spell); + +--- ./configure.ac.orig 2009-10-22 21:52:31.000000000 -0500 ++++ ./configure.ac 2021-06-29 13:58:26.549513324 -0500 +@@ -12,12 +12,12 @@ + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + AC_CONFIG_HEADERS([config.h]) + +-SPELLER_LIB=-lenchant ++SPELLER_LIB=-lenchant-2 + + AC_SUBST(SPELLER_LIB) + GTKSPELL_PACKAGES=gtk+-2.0 + AC_SUBST(GTKSPELL_PACKAGES) +-PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 ) ++PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant-2 >= 2.2.0 ) + AC_SUBST(GTKSPELL_CFLAGS) + AC_SUBST(GTKSPELL_LIBS) + diff --git a/source/l/gtkspell/slack-desc b/source/l/gtkspell/slack-desc index a6a309e7e..a46053cc1 100644 --- a/source/l/gtkspell/slack-desc +++ b/source/l/gtkspell/slack-desc @@ -12,7 +12,7 @@ gtkspell: GtkSpell provides MSWord/MacOSX-style highlighting of misspelled words gtkspell: in a GtkTextView widget. Right-clicking a misspelled word pops up a gtkspell: menu of suggested replacements. gtkspell: -gtkspell: +gtkspell: Homepage: http://gtkspell.sourceforge.net gtkspell: gtkspell: gtkspell: diff --git a/source/l/hunspell/hunspell.SlackBuild b/source/l/hunspell/hunspell.SlackBuild index e71505c84..3548896c9 100755 --- a/source/l/hunspell/hunspell.SlackBuild +++ b/source/l/hunspell/hunspell.SlackBuild @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hunspell -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,7 +78,7 @@ esac cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Make sure ownerships and permissions are sane: diff --git a/source/l/hunspell/slack-desc b/source/l/hunspell/slack-desc index e55f92a20..399a9cc08 100644 --- a/source/l/hunspell/slack-desc +++ b/source/l/hunspell/slack-desc @@ -14,6 +14,6 @@ hunspell: and complex word compounding or character encoding. hunspell: Hunspell interfaces: Ispell-like terminal interface using ncurses hunspell: library, Ispell pipe interface, and OpenOffice.org UNO module. hunspell: -hunspell: Home page: http://hunspell.sourceforge.net/ +hunspell: Homepage: http://hunspell.sourceforge.net/ hunspell: hunspell: diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index 52d338723..68897e49e 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-urllib3 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=urllib3 @@ -61,7 +61,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -python setup.py install --root=$PKG || exit 1 python3 setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/l/python2-module-collection/python2-module-collection.SlackBuild b/source/l/python2-module-collection/python2-module-collection.SlackBuild index ad7bbf6b1..ee5dc4f4b 100755 --- a/source/l/python2-module-collection/python2-module-collection.SlackBuild +++ b/source/l/python2-module-collection/python2-module-collection.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python2-module-collection VERSION=2.7.18 -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -428,20 +428,20 @@ python2 setup.py install --root=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/six-1.14.0 cp -a LICENSE* PKG-INFO README* $PKG/usr/doc/$PKGNAM-$VERSION/six-1.14.0 -# urllib3-1.25.8: +# urllib3-1.25.11: cd $TMP/$PKGNAM-$VERSION || exit 1 -tar xf $CWD/modules/urllib3-1.25.8.tar.lz || exit 1 -cd urllib3-1.25.8 +tar xf $CWD/modules/urllib3-1.25.11.tar.lz || exit 1 +cd urllib3-1.25.11 fix_perms python2 setup.py install --root=$PKG || exit 1 -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8 +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11 cp -a *.rst *.txt PKG-INFO \ - $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8 -find $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8 -type f -exec chmod 0644 {} \+ + $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11 +find $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11 -type f -exec chmod 0644 {} \+ # If there's a CHANGES.rst, installing at least part of the recent history # is useful, but don't let it get totally out of control: if [ -r CHANGES.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/urllib3-1.25.8) + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/urllib3-1.25.11) cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst touch -r CHANGES.rst $DOCSDIR/CHANGES.rst fi diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index de7557a2e..a406bd9f5 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) -- cgit v1.2.3