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.

7 files changed, 57 insertions, 35 deletions

diff --git a/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo
new file mode 100644
index 00000000..b530ad20
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd-7.0.4.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (dhcpcd-7.0.4.tar.xz) = 1fa414be34383578e2c343dfc8cdcb95e2da74f62121b394c88d60698c889a78
diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild
index f8b937d3..56c33a42 100755
--- a/source/n/dhcpcd/dhcpcd.SlackBuild
+++ b/source/n/dhcpcd/dhcpcd.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2014, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,11 @@
 #  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)
 
-VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+PKGNAM=dhcpcd
+VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -36,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-dhcpcd
 
@@ -58,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf dhcpcd-$VERSION
-tar xvf $CWD/dhcpcd-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/dhcpcd-$VERSION.tar.?z || exit 1
 cd dhcpcd-$VERSION
 chown -R root:root .
 find . \
@@ -68,6 +77,8 @@ find . \
  -exec chmod 644 {} \;
 
 patch -p1 < $CWD/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch || exit 1
+patch -p1 < $CWD/patches/use-hostname_short-in-dhcpcd.conf.patch || exit 1
+patch -p1 < $CWD/patches/dhcpcd.conf-request_ntp_server_by_default.patch || exit 1
 
 # At this point, it should be safe to assume that /var will be mounted by the
 # time dhcpcd is called, as all non-root local filesystems are mounted from
@@ -84,8 +95,8 @@ CFLAGS="$SLKCFLAGS" \
   --dbdir=/var/lib/dhcpcd \
   --libexecdir=/lib/dhcpcd \
   --mandir=/usr/man \
-  --rundir=/run/dhcpcd \
-  --build=$ARCH-slackware-linux
+  --rundir=/run \
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG HOOKSCRIPTS="50-ntp.conf 50-yp.conf" || exit 1
diff --git a/source/n/dhcpcd/dhcpcd.url b/source/n/dhcpcd/dhcpcd.url
new file mode 100644
index 00000000..4f90b451
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd.url
@@ -0,0 +1 @@
+ftp://roy.marples.name/pub/dhcpcd
diff --git a/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch b/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch
index 464d54bd..061d5c0f 100644
--- a/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch
+++ b/source/n/dhcpcd/patches/dhcpcd.conf-Don-t-invoke-wpa_supplicant-by-default.patch
@@ -1,26 +1,11 @@
-From d968ff96e1e4354c591e49fe79b4f4ce0e553f61 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Sun, 11 Aug 2013 23:12:57 -0500
-Subject: [PATCH 2/2] dhcpcd.conf: Don't invoke wpa_supplicant by default
-
-Slackware's network init script (rc.inet1) and/or
-NetworkManager itself handles this just fine.
----
- dhcpcd.conf | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dhcpcd.conf b/dhcpcd.conf
-index 349c6f2..30aacca 100644
---- a/dhcpcd.conf
-+++ b/dhcpcd.conf
-@@ -30,3 +30,7 @@ require dhcp_server_identifier
- # A hook script is provided to lookup the hostname if not set by the DHCP
- # server, but it should not be run by default.
- nohook lookup-hostname
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf	2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf	2018-01-02 04:15:43.026058268 -0600
+@@ -39,3 +39,7 @@
+ #slaac hwaddr
+ # OR generate Stable Private IPv6 Addresses based from the DUID
+ slaac private
 +
 +# We run wpa_supplicant from rc.inet1 and/or NM handles it on its own
 +nohook wpa_supplicant
 +
--- 
-1.8.3.2
-
diff --git a/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch b/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch
new file mode 100644
index 00000000..10589e43
--- /dev/null
+++ b/source/n/dhcpcd/patches/dhcpcd.conf-request_ntp_server_by_default.patch
@@ -0,0 +1,12 @@
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf	2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf	2018-01-02 04:19:53.997148193 -0600
+@@ -30,7 +30,7 @@
+ option interface_mtu
+ 
+ # Most distributions have NTP support.
+-#option ntp_servers
++option ntp_servers
+ 
+ # A ServerID is required by RFC2131.
+ require dhcp_server_identifier
diff --git a/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
new file mode 100644
index 00000000..077aa17b
--- /dev/null
+++ b/source/n/dhcpcd/patches/use-hostname_short-in-dhcpcd.conf.patch
@@ -0,0 +1,12 @@
+diff -Nur dhcpcd-7.0.0.orig/src/dhcpcd.conf dhcpcd-7.0.0/src/dhcpcd.conf
+--- dhcpcd-7.0.0.orig/src/dhcpcd.conf	2018-01-01 05:17:56.000000000 -0600
++++ dhcpcd-7.0.0/src/dhcpcd.conf	2018-01-02 04:14:37.026484155 -0600
+@@ -5,7 +5,7 @@
+ #controlgroup wheel
+ 
+ # Inform the DHCP server of our hostname for DDNS.
+-hostname
++hostname_short
+ 
+ # Use the hardware address of the interface for the Client ID.
+ #clientid
diff --git a/source/n/dhcpcd/slack-desc b/source/n/dhcpcd/slack-desc
index 04859d7c..1f9e4a83 100644
--- a/source/n/dhcpcd/slack-desc
+++ b/source/n/dhcpcd/slack-desc
@@ -1,19 +1,19 @@
 # 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------------------------------------------------------|
 dhcpcd: dhcpcd (DHCP client daemon)
 dhcpcd:
 dhcpcd: The DHCP client program dhcpcd is used to connect to a network by
-dhcpcd: contacting a DHCP server.  dhcpcd gets an IP address and other
+dhcpcd: contacting a DHCP server. dhcpcd gets an IP address and other
 dhcpcd: information from a corresponding DHCP server, configures the network
 dhcpcd: interface automatically, and tries to renew the lease time according
 dhcpcd: to RFC2131 or RFC1541 depending on the command line option.
 dhcpcd:
-dhcpcd:
+dhcpcd: Homepage: https://roy.marples.name/projects/dhcpcd
 dhcpcd:
 dhcpcd: