From d1c5b0452c42c8a06b79c7f7eed4a84915550117 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 15 Feb 2022 11:36:43 -0500 Subject: libraries/pidgin-mra: Handle weird wget filenames. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- libraries/pidgin-mra/pidgin-mra.SlackBuild | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'libraries') diff --git a/libraries/pidgin-mra/pidgin-mra.SlackBuild b/libraries/pidgin-mra/pidgin-mra.SlackBuild index 51000f3be8..4f80e62410 100644 --- a/libraries/pidgin-mra/pidgin-mra.SlackBuild +++ b/libraries/pidgin-mra/pidgin-mra.SlackBuild @@ -14,15 +14,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -34,8 +31,8 @@ OUTPUT=${OUTPUT:-/tmp} set -e -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -48,18 +45,28 @@ else LIBDIRSUFFIX="" fi +# 20220215 bkw: depending on what client was used to download the file, +# it might be pidgin-mra-0.1.4.2.tar.gz, or it might have a bunch of +# gibberish like: +# pidgin-mra-0.1.4.2.tar.gz?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=... +# so handle either possibility here. +TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz +if [ ! -e "$TARBALL" ]; then + TARBALL="$( /bin/ls $TARBALL\?* | head -1 )" +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $TARBALL cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ patch -p1 < $CWD/use_our_cflags.diff -- cgit v1.2.3-80-g2a13