Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

4 files changed, 47 insertions, 98 deletions

diff --git a/source/ap/acct/581421-sa-hz-division.patch b/source/ap/acct/581421-sa-hz-division.patch
deleted file mode 100644
index 0c15c0171..000000000
--- a/source/ap/acct/581421-sa-hz-division.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Dominique Brazziel <dbrazziel@snet.net>
-Subject: Fix for sa reporting 'inf' or 'nan' instead of correct values
- because of division by clock values.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581421
-Last-Updated: 2010-07-23
-
---- acct-6.5.4.orig/sa.c	2010-02-11 20:55:14.000000000 -0500
-+++ acct-6.5.4/sa.c	2010-07-22 14:08:26.000000000 -0400
-@@ -417,7 +417,6 @@
-           (void)printf("%s: GNU Accounting Utilities (release %s)\n",
-                        program_name, VERSION_STRING);
-           exit(EXIT_SUCCESS);
--        case 4:
-           acct_file_name = optarg;
-           break;
-         case 'j':
-@@ -594,8 +593,11 @@
-       exit(EXIT_FAILURE);
-     }
- 
-+    /* Set HZ value from system */
-+    hzval = sysconf(_SC_CLK_TCK);
-+    
-   /* Print out some debugging information. */
--
-+  
-   if (debugging_enabled)
-     {
-       (void)fprintf (stddebug, "hzval -> %d\n", hzval);
-@@ -1162,31 +1164,30 @@
- # define CURR_AHZ ((double)(ahz))
- #endif
- 
--
-   if (debugging_enabled)
-     fprintf (stddebug, "\
-              ----------------------------------------------------------------------\n\
-              acct entries\n\
-              ----------------------------------------------------------------------\n\
-              ");
--
-+             
-   /* loop while there are entries to be had */
-   while ((rec = pacct_get_entry ()) != NULL)
-     {
- #ifdef HAVE_ACUTIME
--      double ut = comp_t_2_double (rec->ac_utime) / (double) hzval;
-+      double ut = comp_t_2_double (rec->ac_utime) / CURR_AHZ;
- #endif
- 
- #ifdef HAVE_ACSTIME
--      double st = comp_t_2_double (rec->ac_stime) / (double) hzval;
-+      double st = comp_t_2_double (rec->ac_stime) / CURR_AHZ;
- #endif
- 
- #ifdef HAVE_ACETIME
--      double et = comp_t_2_double (rec->ac_etime) / (double) hzval;
-+      double et = ACETIME_2_DOUBLE (rec->ac_etime) / CURR_AHZ;
- #endif
- 
- #ifdef HAVE_ACIO
--      double di = comp_t_2_double (rec->ac_io) / (double) hzval;
-+      double di = comp_t_2_double (rec->ac_io) / CURR_AHZ;
- #endif
- 
- #ifdef HAVE_ACMEM
diff --git a/source/ap/acct/acct.SlackBuild b/source/ap/acct/acct.SlackBuild
index 43cc97459..ae09f5ad1 100755
--- a/source/ap/acct/acct.SlackBuild
+++ b/source/ap/acct/acct.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 2006, 2008, 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+#!/bin/bash
+# Copyright 2006, 2008, 2009, 2010, 2013, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -19,24 +19,33 @@
 #  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=acct
-PKGVER=6.5.4
-VERSION=6.5.4
+PKGVER=6.6.4
+VERSION=6.6.4
 BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    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 [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# 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
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -46,7 +55,6 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-acct
 
@@ -66,11 +74,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/581421-sa-hz-division.patch.gz | patch -p1 || exit 1
-
 zcat $CWD/acct.logdir.fhs.diff.gz | patch -p1 || exit 1
 # Need this after patching configure.ac:
-autoreconf
+autoreconf -vif
 
 # Configure:
 CFLAGS="$SLKCFLAGS" \
@@ -79,7 +85,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --enable-linux-multiformat \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
 make || exit 1
@@ -137,7 +143,7 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TODO \
+  AUTHORS COPYING* INSTALL NEWS* README* TODO \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/ap/acct/acct.logdir.fhs.diff b/source/ap/acct/acct.logdir.fhs.diff
index 1463857e9..dbc95b2de 100644
--- a/source/ap/acct/acct.logdir.fhs.diff
+++ b/source/ap/acct/acct.logdir.fhs.diff
@@ -1,28 +1,37 @@
---- ./configure.ac.orig	2010-02-12 10:39:09.000000000 -0600
-+++ ./configure.ac	2010-07-28 12:35:30.000000000 -0500
-@@ -187,7 +187,7 @@
- 
+--- ./configure.ac.orig	2017-04-05 16:10:56.000000000 -0500
++++ ./configure.ac	2017-04-06 12:03:10.698973380 -0500
+@@ -243,7 +243,7 @@
+ #ifndef WTMP_FILE
+ #  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
+         || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define WTMP_FILE "/var/log/account/wtmp"
++#    define WTMP_FILE "/var/log/wtmp"
+ #  else
+ #    if defined(sun) || defined(AMIX)
+ #      define WTMP_FILE "/var/adm/wtmp"
+@@ -260,7 +260,7 @@
  #ifndef ACCT_FILE
- #  if defined(__FreeBSD__) || defined(__linux__)
--#    define ACCT_FILE "/var/account/pacct"
+ #  if defined(__FreeBSD__) || defined(__linux__) \
+         || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define ACCT_FILE "/var/log/account/pacct"
 +#    define ACCT_FILE "/var/log/pacct"
  #  else
  #    if defined(__NetBSD__)
- #      define ACCT_FILE "/var/account/acct"
-@@ -207,7 +207,7 @@
- 
+ #      define ACCT_FILE "/var/log/account/acct"
+@@ -281,7 +281,7 @@
  #ifndef SAVACCT_FILE
- #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
--#    define SAVACCT_FILE "/var/account/savacct"
+ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+         || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define SAVACCT_FILE "/var/log/account/savacct"
 +#    define SAVACCT_FILE "/var/log/savacct"
  #  else
  #    if defined(sun) || defined(AMIX)
  #      define SAVACCT_FILE "/var/adm/savacct"
-@@ -223,7 +223,7 @@
- 
+@@ -298,7 +298,7 @@
  #ifndef USRACCT_FILE
- #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__)
--#    define USRACCT_FILE "/var/account/usracct"
+ #  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+         || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define USRACCT_FILE "/var/log/account/usracct"
 +#    define USRACCT_FILE "/var/log/usracct"
  #  else
  #    if defined(sun) || defined(AMIX)
diff --git a/source/ap/acct/slack-desc b/source/ap/acct/slack-desc
index 6cffcfcb4..15ce4d32b 100644
--- a/source/ap/acct/slack-desc
+++ b/source/ap/acct/slack-desc
@@ -1,15 +1,15 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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------------------------------------------------------|
 acct: acct (process accounting utilities)
 acct:
 acct: This is a set of utilities which reports and summarizes data about
-acct: user connect times and process execution statistics.  To activate
+acct: user connect times and process execution statistics. To activate
 acct: process accounting, create the log file (touch /var/log/pacct), and
 acct: then use the accton command to start it (accton /var/log/pacct).
 acct: Be aware that the log file can grow to be quite large.