mirror of
git://slackware.nl/current.git
synced 2025-01-15 15:41:54 +01:00
39e07c2987
a/exfatprogs-1.1.0-x86_64-1.txz: Upgraded.
a/kernel-firmware-20210208_b79d239-noarch-1.txz: Upgraded.
a/procps-ng-3.3.17-x86_64-1.txz: Upgraded.
ap/man-db-2.9.4-x86_64-1.txz: Upgraded.
ap/slackpkg-15.0-noarch-2.txz: Rebuilt.
Allow new-config after slackpkg upgrade itself. Thanks to PiterPUNK.
d/git-2.30.1-x86_64-1.txz: Upgraded.
l/imagemagick-7.0.10_62-x86_64-1.txz: Upgraded.
l/jasper-2.0.25-x86_64-1.txz: Upgraded.
n/fetchmail-6.4.16-x86_64-1.txz: Upgraded.
xfce/thunar-4.16.3-x86_64-1.txz: Upgraded.
testing/packages/aaa_glibc-solibs-2.33-x86_64-1_testing.txz: Added.
testing/packages/glibc-2.33-x86_64-1_testing.txz: Added.
This is here for some actual testing - don't go just jumping into this one
all willy-nilly, especially if you're on 32-bit. The internal implementation
of some glibc functions has changed in ways that can break sandboxes that
restrict the allowable functions. So far this is known to affect
qt5-webengine and openssl, and in the case of openssl upgrading to this
version of glibc will lock out ssh access to the machine. I've seen one
mention of the openssh issue online as a comment posted to LWN's article
about the release of glibc-2.33. It says that a patch was submitted upstream,
but I haven't been able to locate a copy yet.
On the qt5 issue, alienBOB has given me a link to this patch:
09e1adb883/f/qtwebengine-everywhere-src-5.15.2-%231904652.patch
If anyone has a fix for openssl on 32-bit, kindly post it to LQ.
testing/packages/glibc-i18n-2.33-x86_64-1_testing.txz: Added.
testing/packages/glibc-profile-2.33-x86_64-1_testing.txz: Added.
181 lines
5.2 KiB
Bash
Executable file
181 lines
5.2 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2008, 2009, 2010, 2011, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, 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=git
|
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
|
|
BUILD=${BUILD:-1}
|
|
|
|
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
|
|
|
|
eval $(perl '-V:installvendorlib')
|
|
PERLDIR=$installvendorlib/$ARCH-linux-thread-multi/auto
|
|
|
|
if ls /var/log/packages/git-* 1> /dev/null 2> /dev/null ; then
|
|
echo "The git package needs to be removed before building to ensure that"
|
|
echo "the perl modules are included in the new package."
|
|
echo
|
|
echo "Removing the git package in 15 seconds, and then continuing with the build."
|
|
sleep 15
|
|
removepkg git
|
|
fi
|
|
|
|
if [ "$ARCH" = "i586" ]; then
|
|
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
|
elif [ "$ARCH" = "s390" ]; then
|
|
SLKCFLAGS="-O2"
|
|
elif [ "$ARCH" = "x86_64" ]; then
|
|
SLKCFLAGS="-O2 -fPIC"
|
|
else
|
|
SLKCFLAGS="-O2"
|
|
fi
|
|
|
|
TMP=${TMP:-/tmp}
|
|
PKG=$TMP/package-git
|
|
|
|
rm -rf $PKG
|
|
mkdir -p $TMP $PKG
|
|
|
|
cd $TMP
|
|
rm -rf git-$VERSION
|
|
tar xvf $CWD/git-$VERSION.tar.?z* || exit 1
|
|
cd git-$VERSION || 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 {} \+
|
|
|
|
mkdir -p $PKG/usr/doc/git-$VERSION
|
|
cp -a \
|
|
COPYING* INSTALL README \
|
|
Documentation \
|
|
contrib \
|
|
$PKG/usr/doc/git-$VERSION
|
|
( cd $PKG/usr/doc/git-$VERSION/Documentation ; rm *.1 *.3 *.7 )
|
|
( cd $PKG/usr/doc/git-$VERSION && find . -name ".git*" -exec rm -r "{}" \+ )
|
|
|
|
make $NUMJOBS \
|
|
prefix=/usr \
|
|
mandir=/usr/man \
|
|
CFLAGS="$SLKCFLAGS" \
|
|
INSTALLDIRS=vendor \
|
|
ASCIIDOC8=YesPlease \
|
|
USE_LIBPCRE2=YesPlease \
|
|
all doc || exit 1
|
|
|
|
make \
|
|
prefix=/usr \
|
|
mandir=/usr/man \
|
|
"CFLAGS=$SLKCFLAGS" \
|
|
INSTALLDIRS=vendor \
|
|
ASCIIDOC8=YesPlease \
|
|
USE_LIBPCRE2=YesPlease \
|
|
install \
|
|
install-doc \
|
|
DESTDIR=$PKG || exit 1
|
|
|
|
mv $PKG/usr/share/man/man3 $PKG/usr/man
|
|
rmdir $PKG/usr/share/man
|
|
|
|
# Don't stomp on perl's file:
|
|
rm -f $PKG/usr/lib*/perl5/perllocal.pod
|
|
|
|
# Compress and if needed symlink the man pages:
|
|
if [ -d $PKG/usr/man ]; then
|
|
( cd $PKG/usr/man
|
|
for manpagedir in $(find . -type d -name "man*") ; do
|
|
( cd $manpagedir
|
|
for eachpage in $( find . -type l -maxdepth 1) ; do
|
|
ln -s $( readlink $eachpage ).gz $eachpage.gz
|
|
rm $eachpage
|
|
done
|
|
gzip -9 *.*
|
|
)
|
|
done
|
|
)
|
|
fi
|
|
|
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
|
|
|
# Since Stuart Winter hates hard links. ;-)
|
|
#
|
|
# Switch a hard link with a soft link:
|
|
( cd $PKG/usr/bin
|
|
find . -links +1 -not -name git | while read gitfile ; do
|
|
if [ git -ef $gitfile ]; then
|
|
rm -vf $gitfile
|
|
ln -vfs git $gitfile
|
|
fi
|
|
done
|
|
)
|
|
|
|
# This removes our DESTDIR from the packlist filenames, to keep perl's
|
|
# internal inventories consistent and correct.
|
|
find $PKG -name .packlist | while read plist ; do
|
|
sed -e "s%/share/man%/man%g" \
|
|
-e "s%$PKG%%g" \
|
|
-e "s%\.1$%\.1\.gz%g" \
|
|
-e "s%\.2$%\.2\.gz%g" \
|
|
-e "s%\.3$%\.3\.gz%g" \
|
|
-e "s%\.3pm$%\.3pm\.gz%g" \
|
|
-e "s%\.4$%\.4\.gz%g" \
|
|
-e "s%\.5$%\.5\.gz%g" \
|
|
-e "s%\.6$%\.6\.gz%g" \
|
|
-e "s%\.7$%\.7\.gz%g" \
|
|
-e "s%\.8$%\.8\.gz%g" \
|
|
${plist} > ${plist}.new
|
|
mv -f ${plist}.new ${plist}
|
|
done
|
|
|
|
# This is junk:
|
|
eval $(perl '-V:privlib')
|
|
( cd $PKG$(dirname $privlib) && rm -rf 5.* )
|
|
|
|
mkdir -p $PKG/install
|
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
|
|
|
cd $PKG
|
|
/sbin/makepkg -l y -c n $TMP/git-$VERSION-$ARCH-$BUILD.txz
|
|
|