diff options
Diffstat (limited to 'source')
23 files changed, 296 insertions, 130 deletions
diff --git a/source/k/kernel-configs/config-generic-4.19.73 b/source/k/kernel-configs/config-generic-4.19.74 index 1b44cc11f..ce7f19d02 100644 --- a/source/k/kernel-configs/config-generic-4.19.73 +++ b/source/k/kernel-configs/config-generic-4.19.74 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.73.x64 b/source/k/kernel-configs/config-generic-4.19.74.x64 index 9308cf0d7..8baa96fa8 100644 --- a/source/k/kernel-configs/config-generic-4.19.73.x64 +++ b/source/k/kernel-configs/config-generic-4.19.74.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.73-smp b/source/k/kernel-configs/config-generic-smp-4.19.74-smp index 7bf4d34bd..c5c67eae5 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.73-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.74-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.73 b/source/k/kernel-configs/config-huge-4.19.74 index 1998c62e2..d39b05feb 100644 --- a/source/k/kernel-configs/config-huge-4.19.73 +++ b/source/k/kernel-configs/config-huge-4.19.74 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.73.x64 b/source/k/kernel-configs/config-huge-4.19.74.x64 index 84e740bcb..ac561400c 100644 --- a/source/k/kernel-configs/config-huge-4.19.73.x64 +++ b/source/k/kernel-configs/config-huge-4.19.74.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.73-smp b/source/k/kernel-configs/config-huge-smp-4.19.74-smp index 87a8f66f2..30fa00f9b 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.73-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.74-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.73 Kernel Configuration +# Linux/x86 4.19.74 Kernel Configuration # # diff --git a/source/l/fuse/slack-desc b/source/l/fuse/slack-desc index 7199c74e7..37cf6ef33 100644 --- a/source/l/fuse/slack-desc +++ b/source/l/fuse/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler------------------------------------------------------| fuse: fuse (Filesystem in Userspace) -fuse: +fuse: fuse: FUSE is a simple interface for userspace programs to export a virtual fuse: filesystem to the Linux kernel. FUSE also aims to provide a secure fuse: method for non privileged users to create and mount their own diff --git a/source/l/fuse3/doinst.sh b/source/l/fuse3/doinst.sh new file mode 100644 index 000000000..f87ea43b0 --- /dev/null +++ b/source/l/fuse3/doinst.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Keep same perms on rc.fuse3.new: +if [ -e etc/rc.d/rc.fuse3 ]; then + cp -a etc/rc.d/rc.fuse3 etc/rc.d/rc.fuse3.new.incoming + cat etc/rc.d/rc.fuse3.new > etc/rc.d/rc.fuse3.new.incoming + mv etc/rc.d/rc.fuse3.new.incoming etc/rc.d/rc.fuse3.new +fi + +config etc/rc.d/rc.fuse3.new + diff --git a/source/l/fuse3/fuse3.SlackBuild b/source/l/fuse3/fuse3.SlackBuild new file mode 100755 index 000000000..c1122f71f --- /dev/null +++ b/source/l/fuse3/fuse3.SlackBuild @@ -0,0 +1,158 @@ +#!/bin/bash + +# Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com> +# Copyright 2008, 2009, 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# 1.- Redistributions of source code 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. + +# Modified by Robby Workman <rworkman@slackware.com> +# Modified by Eric Hameleers <alien@slackware.com> + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=fuse3 +SRCNAM=fuse +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) "} + +# 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 + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$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: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# 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 + +# Create compat symlinks for mount.fuse3 and fusermount3: +mkdir -p $PKG/sbin $PKG/bin +ln -s /usr/sbin/mount.fuse3 $PKG/sbin/mount.fuse3 +ln -s /usr/bin/fusermount3 $PKG/bin/fusermount3 + +# Move the init script of fuse to the right place: +mv $PKG/etc/init.d $PKG/etc/rc.d +mv $PKG/etc/rc.d/fuse3 $PKG/etc/rc.d/rc.fuse3.new + +# udev handles device node creation +rm -rf $PKG/dev + +mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION +cp -a \ + AUTHORS COPYING* FAQ Filesystems GPL*.txt INSTALL LICENSE NEWS README* \ + doc/how-fuse-works doc/kernel.txt \ + $PKG/usr/doc/$SRCNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog.rst ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog.rst | head -n 1000 > $DOCSDIR/ChangeLog.rst + touch -r ChangeLog.rst $DOCSDIR/ChangeLog.rst +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/fuse3/slack-desc b/source/l/fuse3/slack-desc new file mode 100644 index 000000000..64223196d --- /dev/null +++ b/source/l/fuse3/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------------------------------------------------------| +fuse3: fuse3 (Filesystem in Userspace v3) +fuse3: +fuse3: FUSE is a simple interface for userspace programs to export a virtual +fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure +fuse3: method for non privileged users to create and mount their own +fuse3: filesystem implementations. +fuse3: +fuse3: Homepage: https://github.com/libfuse/libfuse +fuse3: +fuse3: +fuse3: diff --git a/source/l/gnome-themes-standard/doinst.sh b/source/l/gnome-themes-extra/doinst.sh index 9b0defbe9..9b0defbe9 100644 --- a/source/l/gnome-themes-standard/doinst.sh +++ b/source/l/gnome-themes-extra/doinst.sh diff --git a/source/l/gnome-themes-standard/gnome-themes-standard.SlackBuild b/source/l/gnome-themes-extra/gnome-themes-extra.SlackBuild index 23f98d5e1..b9d9e1fd2 100755 --- a/source/l/gnome-themes-standard/gnome-themes-standard.SlackBuild +++ b/source/l/gnome-themes-extra/gnome-themes-extra.SlackBuild @@ -1,9 +1,9 @@ #!/bin/bash -# Slackware build script for gnome-themes-standard +# Slackware build script for gnome-themes-extra # Copyright 2013 Robby Workman, Northport, Alabama, USA -# Copyright 2013i, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -24,9 +24,9 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=gnome-themes-standard +PKGNAM=gnome-themes-extra VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/gnome-themes-extra/slack-desc b/source/l/gnome-themes-extra/slack-desc new file mode 100644 index 000000000..2c0539080 --- /dev/null +++ b/source/l/gnome-themes-extra/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------------------------------------------------------| +gnome-themes-extra: gnome-themes-extra (default icons used by GTK+) +gnome-themes-extra: +gnome-themes-extra: A set of default icons used by many GTK+ applications. +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: +gnome-themes-extra: diff --git a/source/l/gnome-themes-standard/slack-desc b/source/l/gnome-themes-standard/slack-desc deleted file mode 100644 index 654f0c35b..000000000 --- a/source/l/gnome-themes-standard/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -gnome-themes-standard: gnome-themes-standard (default icons used by GTK+) -gnome-themes-standard: -gnome-themes-standard: A set of default icons used by many GTK+ applications. -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: -gnome-themes-standard: diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild index d96592b24..ce9b33f08 100755 --- a/source/l/gobject-introspection/gobject-introspection.SlackBuild +++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild @@ -87,18 +87,28 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib$LIBDIRSUFFIX \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dgtk_doc=true \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild index df7b6a638..422b981a4 100755 --- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gsettings-desktop-schemas 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/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch b/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch deleted file mode 100644 index 232810144..000000000 --- a/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 940cb1d7dc3bd511ebd71c359cc5386d3682e0ba Mon Sep 17 00:00:00 2001 -From: Robby Workman <rworkman@slackware.com> -Date: Thu, 18 Jul 2019 03:38:41 -0500 -Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so - -On Slackware development branch with gvfs-1.40.2, I just noticed this: - # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" - libgvfscommon.so => not found - -After some backtracking, it seems that this first occurred in the -switchover from autotools to meson in the 1.36.x --> 1.38.x bump. - -Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and -assistance with troubleshooting this. - -Signed-off-by: Robby Workman <rworkman@slackware.com> ---- - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 2d253e3b..75750cee 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -124,6 +124,7 @@ libgvfsdaemon = shared_library( - c_args: cflags, - install: true, - install_dir: gvfs_pkglibdir, -+ install_rpath: gvfs_rpath, - ) - - libgvfsdaemon_dep = declare_dependency( --- -2.22.0 - diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild index 3497ad050..b59469b08 100755 --- a/source/l/gvfs/gvfs.SlackBuild +++ b/source/l/gvfs/gvfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gvfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -75,9 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://gitlab.gnome.org/GNOME/gvfs/issues/411 -zcat $CWD/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild index 41d379a66..63d04f5a5 100755 --- a/source/l/libsoup/libsoup.SlackBuild +++ b/source/l/libsoup/libsoup.SlackBuild @@ -89,9 +89,9 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -Dgssapi=false \ - -Dvapi=true \ - -Ddoc=true \ + -Dgssapi=disabled \ + -Dvapi=enabled \ + -Ddoc=enabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 0c675aa23..612965abb 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -78,23 +78,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -./autogen.sh - -# Configure: -CFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --enable-introspection \ - --build=$ARCH-slackware-linux || exit 1 - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index f77271809..56365a9cb 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind -VERSION=${VERSION:-9.14.5} +VERSION=${VERSION:-9.14.6} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -67,11 +67,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.gz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -# Remove use of SO_BSDCOMPAT which has been obsolete since the 2.2.x kernel -# series, and generates warnings under 2.6.x kernels. This _might_ be fixed -# upstream already, but an explicit #undef SO_BSDCOMPAT does not hurt: -zcat $CWD/bind.so_bsdcompat.diff.gz | patch -p1 --verbose || exit - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -92,7 +87,6 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-shared \ --disable-static \ - --enable-threads \ --with-openssl=/usr \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/n/bind/bind.so_bsdcompat.diff b/source/n/bind/bind.so_bsdcompat.diff deleted file mode 100644 index 5d78031b7..000000000 --- a/source/n/bind/bind.so_bsdcompat.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600 -+++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600 -@@ -245,6 +245,8 @@ - - #define SOCK_DEAD(s) ((s)->references == 0) - -+#undef SO_BSDCOMPAT -+ - static void - manager_log(isc_socketmgr_t *sockmgr, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/source/n/sshfs/sshfs.SlackBuild b/source/n/sshfs/sshfs.SlackBuild index 8f4aae010..78a5b9f1d 100755 --- a/source/n/sshfs/sshfs.SlackBuild +++ b/source/n/sshfs/sshfs.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sshfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,21 +76,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --bindir=/bin \ - --sbindir=/sbin \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --build=${ARCH}-slackware-linux \ - || exit 1 - -make $NUMJOBS || make || exit 1 - -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |