diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-12-08 19:29:55 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-12-09 08:59:48 +0100 |
| commit | 7d1fda615bfe3ec57a0c6753082b866a09ac1af3 (patch) | |
| tree | 215b903d14cff77f90ba6fb2ddc5960028a16aa2 /source/x/marisa/marisa.SlackBuild | |
| parent | 5584dad3850d8f1aa3459ed8b85b3f8b571df3d4 (diff) | |
| download | current-20201208192955.tar.gz current-20201208192955.tar.xz | |
Tue Dec 8 19:29:55 UTC 202020201208192955
a/kernel-generic-5.4.82-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.82-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.82-x86_64-1.txz: Upgraded.
a/openssl-solibs-1.1.1i-x86_64-1.txz: Upgraded.
ap/gutenprint-5.3.4-x86_64-1.txz: Upgraded.
ap/htop-3.0.3-x86_64-1.txz: Upgraded.
d/kernel-headers-5.4.82-x86-1.txz: Upgraded.
d/python3-3.9.1-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.82-noarch-1.txz: Upgraded.
l/M2Crypto-0.37.1-x86_64-1.txz: Upgraded.
l/gdk-pixbuf2-2.42.2-x86_64-1.txz: Upgraded.
l/imagemagick-7.0.10_46-x86_64-1.txz: Upgraded.
l/mlt-6.24.0-x86_64-1.txz: Upgraded.
l/pipewire-0.3.17-x86_64-1.txz: Upgraded.
n/openssl-1.1.1i-x86_64-1.txz: Upgraded.
This fixes a denial-of-service security issue.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1971
(* Security fix *)
x/fcitx-configtool-0.4.10-x86_64-1.txz: Upgraded.
x/libgee-0.20.3-x86_64-1.txz: Upgraded.
x/marisa-0.2.6-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/x/marisa/marisa.SlackBuild')
| -rwxr-xr-x | source/x/marisa/marisa.SlackBuild | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index e2c19ff98..f21f027d4 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -1,7 +1,5 @@ #!/bin/bash -# Slackware build script for marisa - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -26,7 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=marisa -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +SRCNAM=marisa-trie +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -74,9 +73,9 @@ PKG=$TMP/package-marisa rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf marisa-$VERSION -tar xvf $CWD/marisa-$VERSION.tar.?z || exit 1 -cd marisa-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -85,6 +84,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -141,7 +148,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \ +cp -a AUTHORS* ChangeLog* COPYING* INSTALL* NEWS* README* \ + docs/readme* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install |