mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
0cbf4c3859
a/libblockdev-2.28-x86_64-2.txz: Rebuilt.
Drop python2 support.
a/sysvinit-scripts-15.1-noarch-15.txz: Rebuilt.
rc.M: start rc.iceccd and rc.icecc-scheduler earlier.
a/util-linux-2.39.3-x86_64-2.txz: Rebuilt.
Drop python2 support.
a/volume_key-0.3.12-x86_64-6.txz: Rebuilt.
Drop python2 support.
ap/man-pages-6.7-noarch-1.txz: Upgraded.
d/cmake-3.28.4-x86_64-1.txz: Upgraded.
d/llvm-18.1.2-x86_64-1.txz: Upgraded.
d/python2-2.7.18-x86_64-7.txz: Rebuilt.
Bundle the final python2 versions of pip and setuptools.
Drop the /usr/bin/python symlink.
d/python3-3.9.19-x86_64-1.txz: Upgraded.
Point the /usr/bin/python symlink at python3.9.
PEP 394 says we can do this, and in a world of ambigious shebangs, this
is probably the best of the available options.
This update also fixes security issues:
bundled libexpat was updated to 2.6.0.
zipfile is now protected from the "quoted-overlap" zipbomb.
tempfile.TemporaryDirectory cleanup no longer dereferences symlinks when
working around file system permission errors.
For more information, see:
https://pythoninsider.blogspot.com/2024/03/python-31014-3919-and-3819-is-now.html
https://www.cve.org/CVERecord?id=CVE-2023-52425
https://www.cve.org/CVERecord?id=CVE-2024-0450
https://www.cve.org/CVERecord?id=CVE-2023-6597
(* Security fix *)
d/strace-6.8-x86_64-1.txz: Upgraded.
kde/kross-interpreters-23.08.5-x86_64-2.txz: Rebuilt.
Drop python2 support.
l/libxml2-2.12.6-x86_64-2.txz: Rebuilt.
Drop python2 support.
l/mozjs115-115.9.0esr-x86_64-2.txz: Rebuilt.
Fixed installed library name. Thanks to reddog83.
Fixed slack-desc. Thanks to r1w1s1.
l/phonon-4.12.0-x86_64-1.txz: Upgraded.
l/pilot-link-0.12.5-x86_64-17.txz: Rebuilt.
Drop python2 support.
l/python2-module-collection-2.7.18-x86_64-6.txz: Removed.
Good bye!
l/python2-pycairo-1.18.2-x86_64-1.txz: Added.
We'll need this (along with pygtk and pygobject) until we get gimp3.
Well, we could build gimp without python support, but I really don't think
that's the route we want to take.
n/bind-9.18.25-x86_64-1.txz: Upgraded.
n/crda-4.15-x86_64-1.txz: Removed.
The kernel is able to load from wireless-regdb directly. Obsolete.
n/getmail-6.18.14-x86_64-1.txz: Upgraded.
n/gpgme-1.23.2-x86_64-2.txz: Rebuilt.
Drop python2 support.
n/obexftp-0.24.2-x86_64-11.txz: Rebuilt.
Drop python2 support.
n/wireless-regdb-2024.01.23-x86_64-1.txz: Added.
Wireless regulatory database, previously bundled with crda.
x/ibus-1.5.29-x86_64-2.txz: Rebuilt.
Drop python2 support.
x/libkkc-0.3.5-x86_64-4.txz: Rebuilt.
Still forcing python2 with this one, but perhaps a python3 marisa module
could work around this.
x/libkkc-data-0.2.7-x86_64-4.txz: Rebuilt.
Still forcing python2 with this one, but perhaps a python3 marisa module
could work around this.
x/xcb-proto-1.16.0-x86_64-2.txz: Rebuilt.
Drop python2 support.
x/xpyb-1.3.1-x86_64-7.txz: Removed.
Nothing uses it, and it was never updated for python3. Removed as obsolete.
216 lines
7.1 KiB
Bash
Executable file
216 lines
7.1 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use of this script, with or without modification, is
|
|
# permitted provided that the following conditions are met:
|
|
#
|
|
# 1. Redistributions of this script must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
cd $(dirname $0) ; CWD=$(pwd)
|
|
|
|
PKGNAM=python2
|
|
SRCNAM=Python
|
|
VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
|
|
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
|
|
BUILD=${BUILD:-7}
|
|
|
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
|
|
|
# Automatically determine the architecture we're building on:
|
|
if [ -z "$ARCH" ]; then
|
|
case "$( uname -m )" in
|
|
i?86) export ARCH=i586 ;;
|
|
arm*) export ARCH=arm ;;
|
|
# Unless $ARCH is already set, use uname -m for all other archs:
|
|
*) export ARCH=$( uname -m ) ;;
|
|
esac
|
|
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-$VERSION-$ARCH-$BUILD.txz"
|
|
exit 0
|
|
fi
|
|
|
|
TMP=${TMP:-/tmp}
|
|
PKG=$TMP/package-$PKGNAM
|
|
rm -rf $PKG
|
|
mkdir -p $TMP $PKG
|
|
|
|
# Don't set any SLKCFLAGS here, or OPT="$SLKCFLAGS" before the ./configure.
|
|
# Python gets the compile options right without any help.
|
|
if [ "$ARCH" = "i586" ]; then
|
|
LIBDIRSUFFIX=""
|
|
elif [ "$ARCH" = "s390" ]; then
|
|
LIBDIRSUFFIX=""
|
|
elif [ "$ARCH" = "x86_64" ]; then
|
|
LIBDIRSUFFIX="64"
|
|
elif [ "$ARCH" = "arm" ]; then
|
|
LIBDIRSUFFIX=""
|
|
elif [ "$ARCH" = "armel" ]; then
|
|
LIBDIRSUFFIX=""
|
|
fi
|
|
|
|
# Location for Python site-packages:
|
|
SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
|
|
# same as above without $PKG
|
|
TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
|
|
|
|
cd $TMP
|
|
rm -rf $SRCNAM-$VERSION
|
|
tar xf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1
|
|
cd $SRCNAM-$VERSION || exit 1
|
|
|
|
zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1
|
|
# We don't want a large libpython*.a:
|
|
zcat $CWD/python.no-static-library.diff.gz | patch -p1 --verbose || exit 1
|
|
|
|
if [ "$ARCH" = "x86_64" ]; then
|
|
# Install to lib64 instead of lib and
|
|
# Python must report /usr/lib64/python2.7/site-packages as python_lib_dir:
|
|
zcat $CWD/python.x86_64.diff.gz | patch -p1 --verbose || exit 1
|
|
fi
|
|
|
|
chown -R root:root .
|
|
find . \
|
|
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
|
-exec chmod 755 {} \+ -o \
|
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
|
-exec chmod 644 {} \+
|
|
|
|
# Enable built-in SQLite module to load extensions
|
|
sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
|
|
|
|
./configure \
|
|
--prefix=/usr \
|
|
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
|
--mandir=/usr/man \
|
|
--docdir=/usr/doc/python2-$VERSION \
|
|
--with-threads \
|
|
--enable-ipv6 \
|
|
--enable-shared \
|
|
--enable-unicode=ucs4 \
|
|
--with-system-expat \
|
|
--with-system-ffi \
|
|
--without-ensurepip \
|
|
--build=$ARCH-slackware-linux || exit 1
|
|
|
|
make $NUMJOBS || make || exit 1
|
|
make install DESTDIR=$PKG || exit 1
|
|
|
|
# This conflicts with python3. We'll assume the python3 version is more
|
|
# up-to-date and just get rid of it:
|
|
rm -f $PKG/usr/bin/2to3
|
|
|
|
# We don't want these now:
|
|
rm -f $PKG/usr/bin/python
|
|
rm -f $PKG/usr/bin/python-config
|
|
|
|
# Bundle the very last pip for python2:
|
|
tar xf $CWD/pip-20.3.tar.lz || exit 1
|
|
cd pip-20.3
|
|
fix_perms
|
|
python2 setup.py install --root=$PKG || exit 1
|
|
# Don't package this. We want /usr/bin/pip in the main python-pip package to be
|
|
# the python3 version:
|
|
rm -f $PKG/usr/bin/pip
|
|
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.3
|
|
cp -a *.txt PKG-INFO README.rst \
|
|
$PKG/usr/doc/$PKGNAM-$VERSION/pip-20.3
|
|
find $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.3 -type f -exec chmod 0644 {} \+
|
|
cd ..
|
|
|
|
# Bundle the very last setuptools for python2:
|
|
tar xf $CWD/setuptools-44.1.1.tar.lz || exit 1
|
|
cd setuptools-44.1.1
|
|
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
|
|
# It's tempting to get rid of this entirely, but we'll leave the -2.7 versioned
|
|
# binary:
|
|
rm -f $PKG/usr/bin/easy_install
|
|
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1
|
|
cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \
|
|
$PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1
|
|
find $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1 -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.1.1)
|
|
cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
|
|
touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
|
|
fi
|
|
cd ..
|
|
|
|
# Install some python-demo files:
|
|
mkdir -p $PKG/usr/doc/python2-$VERSION
|
|
cp -a Demo $PKG/usr/doc/python2-$VERSION
|
|
|
|
# We'll install the python-tools under site-packages:
|
|
mkdir -p $SITEPK
|
|
cp -a Tools/* $SITEPK
|
|
|
|
mkdir -p $PKG/usr/doc/python2-$VERSION
|
|
mv $SITEPK/README $PKG/usr/doc/python2-$VERSION/README.python-tools
|
|
( cd $PKG/usr/doc/python2-$VERSION
|
|
ln -sf $TOOLSDIR Tools
|
|
)
|
|
|
|
# Install docs:
|
|
mkdir -p $PKG/usr/doc/python2-$VERSION/Documentation
|
|
cp -a README LICENSE $PKG/usr/doc/python2-$VERSION
|
|
cp -a Misc $PKG/usr/doc/python2-$VERSION
|
|
tar xf $CWD/python-$VERSION-docs-text.tar.?z*
|
|
mv python-${VERSION}-docs-text/* $PKG/usr/doc/python2-$VERSION/Documentation
|
|
chown -R root:root $PKG/usr/doc/python2-$VERSION
|
|
|
|
# Fix possible incorrect permissions:
|
|
( cd $PKG
|
|
find . -type d -exec chmod 755 "{}" \+
|
|
find . -perm 640 -exec chmod 644 "{}" \+
|
|
find . -perm 750 -exec chmod 755 "{}" \+
|
|
)
|
|
|
|
( cd $PKG
|
|
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
|
|
xargs strip --strip-unneeded 2> /dev/null
|
|
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
|
|
xargs strip --strip-unneeded 2> /dev/null
|
|
)
|
|
|
|
( cd $PKG/usr/man
|
|
find . -type f -exec gzip -9 {} \+
|
|
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
|
|
)
|
|
|
|
( cd $PKG/usr/man
|
|
if [ -r python${BRANCH_VERSION}.1.gz ] ; then
|
|
ln -sf python${BRANCH_VERSION}.1.gz python.1.gz
|
|
fi
|
|
)
|
|
|
|
mkdir -p $PKG/install
|
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
|
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/python2-$VERSION-$ARCH-$BUILD.txz
|
|
|