12 files changed, 40 insertions, 215 deletions

diff --git a/source/a/usbutils/usbreset.c b/source/a/usbutils/usbreset.c
deleted file mode 100644
index abab5434c..000000000
--- a/source/a/usbutils/usbreset.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* usbreset -- send a USB port reset to a USB device */
-/* To build:  gcc -o usbreset usbreset.c */
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <linux/usbdevice_fs.h>
-
-
-static char *usbfs = NULL;
-
-struct usbentry {
-	int bus_num;
-	int dev_num;
-	int vendor_id;
-	int product_id;
-	char vendor_name[128];
-	char product_name[128];
-};
-
-static char *sysfs_attr(const char *dev, const char *attr)
-{
-	int fd, len = 0;
-	char path[PATH_MAX];
-	static char buf[129];
-
-	memset(buf, 0, sizeof(buf));
-	snprintf(path, sizeof(path) - 1, "/sys/bus/usb/devices/%s/%s", dev, attr);
-
-	fd = open(path, O_RDONLY);
-	if (fd >= 0) {
-		len = read(fd, buf, sizeof(buf) - 1);
-		close(fd);
-	}
-
-	while (--len > 0 && isspace(buf[len]))
-		buf[len] = 0;
-
-	return (len >= 0) ? buf : NULL;
-}
-
-static struct usbentry *parse_devlist(DIR *d)
-{
-	char *attr;
-	struct dirent *e;
-	static struct usbentry dev;
-
-	do {
-		e = readdir(d);
-
-		if (!e)
-			return NULL;
-	} while (!isdigit(e->d_name[0]) || strchr(e->d_name, ':'));
-
-	memset(&dev, 0, sizeof(dev));
-
-	attr = sysfs_attr(e->d_name, "busnum");
-	if (attr)
-		dev.bus_num = strtoul(attr, NULL, 10);
-
-	attr = sysfs_attr(e->d_name, "devnum");
-	if (attr)
-		dev.dev_num = strtoul(attr, NULL, 10);
-
-	attr = sysfs_attr(e->d_name, "idVendor");
-	if (attr)
-		dev.vendor_id = strtoul(attr, NULL, 16);
-
-	attr = sysfs_attr(e->d_name, "idProduct");
-	if (attr)
-		dev.product_id = strtoul(attr, NULL, 16);
-
-	attr = sysfs_attr(e->d_name, "manufacturer");
-	if (attr)
-		strcpy(dev.vendor_name, attr);
-
-	attr = sysfs_attr(e->d_name, "product");
-	if (attr)
-		strcpy(dev.product_name, attr);
-
-	if (dev.bus_num && dev.dev_num && dev.vendor_id && dev.product_id)
-		return &dev;
-
-	return NULL;
-}
-
-static void list_devices(void)
-{
-	DIR *devs = opendir("/sys/bus/usb/devices");
-	struct usbentry *dev;
-
-	if (!devs)
-		return;
-
-	while ((dev = parse_devlist(devs)) != NULL)
-		printf("  Number %03d/%03d  ID %04x:%04x  %s\n",
-			   dev->bus_num, dev->dev_num,
-			   dev->vendor_id, dev->product_id,
-			   dev->product_name);
-
-	closedir(devs);
-}
-
-struct usbentry *find_device(int *bus, int *dev, int *vid, int *pid,
-			const char *product)
-{
-	DIR *devs = opendir("/sys/bus/usb/devices");
-
-	struct usbentry *e, *match = NULL;
-
-	if (!devs)
-		return NULL;
-
-	while ((e = parse_devlist(devs)) != NULL)
-		if ((bus && (e->bus_num == *bus) && (e->dev_num == *dev)) ||
-			(vid && (e->vendor_id == *vid) && (e->product_id == *pid)) ||
-			(product && !strcasecmp(e->product_name, product))) {
-			match = e;
-			break;
-		}
-
-	closedir(devs);
-
-	return match;
-}
-
-static void reset_device(struct usbentry *dev)
-{
-	int fd;
-	char path[PATH_MAX];
-
-	snprintf(path, sizeof(path) - 1, "/dev/bus/usb/%03d/%03d",
-		dev->bus_num, dev->dev_num);
-
-	printf("Resetting %s ... ", dev->product_name);
-
-	fd = open(path, O_WRONLY);
-	if (fd  > -1) {
-		if (ioctl(fd, USBDEVFS_RESET, 0) < 0)
-			printf("failed [%s]\n", strerror(errno));
-		else
-			printf("ok\n");
-
-		close(fd);
-	} else {
-		printf("can't open [%s]\n", strerror(errno));
-	}
-}
-
-
-int main(int argc, char **argv)
-{
-	int id1, id2;
-	struct usbentry *dev;
-
-	if ((argc == 2) && (sscanf(argv[1], "%3d/%3d", &id1, &id2) == 2))
-		dev = find_device(&id1, &id2, NULL, NULL, NULL);
-	else if ((argc == 2) && (sscanf(argv[1], "%4x:%4x", &id1, &id2) == 2))
-		dev = find_device(NULL, NULL, &id1, &id2, NULL);
-	else if ((argc == 2) && strlen(argv[1]) < 128)
-		dev = find_device(NULL, NULL, NULL, NULL, argv[1]);
-	else {
-		printf("Usage:\n"
-		       "  usbreset PPPP:VVVV - reset by product and vendor id\n"
-		       "  usbreset BBB/DDD   - reset by bus and device number\n"
-		       "  usbreset \"Product\" - reset by product name\n\n"
-		       "Devices:\n");
-		list_devices();
-		return 1;
-	}
-
-	if (!dev) {
-		fprintf(stderr, "No such device found\n");
-		return 1;
-	}
-
-	reset_device(dev);
-	return 0;
-}
diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild
index 88497af22..4b0b86943 100755
--- a/source/a/usbutils/usbutils.SlackBuild
+++ b/source/a/usbutils/usbutils.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
@@ -81,6 +81,10 @@ find . \
 #rm -f usb.ids*
 #wget $(grep 'SRC=' update-usbids.sh.in | cut -d= -f2- | tr -d \")
 
+if [ ! -r configure ]; then
+  NOCONFIGURE=1 ./autogen.sh
+fi
+
 # Use --datadir=/usr/share/hwdata so usb.ids is expected to be there 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -95,7 +99,7 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # Include the example usbreset program
-gcc ${SLKCFLAGS} -o $PKG/usr/bin/usbreset $CWD/usbreset.c || exit 1
+gcc ${SLKCFLAGS} -o $PKG/usr/bin/usbreset usbreset.c || exit 1
 chmod 0755 $PKG/usr/bin/usbreset
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -119,6 +123,7 @@ fi
 mkdir -p $PKG/usr/doc/usbutils-$VERSION
 cp -a \
   AUTHORS COPYING* NEWS README* \
+  LICENSES/* \
   $PKG/usr/doc/usbutils-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/ap/lsof/lsof.SlackBuild b/source/ap/lsof/lsof.SlackBuild
index 4320a1fa5..e8d552e62 100755
--- a/source/ap/lsof/lsof.SlackBuild
+++ b/source/ap/lsof/lsof.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, 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=lsof
-VERSION=${VERSION:-$(echo lsof_*.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
@@ -51,11 +51,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf lsof_$VERSION
-tar xvf $CWD/lsof_$VERSION.tar.?z || exit 1
-cd lsof_$VERSION || exit 1
-tar xvf lsof_${VERSION}_src.tar || exit 1
-cd lsof_${VERSION}_src || exit 1
+rm -rf lsof-$VERSION
+tar xvf $CWD/lsof-$VERSION.tar.?z || exit 1
+cd lsof-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -72,7 +70,7 @@ cat lsof > $PKG/usr/bin/lsof
 # No, NOT suid.
 chmod 755 $PKG/usr/bin/lsof
 mkdir -p $PKG/usr/man/man8
-cat lsof.8 | gzip -9c > $PKG/usr/man/man8/lsof.8.gz
+cat Lsof.8 | gzip -9c > $PKG/usr/man/man8/lsof.8.gz
 mkdir -p $PKG/usr/doc/lsof-$VERSION
 cp -a 00* $PKG/usr/doc/lsof-$VERSION
 chmod 644 $PKG/usr/doc/lsof-$VERSION/*
diff --git a/source/ap/lsof/lsof.url b/source/ap/lsof/lsof.url
index 684803ba0..cbc6bd8cb 100644
--- a/source/ap/lsof/lsof.url
+++ b/source/ap/lsof/lsof.url
@@ -1,2 +1,2 @@
-http://people.freebsd.org/~abe/
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+https://github.com/lsof-org/lsof/releases
+https://github.com/lsof-org/lsof/archive/4.93.2.tar.gz
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index 8d45967d4..0866c201a 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=gcc
 SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 VERSION=$(echo $SRCVER | cut -f 1 -d _)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # How many jobs to run in parallel:
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -234,6 +234,15 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc
         touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
       fi
     )
+    ( cd objcp || exit 0
+      cp -a \
+        README* \
+      $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp/ChangeLog
+        touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp/ChangeLog
+      fi
+    )
 
     mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
     ( cd go || exit 0
@@ -339,7 +348,7 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc
      --infodir=/usr/info \
      --enable-shared \
      --enable-bootstrap \
-     --enable-languages=ada,brig,c,c++,d,fortran,go,lto,objc \
+     --enable-languages=ada,brig,c,c++,d,fortran,go,lto,objc,obj-c++ \
      --enable-threads=posix \
      --enable-checking=release \
      --enable-objc-gc \
@@ -549,6 +558,7 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION
   mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/objc usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/cc1objplus usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
 )
 
 ## NOTE: Thought about this, because the precompiled headers are so large.
diff --git a/source/d/gcc/slack-desc.gcc-objc b/source/d/gcc/slack-desc.gcc-objc
index 6cf5a3170..ac48f8bdc 100644
--- a/source/d/gcc/slack-desc.gcc-objc
+++ b/source/d/gcc/slack-desc.gcc-objc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-gcc-objc: gcc-objc (Objective-C support for GCC)
+gcc-objc: gcc-objc (Objective-C/C++ support for GCC)
 gcc-objc:
-gcc-objc: Objective-C support for the GNU Compiler Collection.
+gcc-objc: Objective-C/C++ support for the GNU Compiler Collection.
 gcc-objc:
 gcc-objc: This package contains those parts of the compiler collection needed to
-gcc-objc: compile code written in Objective-C. Objective-C was originally
-gcc-objc: developed to add object-oriented extensions to the C language, and is
-gcc-objc: best known as the native language of the NeXT computer.
-gcc-objc:
+gcc-objc: compile code written in Objective-C and Objective-C++. Objective-C was
+gcc-objc: originally developed to add object-oriented extensions to the C
+gcc-objc: language, and is best known as the native language of the NeXT
+gcc-objc: computer.
 gcc-objc:
 gcc-objc:
diff --git a/source/k/kernel-configs/config-generic-4.19.40 b/source/k/kernel-configs/config-generic-4.19.41
index a152ac006..e6f6f2488 100644
--- a/source/k/kernel-configs/config-generic-4.19.40
+++ b/source/k/kernel-configs/config-generic-4.19.41
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-4.19.40.x64 b/source/k/kernel-configs/config-generic-4.19.41.x64
index fd19b65b7..587fbd03f 100644
--- a/source/k/kernel-configs/config-generic-4.19.40.x64
+++ b/source/k/kernel-configs/config-generic-4.19.41.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.40-smp b/source/k/kernel-configs/config-generic-smp-4.19.41-smp
index b16fd4ba6..fcfeb3f66 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.40-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.41-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.40 b/source/k/kernel-configs/config-huge-4.19.41
index e3cc04175..cb52927ad 100644
--- a/source/k/kernel-configs/config-huge-4.19.40
+++ b/source/k/kernel-configs/config-huge-4.19.41
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.40.x64 b/source/k/kernel-configs/config-huge-4.19.41.x64
index 46ff26ae8..8cd26ba71 100644
--- a/source/k/kernel-configs/config-huge-4.19.40.x64
+++ b/source/k/kernel-configs/config-huge-4.19.41.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.40-smp b/source/k/kernel-configs/config-huge-smp-4.19.41-smp
index 047f839a1..8d90c845b 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.40-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.41-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.40 Kernel Configuration
+# Linux/x86 4.19.41 Kernel Configuration
 #
 
 #