summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-17 23:02:41 +0000
committerEric Hameleers <alien@slackware.com>2020-12-18 08:59:50 +0100
commit71f79f9766c0485019da578b58d526e8ccf07eb9 (patch)
tree0a63d481f77f4d900084bc65a054cf468d6da85e /source
parenteae6d71c33a23e358e827cfd0e7e6fa5739c32be (diff)
downloadcurrent-71f79f9766c0485019da578b58d526e8ccf07eb9.tar.gz
Thu Dec 17 23:02:41 UTC 202020201217230241
a/inih-r52-x86_64-1.txz: Added. This is required by the latest xfsprogs. a/sysklogd-2.1.2-x86_64-2.txz: Rebuilt. rc.syslog: fix lack of <CR> after startup output. a/xfsprogs-5.10.0-x86_64-1.txz: Upgraded. ap/vim-8.2.2151-x86_64-1.txz: Upgraded. l/glib2-2.66.4-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_50-x86_64-1.txz: Upgraded. l/python-requests-2.25.1-x86_64-1.txz: Upgraded. l/qtkeychain-0.12.0-x86_64-1.txz: Upgraded. l/zstd-1.4.7-x86_64-1.txz: Upgraded. n/bind-9.16.10-x86_64-1.txz: Upgraded. x/libwacom-1.7-x86_64-1.txz: Upgraded. x/xorg-server-1.20.10-x86_64-2.txz: Rebuilt. Recompiled to find DRI modules in the new location. x/xorg-server-xephyr-1.20.10-x86_64-2.txz: Rebuilt. x/xorg-server-xnest-1.20.10-x86_64-2.txz: Rebuilt. x/xorg-server-xvfb-1.20.10-x86_64-2.txz: Rebuilt. x/xorg-server-xwayland-1.20.10-x86_64-2.txz: Rebuilt. xap/vim-gvim-8.2.2151-x86_64-1.txz: Upgraded. extra/pure-alsa-system/kde-runtime-4.14.3-x86_64-8_alsa.txz: Removed. I'm starting to learn towards removing all of these packages as there are ways to configure PulseAudio to get out of the way. See (for example) this article mentioned in a blog post by alienBOB: https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/inih/inih.SlackBuild142
-rw-r--r--source/a/inih/inih.url1
-rw-r--r--source/a/inih/slack-desc19
-rw-r--r--source/a/sysklogd/config/rc.syslog.new2
-rwxr-xr-xsource/a/sysklogd/sysklogd.SlackBuild2
-rwxr-xr-xsource/a/xfsprogs/xfsprogs.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt3
-rwxr-xr-xsource/installer/build_installer.sh2
-rwxr-xr-xsource/l/zstd/zstd.SlackBuild2
-rw-r--r--source/x/x11/build/xorg-server2
10 files changed, 172 insertions, 5 deletions
diff --git a/source/a/inih/inih.SlackBuild b/source/a/inih/inih.SlackBuild
new file mode 100755
index 00000000..03f480cd
--- /dev/null
+++ b/source/a/inih/inih.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/bash
+
+# Copyright 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=inih
+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:
+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 \
+ -Ddefault_library=shared \
+ -Ddistro_install=true \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# We don't support a /usr partition, but will still at least move the
+# library out of there since utilities in /sbin use it:
+mkdir $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+ for file in lib*.so.? ; do
+ mv $file ../../lib${LIBDIRSUFFIX}
+ ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+ done
+)
+
+# 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 \
+ COPYING* LICENSE* README* \
+ $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/inih/inih.url b/source/a/inih/inih.url
new file mode 100644
index 00000000..b472277f
--- /dev/null
+++ b/source/a/inih/inih.url
@@ -0,0 +1 @@
+https://github.com/benhoyt/inih
diff --git a/source/a/inih/slack-desc b/source/a/inih/slack-desc
new file mode 100644
index 00000000..24f2d8f4
--- /dev/null
+++ b/source/a/inih/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------------------------------------------------------|
+inih: inih (INI Not Invented Here)
+inih:
+inih: inih (INI Not Invented Here)** is a simple .INI file parser written in
+inih: C. It's only a couple of pages of code, and it was designed to be
+inih: small and simple, so it's good for embedded systems. It's also more or
+inih: less compatible with Python's ConfigParser style of .INI files,
+inih: including RFC 822-style multi-line syntax and `name: value` entries.
+inih:
+inih: Homepage: https://github.com/benhoyt/inih
+inih:
+inih:
diff --git a/source/a/sysklogd/config/rc.syslog.new b/source/a/sysklogd/config/rc.syslog.new
index a802ec38..d8640bca 100644
--- a/source/a/sysklogd/config/rc.syslog.new
+++ b/source/a/sysklogd/config/rc.syslog.new
@@ -10,7 +10,7 @@ fi
syslogd_start() {
if [ -x /usr/sbin/syslogd ]; then
- echo -n "Starting syslogd daemon: /usr/sbin/syslogd ${SYSLOGD_OPTS}"
+ echo "Starting syslogd daemon: /usr/sbin/syslogd ${SYSLOGD_OPTS}"
/usr/sbin/syslogd $SYSLOGD_OPTS
fi
}
diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild
index c797be8a..00448503 100755
--- a/source/a/sysklogd/sysklogd.SlackBuild
+++ b/source/a/sysklogd/sysklogd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysklogd
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index 1fbf978d..fe5d5e8f 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfsprogs
VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 8ba90b52..bd35a2f8 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Thu Dec 17 20:19:08 UTC 2020
+ Add libinih, needed by xfsprogs.
++--------------------------+
Tue Dec 15 19:24:23 UTC 2020
Update dropbear to get ecdsa support. Thanks to Robby Workman.
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 6c78239a..5e0ea470 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -877,6 +877,7 @@ a/grep \
a/gzip \
a/hdparm \
a/hwdata \
+a/inih \
a/jfsutils \
a/kmod \
a/lvm2 \
@@ -1229,6 +1230,7 @@ cp -fa${VERBOSE1} \
libgcrypt*.so* \
libgpg-error*.so* \
libgssapi_krb5.so* \
+ libinih.so* \
libk5crypto.so* \
libkeyutils.so* \
libkmod*so* \
diff --git a/source/l/zstd/zstd.SlackBuild b/source/l/zstd/zstd.SlackBuild
index 8d272f27..f14b05f4 100755
--- a/source/l/zstd/zstd.SlackBuild
+++ b/source/l/zstd/zstd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=zstd
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) "}
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2