From c53e3a413a82eaadc7b59568a4aea8fa33951525 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 1 Jan 2021 22:45:48 +0000 Subject: Fri Jan 1 22:45:48 UTC 2021 a/exfatprogs-1.0.4-x86_64-1.txz: Added. ap/vim-8.2.2269-x86_64-1.txz: Upgraded. Add Ruby and Tcl support, make language support dynamic if possible. d/ruby-3.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/subversion-1.14.0-x86_64-4.txz: Rebuilt. Recompiled against ruby-3.0.0. l/openexr-2.5.4-x86_64-1.txz: Upgraded. l/python-idna-3.0-x86_64-1.txz: Upgraded. n/cifs-utils-6.12-x86_64-1.txz: Upgraded. n/epic5-2.1.2-x86_64-5.txz: Rebuilt. Recompiled against ruby-3.0.0. x/marisa-0.2.6-x86_64-2.txz: Rebuilt. Recompiled against ruby-3.0.0. xap/vim-gvim-8.2.2269-x86_64-1.txz: Upgraded. Add Ruby and Tcl support, make language support dynamic if possible. --- source/a/exfatprogs/exfatprogs.SlackBuild | 135 +++++++++++++++++++++ source/a/exfatprogs/exfatprogs.url | 1 + source/a/exfatprogs/slack-desc | 19 +++ source/ap/vim/vim-gvim.SlackBuild | 18 +-- source/ap/vim/vim.SlackBuild | 17 +-- source/d/subversion/subversion.SlackBuild | 2 +- source/l/openexr/openexr.SlackBuild | 2 +- source/l/python-idna/python-idna.SlackBuild | 2 +- source/n/cifs-utils/cifs-utils.SlackBuild | 7 +- ....f4e7c84467152624a288351321c8664dbf3364af.patch | 101 --------------- source/n/epic5/epic5.SlackBuild | 2 +- source/x/marisa/marisa.SlackBuild | 2 +- 12 files changed, 182 insertions(+), 126 deletions(-) create mode 100755 source/a/exfatprogs/exfatprogs.SlackBuild create mode 100644 source/a/exfatprogs/exfatprogs.url create mode 100644 source/a/exfatprogs/slack-desc delete mode 100644 source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch (limited to 'source') diff --git a/source/a/exfatprogs/exfatprogs.SlackBuild b/source/a/exfatprogs/exfatprogs.SlackBuild new file mode 100755 index 00000000..f8390aa2 --- /dev/null +++ b/source/a/exfatprogs/exfatprogs.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/bash + +# Copyright 2021 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=exfatprogs +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 + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --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 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +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 a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* COPYING* LICENSE* NEWS* README* THANKS* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/exfatprogs/exfatprogs.url b/source/a/exfatprogs/exfatprogs.url new file mode 100644 index 00000000..010b6273 --- /dev/null +++ b/source/a/exfatprogs/exfatprogs.url @@ -0,0 +1 @@ +https://github.com/exfatprogs/exfatprogs diff --git a/source/a/exfatprogs/slack-desc b/source/a/exfatprogs/slack-desc new file mode 100644 index 00000000..73318c5d --- /dev/null +++ b/source/a/exfatprogs/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------------------------------------------------------| +exfatprogs: exfatprogs (exFAT filesystem utilities) +exfatprogs: +exfatprogs: The exfatprogs package contains all of the standard utilities for +exfatprogs: creating, fixing, and debugging exFAT filesystems. The goal of +exfatprogs: exfatprogs is to provide high performance and quality at the level of +exfatprogs: exFAT exfat utilities in windows. +exfatprogs: +exfatprogs: Homepage: https://github.com/exfatprogs/exfatprogs +exfatprogs: +exfatprogs: +exfatprogs: diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 5bc65fc7..8091411e 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -52,6 +52,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# If dynamic support for Ruby works with this $ARCH, then allow it: +if [ "$ARCH" = "x86_64" ]; then + RUBYDYNAMIC="=dynamic" +fi + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) @@ -80,21 +85,18 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ ./configure \ $* \ --prefix=/usr \ - --enable-pythoninterp \ --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \ - --enable-python3interp \ --with-python3-config-dir=$(python3-config --configdir) \ - --enable-perlinterp \ - --disable-tclinterp \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp${RUBYDYNAMIC} \ + --enable-tclinterp=dynamic \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ --with-compiledby="" \ --build=$ARCH-slackware-linux || exit 1 - - # I had been adding this, but got 100% complaints and 0% kudos: - # --enable-rubyinterp - } cd $TMP/vim-$VERSION || exit 1 diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index 1e9cdd0a..1ef6744b 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -60,6 +60,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# If dynamic support for Ruby works with this $ARCH, then allow it: +if [ "$ARCH" = "x86_64" ]; then + RUBYDYNAMIC="=dynamic" +fi + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) @@ -116,21 +121,19 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ $* \ --prefix=/usr \ - --enable-pythoninterp \ --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \ - --enable-python3interp \ --with-python3-config-dir=$(python3-config --configdir) \ - --enable-perlinterp \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp${RUBYDYNAMIC} \ + --enable-tclinterp=dynamic \ --disable-canberra \ - --disable-tclinterp \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ --with-compiledby="" \ --build=$ARCH-slackware-linux || exit 1 - - # I had been adding this, but got 100% complaints and 0% kudos: - # --enable-rubyinterp } cd $TMP/vim-$VERSION || exit 1 diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index a3d59afd..a9e32457 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=subversion VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index 286b4fc0..6305eae9 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openexr 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 diff --git a/source/l/python-idna/python-idna.SlackBuild b/source/l/python-idna/python-idna.SlackBuild index a5e6f9d2..3ce4eb5f 100755 --- a/source/l/python-idna/python-idna.SlackBuild +++ b/source/l/python-idna/python-idna.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-idna VERSION=${VERSION:-$(echo idna-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=idna diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index a7af8f9f..501cae5b 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils 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 @@ -74,16 +74,13 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM rm -rf $PKG -mkdir -p $TMP $PKG +mkdir -p $TMP $PKG/sbin cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION -# Fix for new libcap-ng: -zcat $CWD/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch b/source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch deleted file mode 100644 index ed319182..00000000 --- a/source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f4e7c84467152624a288351321c8664dbf3364af Mon Sep 17 00:00:00 2001 -From: Jonas Witschel -Date: Sat, 21 Nov 2020 11:41:26 +0100 -Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when - CAP_SETPCAP is given - -libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error -of -4 when trying to update the capability bounding set without having the -CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng -silently skipped updating the bounding set and only updated the normal -CAPNG_SELECT_CAPS capabilities instead. - -Check beforehand whether we have CAP_SETPCAP, in which case we can use -CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set. -Otherwise, we can at least update the normal capabilities, but refrain from -trying to update the bounding set to avoid getting an error. - -Signed-off-by: Jonas Witschel ---- - mount.cifs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 4feb397..88b8b69 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -338,6 +338,8 @@ static int set_password(struct parsed_mount_info *parsed_info, const char *src) - static int - drop_capabilities(int parent) - { -+ capng_select_t set = CAPNG_SELECT_CAPS; -+ - capng_setpid(getpid()); - capng_clear(CAPNG_SELECT_BOTH); - if (parent) { -@@ -355,7 +357,10 @@ drop_capabilities(int parent) - return EX_SYSERR; - } - } -- if (capng_apply(CAPNG_SELECT_BOTH)) { -+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) { -+ set = CAPNG_SELECT_BOTH; -+ } -+ if (capng_apply(set)) { - fprintf(stderr, "Unable to apply new capability set.\n"); - return EX_SYSERR; - } --- -2.29.2 - - -From 64dfbafe7a0639a96d67f0b840b6e6498e1f68a9 Mon Sep 17 00:00:00 2001 -From: Jonas Witschel -Date: Sat, 21 Nov 2020 11:48:33 +0100 -Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when - CAP_SETPCAP is given - -libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error -of -4 when trying to update the capability bounding set without having the -CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng -silently skipped updating the bounding set and only updated the normal -CAPNG_SELECT_CAPS capabilities instead. - -Check beforehand whether we have CAP_SETPCAP, in which case we can use -CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set. -Otherwise, we can at least update the normal capabilities, but refrain from -trying to update the bounding set to avoid getting an error. - -Signed-off-by: Jonas Witschel ---- - cifs.upcall.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cifs.upcall.c b/cifs.upcall.c -index 1559434..af1a0b0 100644 ---- a/cifs.upcall.c -+++ b/cifs.upcall.c -@@ -88,6 +88,8 @@ typedef enum _sectype { - static int - trim_capabilities(bool need_environ) - { -+ capng_select_t set = CAPNG_SELECT_CAPS; -+ - capng_clear(CAPNG_SELECT_BOTH); - - /* SETUID and SETGID to change uid, gid, and grouplist */ -@@ -105,7 +107,10 @@ trim_capabilities(bool need_environ) - return 1; - } - -- if (capng_apply(CAPNG_SELECT_BOTH)) { -+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) { -+ set = CAPNG_SELECT_BOTH; -+ } -+ if (capng_apply(set)) { - syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__); - return 1; - } --- -2.29.2 - diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 7ec102f4..84873f46 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} ## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. ## Patches to fix this are welcome, otherwise we'll keep an eye on upstream. diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index 682e0f83..bf6884be 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=marisa SRCNAM=marisa-trie VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -- cgit v1.2.3