From df86158dc598141c63689a86c2f247053e616719 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 31 Mar 2019 18:51:16 +0000 Subject: Sun Mar 31 18:51:16 UTC 2019 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. --- source/a/quota/quota.SlackBuild | 3 +-- source/a/quota/quotad.fix.high.cpu.usage.diff | 35 --------------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 source/a/quota/quotad.fix.high.cpu.usage.diff (limited to 'source/a/quota') diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild index ee7ed2c97..ad67fc30d 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 5dfafc9fd..000000000 --- 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; - } - -- cgit v1.2.3