Mon Jan 20 22:37:58 UTC 202020200120223758

a/aaa_terminfo-6.1_20200118-x86_64-1.txz:  Upgraded.
d/make-4.3-x86_64-1.txz:  Upgraded.
d/python-setuptools-45.1.0-x86_64-1.txz:  Upgraded.
l/ncurses-6.1_20200118-x86_64-1.txz:  Upgraded.
n/alpine-2.22-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-68.4.2esr-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/68.4.2/releasenotes/
    https://bugzilla.mozilla.org/show_bug.cgi?id=1602726

7 files changed, 14 insertions, 235 deletions

diff --git a/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch b/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch
deleted file mode 100644
index 6f44ae3f..00000000
--- a/source/d/make/b552b05251980f693c729e251f93f5225b400714.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Sat, 3 Jun 2017 16:20:51 -0400
-Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs.
-
-* posixos.c (set_blocking): Set blocking on a file descriptor.
-(jobserver_setup): Set non-blocking on the jobserver read side.
-(jobserver_parse_auth): Ditto.
-(jobserver_acquire_all): Set blocking to avoid a busy-wait loop.
-(jobserver_acquire): If the non-blocking read() returns without
-taking a token then try again.
----
- posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 71 insertions(+), 26 deletions(-)
-
-diff --git a/posixos.c b/posixos.c
-index e642d7f..dbafa51 100644
---- a/posixos.c
-+++ b/posixos.c
-@@ -62,6 +62,24 @@ make_job_rfd (void)
- #endif
- }
- 
-+static void
-+set_blocking (int fd, int blocking)
-+{
-+  // If we're not using pselect() don't change the blocking
-+#ifdef HAVE_PSELECT
-+  int flags;
-+  EINTRLOOP (flags, fcntl (fd, F_GETFL));
-+  if (flags >= 0)
-+    {
-+      int r;
-+      flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK);
-+      EINTRLOOP (r, fcntl (fd, F_SETFL, flags));
-+      if (r < 0)
-+        pfatal_with_name ("fcntl(O_NONBLOCK)");
-+    }
-+#endif
-+}
-+
- unsigned int
- jobserver_setup (int slots)
- {
-@@ -86,6 +104,9 @@ jobserver_setup (int slots)
-         pfatal_with_name (_("init jobserver pipe"));
-     }
- 
-+  /* When using pselect() we want the read to be non-blocking.  */
-+  set_blocking (job_fds[0], 0);
-+
-   return 1;
- }
- 
-@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth)
-       return 0;
-     }
- 
-+  /* When using pselect() we want the read to be non-blocking.  */
-+  set_blocking (job_fds[0], 0);
-+
-   return 1;
- }
- 
-@@ -169,7 +193,10 @@ jobserver_acquire_all (void)
- {
-   unsigned int tokens = 0;
- 
--  /* Close the write side, so the read() won't hang.  */
-+  /* Use blocking reads to wait for all outstanding jobs.  */
-+  set_blocking (job_fds[0], 1);
-+
-+  /* Close the write side, so the read() won't hang forever.  */
-   close (job_fds[1]);
-   job_fds[1] = -1;
- 
-@@ -236,18 +263,12 @@ jobserver_pre_acquire (void)
- unsigned int
- jobserver_acquire (int timeout)
- {
--  sigset_t empty;
--  fd_set readfds;
-   struct timespec spec;
-   struct timespec *specp = NULL;
--  int r;
--  char intake;
-+  sigset_t empty;
- 
-   sigemptyset (&empty);
- 
--  FD_ZERO (&readfds);
--  FD_SET (job_fds[0], &readfds);
--
-   if (timeout)
-     {
-       /* Alarm after one second (is this too granular?)  */
-@@ -256,28 +277,52 @@ jobserver_acquire (int timeout)
-       specp = &spec;
-     }
- 
--  r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
--
--  if (r == -1)
-+  while (1)
-     {
--      /* Better be SIGCHLD.  */
--      if (errno != EINTR)
--        pfatal_with_name (_("pselect jobs pipe"));
--      return 0;
--    }
-+      fd_set readfds;
-+      int r;
-+      char intake;
- 
--  if (r == 0)
--    /* Timeout.  */
--    return 0;
-+      FD_ZERO (&readfds);
-+      FD_SET (job_fds[0], &readfds);
- 
--  /* The read FD is ready: read it!  */
--  EINTRLOOP (r, read (job_fds[0], &intake, 1));
--  if (r < 0)
--    pfatal_with_name (_("read jobs pipe"));
-+      r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
-+      if (r < 0)
-+        switch (errno)
-+          {
-+          case EINTR:
-+            /* SIGCHLD will show up as an EINTR.  */
-+            return 0;
-+
-+          case EBADF:
-+            /* Someone closed the jobs pipe.
-+               That shouldn't happen but if it does we're done.  */
-+              O (fatal, NILF, _("job server shut down"));
- 
--  /* What does it mean if read() returns 0?  It shouldn't happen because only
--     the master make can reap all the tokens and close the write side...??  */
--  return r > 0;
-+          default:
-+            pfatal_with_name (_("pselect jobs pipe"));
-+          }
-+
-+      if (r == 0)
-+        /* Timeout.  */
-+        return 0;
-+
-+      /* The read FD is ready: read it!  This is non-blocking.  */
-+      EINTRLOOP (r, read (job_fds[0], &intake, 1));
-+
-+      if (r < 0)
-+        {
-+          /* Someone sniped our token!  Try again.  */
-+          if (errno == EAGAIN)
-+            continue;
-+
-+          pfatal_with_name (_("read jobs pipe"));
-+        }
-+
-+      /* read() should never return 0: only the master make can reap all the
-+         tokens and close the write side...??  */
-+      return r > 0;
-+    }
- }
- 
- #else
--- 
-cgit v1.0-41-gc330
-
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index 0ea16d1d..770e972a 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=make
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+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
@@ -68,7 +68,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf make-$VERSION
-tar xvf $CWD/make-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/make-$VERSION.tar.?z || exit 1
 cd make-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -77,12 +77,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/make.guile30.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/b552b05251980f693c729e251f93f5225b400714.patch.gz | patch -p1 --verbose || exit 1
-
-autoreconf -vif
-
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -133,7 +127,7 @@ fi
 
 mkdir -p $PKG/usr/doc/make-$VERSION
 cp -a \
-  AUTHORS COPYING* ChangeLog NEWS README* \
+  AUTHORS* COPYING* ChangeLog NEWS* README* \
   $PKG/usr/doc/make-$VERSION/
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/d/make/make.glibc-2.27.glob.diff b/source/d/make/make.glibc-2.27.glob.diff
deleted file mode 100644
index 8d795f89..00000000
--- a/source/d/make/make.glibc-2.27.glob.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u -r make-4.2.1.orig/glob/glob.c make-4.2.1/glob/glob.c
---- make-4.2.1.orig/glob/glob.c	2013-10-20 12:14:38.000000000 -0500
-+++ make-4.2.1/glob/glob.c	2018-02-16 14:41:18.956182332 -0600
-@@ -208,28 +208,9 @@
- #endif /* __GNU_LIBRARY__ || __DJGPP__ */
- 
- 
--#if !defined __alloca && !defined __GNU_LIBRARY__
--
--# ifdef	__GNUC__
--#  undef alloca
--#  define alloca(n)	__builtin_alloca (n)
--# else	/* Not GCC.  */
--#  ifdef HAVE_ALLOCA_H
- #   include <alloca.h>
--#  else	/* Not HAVE_ALLOCA_H.  */
--#   ifndef _AIX
--#    ifdef WINDOWS32
--#     include <malloc.h>
--#    else
--extern char *alloca ();
--#    endif /* WINDOWS32 */
--#   endif /* Not _AIX.  */
--#  endif /* sparc or HAVE_ALLOCA_H.  */
--# endif	/* GCC.  */
--
- # define __alloca	alloca
- 
--#endif
- 
- #ifndef __GNU_LIBRARY__
- # define __stat stat
diff --git a/source/d/make/make.guile30.diff b/source/d/make/make.guile30.diff
deleted file mode 100644
index 8b13b14d..00000000
--- a/source/d/make/make.guile30.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./configure.ac.orig	2016-06-06 07:27:31.000000000 -0500
-+++ ./configure.ac	2017-12-02 12:21:41.682170019 -0600
-@@ -168,8 +168,8 @@
- # comes with it's own PC file so we have to specify them as individual
- # packages.  Ugh.
- AS_IF([test "x$with_guile" != xno],
--[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
--  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
-+[ PKG_CHECK_MODULES([GUILE], [guile-3.0], [have_guile=yes],
-+  [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
-     [have_guile=no])])
- ])
- 
diff --git a/source/d/make/slack-desc b/source/d/make/slack-desc
index 883506fb..dd71f84a 100644
--- a/source/d/make/slack-desc
+++ b/source/d/make/slack-desc
@@ -9,11 +9,11 @@
 make: make (GNU make utility to maintain groups of programs)
 make:
 make: This is the GNU implementation of make, which was written by Richard
-make: Stallman and Roland McGrath. The purpose of the make utility is to
-make: determine automatically which pieces of a large program need to be 
-make: recompiled, and issue the commands to recompile them. 
+make: Stallman and Roland McGrath with later development handled by Paul D.
+make: Smith. The purpose of the make utility is to determine automatically
+make: which pieces of a large program need to be recompiled, and issue the
+make: commands to recompile them. 
 make:
-make: This is needed to compile just about any major C program, including
-make: the Linux kernel.
+make: Homepage: https://savannah.gnu.org/projects/make/
 make:
 make:
diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild
index 6846bea0..978fecc8 100755
--- a/source/n/alpine/alpine.SlackBuild
+++ b/source/n/alpine/alpine.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=alpine
-VERSION=${VERSION:-2.21}
-ALPINEBUILD=${ALPINEBUILD:-3}
+VERSION=${VERSION:-2.22}
+ALPINEBUILD=${ALPINEBUILD:-1}
 IMAPDBUILD=${IMAPDBUILD:-1}
 PINEPGP=${PINEPGP:-0.18.0}
 
-# By default, do not build the unmaintained and possibly insecure impad:
+# By default, do not build the unmaintained and possibly insecure imapd:
 BUILD_IMAPD=${BUILD_IMAPD:-NO}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 01210af5..e61f021e 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=php
 VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-ALPINE=2.21
+ALPINE=2.22
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on: