From 2858060a502f0a172fe9637656b005c2b704ead2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 21 Feb 2022 20:21:38 +0000 Subject: Mon Feb 21 20:21:38 UTC 2022 patches/packages/expat-2.4.6-x86_64-1_slack15.0.txz: Upgraded. Fixed a regression introduced by the fix for CVE-2022-25313 that affects applications that (1) call function XML_SetElementDeclHandler and (2) are parsing XML that contains nested element declarations: (e.g. ""). patches/packages/flac-1.3.4-x86_64-1_slack15.0.txz: Upgraded. This update fixes overflow issues with encoding and decoding. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561 (* Security fix *) patches/packages/mariadb-10.5.15-x86_64-2_slack15.0.txz: Rebuilt. Removed dangling symlink. --- .../packages/expat-2.4.5-x86_64-1_slack15.0.txt | 11 -- .../packages/expat-2.4.6-x86_64-1_slack15.0.txt | 11 ++ patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt | 11 ++ .../mariadb-10.5.15-x86_64-1_slack15.0.txt | 11 -- .../mariadb-10.5.15-x86_64-2_slack15.0.txt | 11 ++ patches/source/flac/flac.SlackBuild | 136 +++++++++++++++++++++ patches/source/flac/flac.man.diff | 12 ++ patches/source/flac/flac.url | 1 + patches/source/flac/slack-desc | 19 +++ patches/source/mariadb/mariadb.SlackBuild | 6 +- 10 files changed, 205 insertions(+), 24 deletions(-) delete mode 100644 patches/packages/expat-2.4.5-x86_64-1_slack15.0.txt create mode 100644 patches/packages/expat-2.4.6-x86_64-1_slack15.0.txt create mode 100644 patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt delete mode 100644 patches/packages/mariadb-10.5.15-x86_64-1_slack15.0.txt create mode 100644 patches/packages/mariadb-10.5.15-x86_64-2_slack15.0.txt create mode 100755 patches/source/flac/flac.SlackBuild create mode 100644 patches/source/flac/flac.man.diff create mode 100644 patches/source/flac/flac.url create mode 100644 patches/source/flac/slack-desc (limited to 'patches') diff --git a/patches/packages/expat-2.4.5-x86_64-1_slack15.0.txt b/patches/packages/expat-2.4.5-x86_64-1_slack15.0.txt deleted file mode 100644 index e5f720d42..000000000 --- a/patches/packages/expat-2.4.5-x86_64-1_slack15.0.txt +++ /dev/null @@ -1,11 +0,0 @@ -expat: expat (C library for parsing XML) -expat: -expat: This is Expat, a C library for parsing XML, written by James Clark. -expat: Expat is a stream-oriented XML parser used by Python, GNOME, Xft2, -expat: and other things. -expat: -expat: Homepage: https://libexpat.github.io -expat: -expat: -expat: -expat: diff --git a/patches/packages/expat-2.4.6-x86_64-1_slack15.0.txt b/patches/packages/expat-2.4.6-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..e5f720d42 --- /dev/null +++ b/patches/packages/expat-2.4.6-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +expat: expat (C library for parsing XML) +expat: +expat: This is Expat, a C library for parsing XML, written by James Clark. +expat: Expat is a stream-oriented XML parser used by Python, GNOME, Xft2, +expat: and other things. +expat: +expat: Homepage: https://libexpat.github.io +expat: +expat: +expat: +expat: diff --git a/patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt b/patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..b032a65ac --- /dev/null +++ b/patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +flac: flac (Free Lossless Audio Codec) +flac: +flac: FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, +flac: FLAC is similar to MP3, but lossless. "Free" means that the +flac: specification of the stream format is in the public domain, and that +flac: neither the FLAC format nor any of the implemented encoding/decoding +flac: methods are covered by any patent. It also means that the sources for +flac: libFLAC and libFLAC++ are available under the LGPL and the sources for +flac: flac, metaflac, and the plugins are available under the GPL. +flac: +flac: FLAC was developed by Josh Coalson. diff --git a/patches/packages/mariadb-10.5.15-x86_64-1_slack15.0.txt b/patches/packages/mariadb-10.5.15-x86_64-1_slack15.0.txt deleted file mode 100644 index d45005822..000000000 --- a/patches/packages/mariadb-10.5.15-x86_64-1_slack15.0.txt +++ /dev/null @@ -1,11 +0,0 @@ -mariadb: mariadb (Drop-in replacement for the MySQL Database Server) -mariadb: -mariadb: MariaDB is a backward compatible, drop-in replacement branch of the -mariadb: MySQL(R) Database Server. It includes all major open source storage -mariadb: engines, including the Aria storage engine. -mariadb: -mariadb: Homepage: http://mariadb.org/ -mariadb: -mariadb: -mariadb: -mariadb: diff --git a/patches/packages/mariadb-10.5.15-x86_64-2_slack15.0.txt b/patches/packages/mariadb-10.5.15-x86_64-2_slack15.0.txt new file mode 100644 index 000000000..d45005822 --- /dev/null +++ b/patches/packages/mariadb-10.5.15-x86_64-2_slack15.0.txt @@ -0,0 +1,11 @@ +mariadb: mariadb (Drop-in replacement for the MySQL Database Server) +mariadb: +mariadb: MariaDB is a backward compatible, drop-in replacement branch of the +mariadb: MySQL(R) Database Server. It includes all major open source storage +mariadb: engines, including the Aria storage engine. +mariadb: +mariadb: Homepage: http://mariadb.org/ +mariadb: +mariadb: +mariadb: +mariadb: diff --git a/patches/source/flac/flac.SlackBuild b/patches/source/flac/flac.SlackBuild new file mode 100755 index 000000000..dc76a6308 --- /dev/null +++ b/patches/source/flac/flac.SlackBuild @@ -0,0 +1,136 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2010, 2011, 2018, 2019 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=flac +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1_slack15.0} + +# 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 + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-flac + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf flac-$VERSION +tar xvf $CWD/flac-$VERSION.tar.?z* || exit 1 +cd flac-$VERSION +zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + +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 {} \+ + +if [ "$ARCH" != "x86_64" ]; then + # We disable assembly optimizations to ensure compatibility with older + # hardware, but you're welcome to comment this out and give it a try. + # I've heard it gives a noticable speedup. + DISABLE_ASM_OPTIMIZATIONS=${DISABLE_ASM_OPTIMIZATIONS:-"--disable-asm-optimizations"} +else + DISABLE_ASM_OPTIMIZATIONS=${DISABLE_ASM_OPTIMIZATIONS:-""} +fi + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/flac-${VERSION} \ + --disable-silent-rules \ + $DISABLE_ASM_OPTIMIZATIONS \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Adjust docs to traditional Slackware location: +mv $PKG/usr/share/doc $PKG/usr +rm $PKG/usr/doc/flac-$VERSION/FLAC.tag +mv $PKG/usr/doc/flac-$VERSION/html/* $PKG/usr/doc/flac-$VERSION +rmdir $PKG/usr/doc/flac-$VERSION/html +# we're not putting 3MB of API docs in the binary package... +( cd $PKG/usr/doc/flac-$VERSION/api && rm -r * ) +cat << EOF > $PKG/usr/doc/flac-$VERSION/api/README +Full HTML based API documentation may be found in the FLAC +source package. It is not included in the binary package due +to size. +EOF +# Add a few more docs: +cp -a \ + AUTHORS COPYING* README \ + $PKG/usr/doc/flac-$VERSION + +# Strip files +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/flac-$VERSION-$ARCH-$BUILD.txz + diff --git a/patches/source/flac/flac.man.diff b/patches/source/flac/flac.man.diff new file mode 100644 index 000000000..2f31e9590 --- /dev/null +++ b/patches/source/flac/flac.man.diff @@ -0,0 +1,12 @@ +--- ./man/flac.1.orig 2007-09-14 10:08:05.000000000 -0500 ++++ ./man/flac.1 2008-03-08 15:48:37.000000000 -0600 +@@ -325,7 +325,8 @@ + .PP + metaflac(1). + .PP +-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems. ++The programs are documented fully by HTML format documentation, available in \fI/usr/doc/flac-*.*.*/html\fR on Slackware GNU/Linux systems. + .SH "AUTHOR" + .PP ++The flac program was developed by Josh Coalson. + This manual page was initially written by Matt Zimmerman for the Debian GNU/Linux system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation. diff --git a/patches/source/flac/flac.url b/patches/source/flac/flac.url new file mode 100644 index 000000000..49d0939dc --- /dev/null +++ b/patches/source/flac/flac.url @@ -0,0 +1 @@ +http://downloads.xiph.org/releases/flac/ diff --git a/patches/source/flac/slack-desc b/patches/source/flac/slack-desc new file mode 100644 index 000000000..e1df9ec4b --- /dev/null +++ b/patches/source/flac/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +flac: flac (Free Lossless Audio Codec) +flac: +flac: FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, +flac: FLAC is similar to MP3, but lossless. "Free" means that the +flac: specification of the stream format is in the public domain, and that +flac: neither the FLAC format nor any of the implemented encoding/decoding +flac: methods are covered by any patent. It also means that the sources for +flac: libFLAC and libFLAC++ are available under the LGPL and the sources for +flac: flac, metaflac, and the plugins are available under the GPL. +flac: +flac: FLAC was developed by Josh Coalson. diff --git a/patches/source/mariadb/mariadb.SlackBuild b/patches/source/mariadb/mariadb.SlackBuild index da5a11c22..609d7ebf4 100755 --- a/patches/source/mariadb/mariadb.SlackBuild +++ b/patches/source/mariadb/mariadb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1_slack15.0} +BUILD=${BUILD:-2_slack15.0} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. @@ -167,6 +167,8 @@ if [ "$KEEPSTATIC" = "NO" ]; then rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.a rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqld.a + # Remove any resulting dangling symlinks: + ( cd $PKG ; find . -xtype l | xargs rm ) fi if [ "$KEEPTESTS" = "NO" ]; then -- cgit v1.2.3-80-g2a13