summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-03-31 18:51:16 +0000
committerEric Hameleers <alien@slackware.com>2019-04-01 08:59:43 +0200
commitdf86158dc598141c63689a86c2f247053e616719 (patch)
tree3c528a0cf288226259f3711dbd81043b94826322 /source
parent7aa0551f5b00938c12907fc6d975ba24ba1bedb1 (diff)
downloadcurrent-df86158dc598141c63689a86c2f247053e616719.tar.gz
Sun Mar 31 18:51:16 UTC 201920190331185116
a/quota-4.05-x86_64-1.txz: Upgraded. d/cmake-3.14.1-x86_64-1.txz: Upgraded. d/patchelf-0.10-x86_64-1.txz: Upgraded. l/harfbuzz-2.4.0-x86_64-1.txz: Upgraded. l/utf8proc-2.3.0-x86_64-1.txz: Upgraded. n/httpd-2.4.39-x86_64-1.txz: Upgraded. n/iputils-20190324-x86_64-1.txz: Upgraded. n/postfix-3.4.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/quota/quota.SlackBuild3
-rw-r--r--source/a/quota/quotad.fix.high.cpu.usage.diff35
-rwxr-xr-xsource/d/patchelf/patchelf.SlackBuild6
-rwxr-xr-xsource/l/harfbuzz/harfbuzz.SlackBuild2
-rw-r--r--source/n/httpd/httpd.url4
-rwxr-xr-xsource/n/iputils/iputils.SlackBuild51
-rwxr-xr-xsource/n/postfix/postfix.SlackBuild2
7 files changed, 37 insertions, 66 deletions
diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild
index ee7ed2c9..ad67fc30 100755
--- a/source/a/quota/quota.SlackBuild
+++ b/source/a/quota/quota.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=quota
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
@@ -85,7 +85,6 @@ tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
zcat $CWD/quota.lwrap.needs.lnsl.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/quotad.fix.high.cpu.usage.diff.gz | patch -p1 -l --verbose || exit 1
autoreconf -vif
diff --git a/source/a/quota/quotad.fix.high.cpu.usage.diff b/source/a/quota/quotad.fix.high.cpu.usage.diff
deleted file mode 100644
index 5dfafc9f..00000000
--- a/source/a/quota/quotad.fix.high.cpu.usage.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up quota-4.04/svc_socket.c.orig quota-4.04/svc_socket.c
---- quota-4.04/svc_socket.c.orig 2017-09-05 10:04:16.000000000 -0400
-+++ quota-4.04/svc_socket.c 2018-05-12 14:46:44.813388914 -0400
-@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrin
- return -1;
- }
-
-+ if (ai->ai_family == AF_INET6) {
-+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+ &optval, sizeof(optval)) < 0) {
-+ errstr(_("Cannot set ipv6 socket options: %s\n"), strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-+ }
-+
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
- errstr(_("Cannot set socket options: %s\n"), strerror(errno));
- close(fd);
-@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrin
- close(fd);
- return -1;
- }
-+
-+ if (ai->ai_protocol == IPPROTO_TCP) {
-+ if (listen(fd, SOMAXCONN) < 0) {
-+ errstr(_("Cannot listen to address: %s\n"), strerror(errno));
-+ close(fd);
-+ return -1;
-+ }
-+ }
-+
- return fd;
- }
-
diff --git a/source/d/patchelf/patchelf.SlackBuild b/source/d/patchelf/patchelf.SlackBuild
index c5f480eb..7b8784fe 100755
--- a/source/d/patchelf/patchelf.SlackBuild
+++ b/source/d/patchelf/patchelf.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=patchelf
-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
@@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 9221c187..0a4ae61f 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=harfbuzz
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/n/httpd/httpd.url b/source/n/httpd/httpd.url
index e3b1f00d..ad6794fe 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.38.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.38.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.39.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.39.tar.bz2.asc
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index e5af5d80..9984e160 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, 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=iputils
-VERSION=s20180629
-BUILD=${BUILD:-3}
+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
@@ -67,9 +67,6 @@ rm -rf iputils-$VERSION
tar xvf $CWD/iputils-$VERSION.tar.?z || exit 1
cd iputils-$VERSION || exit 1
-# Don't use nettle libraary for ping6:
-sed -i "s/USE_NETTLE=yes/USE_NETTLE=no/g" Makefile
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -77,22 +74,30 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-make VPATH=/usr/lib${LIBDIRSUFFIX} || exit 1
-( cd doc ; make man || exit 1 ) || exit 1
-
-( cd ninfod
- CFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --disable-static \
- --build=$ARCH-slackware-linux || exit 1
- make || exit 1
-) || exit 1
-
+# Configure and build:
+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 \
+ -DBUILD_TRACEROUTE6=true \
+ -DBUILD_RARPD=true \
+ .. || exit 1
+ ninja || exit 1
+cd ..
+
+cd meson-build
strip arping clockdiff ninfod/ninfod ping rarpd rdisc tracepath traceroute6
mkdir -p $PKG/sbin
cat arping > $PKG/sbin/arping
@@ -126,9 +131,11 @@ mkdir -p $PKG/usr/man/man8
ln -sf tracepath.8.gz tracepath6.8.gz
)
+cd ..
mkdir -p $PKG/usr/doc/iputils-$VERSION
cp -a \
INSTALL* LICENSE* README* RELNOTES* \
+ ninfod/COPYING* \
$PKG/usr/doc/iputils-$VERSION
chmod 644 $PKG/usr/doc/iputils-$VERSION/*
diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild
index e82b1d43..1227f291 100755
--- a/source/n/postfix/postfix.SlackBuild
+++ b/source/n/postfix/postfix.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=postfix
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