From 33be03fb136ca11ba09834a19984c9f956049b6d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 5 May 2020 20:21:27 +0000 Subject: Tue May 5 20:21:27 UTC 2020 a/hwdata-0.335-noarch-1.txz: Upgraded. ap/tmux-3.1b-x86_64-1.txz: Upgraded. l/libcap-2.34-x86_64-1.txz: Upgraded. n/mutt-1.14.0-x86_64-1.txz: Upgraded. n/nfs-utils-2.4.3-x86_64-3.txz: Rebuilt. Added /var/lib/nfs/nfsdcltrack database directory for nfsdcltrack. Thanks to upnort. x/xterm-356-x86_64-1.txz: Upgraded. xap/NetworkManager-openvpn-1.8.12-x86_64-1.txz: Added. Thanks to Robby Workman. xap/mozilla-firefox-68.8.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/68.8.0/releasenotes/ https://www.mozilla.org/security/advisories/mfsa2020-17/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12387 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12388 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12389 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-6831 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12392 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12393 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12395 (* Security fix *) xap/mozilla-thunderbird-68.8.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/68.8.0/releasenotes/ (* Security fix *) testing/packages/PAM/libcap-2.34-x86_64-1_pam.txz: Upgraded. --- .../python2-module-collection.SlackBuild | 46 ++++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'source/l/python2-module-collection') diff --git a/source/l/python2-module-collection/python2-module-collection.SlackBuild b/source/l/python2-module-collection/python2-module-collection.SlackBuild index c34976996..8087c20b9 100755 --- a/source/l/python2-module-collection/python2-module-collection.SlackBuild +++ b/source/l/python2-module-collection/python2-module-collection.SlackBuild @@ -88,6 +88,31 @@ find . \ -exec chmod 644 {} \+ } +# setuptools-44.0.0: +cd $TMP/$PKGNAM-$VERSION || exit 1 +tar xf $CWD/modules/setuptools-44.0.0.tar.lz || exit 1 +cd setuptools-44.0.0 +fix_perms +# Install setuptools to the system if it's not there: +if [ ! -d /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/setuptools/version.py ]; then + python2 setup.py install --root=/ || exit 1 +fi +python2 setup.py install --root=$PKG || exit 1 +# Drop the python2 version of easy_install so the python 3.x +# one is the default: +rm -f $PKG/usr/bin/easy_install +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 +cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \ + $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 +find $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 -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/setuptools-44.0.0) + cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst + touch -r CHANGES.rst $DOCSDIR/CHANGES.rst +fi + # Cython-0.29.16: cd $TMP/$PKGNAM-$VERSION || exit 1 tar xf $CWD/modules/Cython-0.29.16.tar.lz || exit 1 @@ -122,27 +147,6 @@ cp -a *.txt PKG-INFO README.rst \ $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.0.2 find $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.0.2 -type f -exec chmod 0644 {} \+ -# setuptools-44.0.0: -cd $TMP/$PKGNAM-$VERSION || exit 1 -tar xf $CWD/modules/setuptools-44.0.0.tar.lz || exit 1 -cd setuptools-44.0.0 -fix_perms -python2 setup.py install --root=$PKG || exit 1 -# Drop the python2 version of easy_install so the python 3.x -# one is the default: -rm -f $PKG/usr/bin/easy_install -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 -cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \ - $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 -find $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 -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/setuptools-44.0.0) - cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst - touch -r CHANGES.rst $DOCSDIR/CHANGES.rst -fi - # M2Crypto-0.35.2 and typing-3.7.4.1: cd $TMP/$PKGNAM-$VERSION || exit 1 tar xf $CWD/modules/M2Crypto-0.35.2.tar.xz || exit 1 -- cgit v1.2.3-79-gdb01