From 8b94ad41b1f9dc6740cc73c444e721c540e89f0d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 1 Aug 2019 21:26:28 +0000 Subject: Thu Aug 1 21:26:28 UTC 2019 ap/mariadb-10.4.7-x86_64-1.txz: Upgraded. This update fixes bugs and security issues. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2805 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2740 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2739 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2737 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2758 (* Security fix *) kde/pykde4-4.14.3-x86_64-9.txz: Rebuilt. kde/qtruby-4.14.3-x86_64-10.txz: Rebuilt. Recompiled against QScintilla-2.11.2. kde/smokeqt-4.14.3-x86_64-6.txz: Rebuilt. Recompiled against QScintilla-2.11.2. l/PyQt-4.12.3-x86_64-1.txz: Upgraded. Thanks to alienBOB. l/QScintilla-2.11.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. Thanks to alienBOB. l/sip-4.19.18-x86_64-1.txz: Upgraded. Thanks to alienBOB. xap/sane-1.0.28-x86_64-1.txz: Upgraded. --- source/l/sip/sip.SlackBuild | 96 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 77 insertions(+), 19 deletions(-) (limited to 'source/l/sip/sip.SlackBuild') diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 01450e395..b8c898c52 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,27 +28,26 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz" + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" exit 0 fi @@ -64,11 +63,11 @@ else SLKCFLAGS="-O2" fi -PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) +PYTHON2VER=$(python2 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) +PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null ) -PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) +PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) +PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -79,6 +78,7 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -86,26 +86,84 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +python2 configure.py \ + -b "/usr/bin" \ + -d "$PYTHON2LIB" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Add the PyQt4 private sip module: +make clean +python2 configure.py \ + --sip-module PyQt4.sip \ + --no-tools \ + -b "/usr/bin" \ + -d "$PYTHON2LIB" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Add the PyQt5 private sip module: +make clean +python2 configure.py \ + --sip-module PyQt5.sip \ + --no-tools \ + -b "/usr/bin" \ + -d "$PYTHON2LIB" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Rename to avoid a clash: +mv $PKG/usr/bin/sip $PKG/usr/bin/sip2 + +make clean + python3 configure.py \ -b "/usr/bin" \ -d "$PYTHON3LIB" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" || exit 1 - make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -mv $PKG/usr/bin/sip $PKG/usr/bin/sip3 - -python configure.py \ +# Add the PyQt4 private sip module: +make clean +python3 configure.py \ + --sip-module PyQt4.sip \ + --no-tools \ -b "/usr/bin" \ - -d "$PYTHONLIB" \ + -d "$PYTHON3LIB" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 +# Add the PyQt5 private sip module: +make clean +python3 configure.py \ + --sip-module PyQt5.sip \ + --no-tools \ + -b "/usr/bin" \ + -d "$PYTHON3LIB" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Rename to avoid a clash: +mv $PKG/usr/bin/sip $PKG/usr/bin/sip3 + +# Create a symbolic link 'sip' pointing to the sip3 binary: +ln -s sip3 $PKG/usr/bin/sip + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -- cgit v1.2.3-65-gdbad