diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-10-02 19:41:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-10-03 08:59:49 +0200 |
commit | 27dce94811b1253ee685b40a4a5a70bce92b5cbd (patch) | |
tree | bf2b95dabb3da6b90f593f1a847b01d1bb00c4a0 /source | |
parent | 9f3af3accb48f4e6c3ae536251b11d7f70bdb74c (diff) | |
download | current-27dce94811b1253ee685b40a4a5a70bce92b5cbd.tar.gz |
Wed Oct 2 19:41:47 UTC 201920191002194147
a/haveged-1.9.8-x86_64-1.txz: Upgraded.
ap/screen-4.7.0-x86_64-1.txz: Upgraded.
ap/vim-8.1.2108-x86_64-1.txz: Upgraded.
d/rust-1.37.0-x86_64-1.txz: Upgraded.
Reverting to rust-1.37.0 after verified reports that the newer Rust is
unable to compile Firefox or Thunderbird. There are some patches for this
appearing in the repos, but they are extensive changes that don't look like
they could be cherry-picked. Hey, at least this Rust version works and is
not bloated. :) Moving forward we'll be testing new versions of Rust to
make sure that they can compile the sources that we need Rust for before
merging them into the tree. Firefox has been verified to build here with
rust-1.37.0 and gcc/g++ from gcc-9.2.0 or clang/clang++ from llvm-9.0.0.
l/libcap-ng-0.7.10-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.2108-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/screen/screen.SlackBuild | 14 | ||||
-rw-r--r-- | source/ap/screen/screen.no_libelf.diff | 19 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 16 | ||||
-rw-r--r-- | source/d/rust/rust.url | 14 | ||||
-rwxr-xr-x | source/l/libcap-ng/libcap-ng.SlackBuild | 2 |
5 files changed, 20 insertions, 45 deletions
diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index 277ae041..dc7f2ded 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=screen -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf screen-$VERSION -tar xvf $CWD/screen-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/screen-$VERSION.tar.?z || exit 1 cd screen-$VERSION || exit 1 @@ -86,12 +86,6 @@ done # the console from being properly cleared when detaching from a screen session: zcat $CWD/60-revert-screenrc-change.diff.gz | patch -p1 --verbose || exit 1 -# Do not link against libelf: -zcat $CWD/screen.no_libelf.diff.gz | patch -p1 --verbose || exit 1 - -# Reconf after patching configure.ac: -autoreconf -vif - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/ap/screen/screen.no_libelf.diff b/source/ap/screen/screen.no_libelf.diff deleted file mode 100644 index 992fb07a..00000000 --- a/source/ap/screen/screen.no_libelf.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./configure.ac.orig 2015-06-28 16:22:55.000000000 -0500 -+++ ./configure.ac 2015-08-02 13:46:59.649097842 -0500 -@@ -202,16 +202,6 @@ - #endif - ], LIBS="$LIBS -lsocket -linet";seqptx=1) - --oldlibs="$LIBS" --LIBS="$LIBS -lelf" --AC_CHECKING(SVR4) --AC_TRY_LINK([#include <utmpx.h> --],, --[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN), --[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])] --,LIBS="$oldlibs") --AC_CHECK_HEADERS([stropts.h string.h strings.h]) -- - AC_CHECKING(for Solaris 2.x) - AC_EGREP_CPP(yes, - [#if defined(SVR4) && defined(sun) diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 41110a3d..7e6b3dbc 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.38.0} +VERSION=${VERSION:-1.37.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.37.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-08-15} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.38.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.36.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-07-04} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.37.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -213,9 +213,9 @@ fi 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 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; export PKG_CONFIG_ALLOW_CROSS=1 @@ -263,7 +263,7 @@ sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* # Correct permissions on shared libraries: -find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ +find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \; # Evidently there are a lot of duplicated libraries in this tree, so let's # try to save some space: @@ -280,7 +280,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr done # Compress man pages: -find $PKG/usr/man -type f -exec gzip -9 {} \+ +find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Add some documentation: diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 56058936..de0c3c01 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-08-15/cargo-0.38.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/cargo-0.37.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/rust-std-1.36.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/rustc-1.36.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-08-15/cargo-0.38.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/cargo-0.37.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-07-04/rustc-1.36.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild index 0180bd42..7d58ec18 100755 --- a/source/l/libcap-ng/libcap-ng.SlackBuild +++ b/source/l/libcap-ng/libcap-ng.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcap-ng VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |