Thu May 31 04:55:33 UTC 201820180531045533

a/kernel-generic-4.14.47-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.47-x86_64-1.txz:  Upgraded.
  SCSI_DPT_I2O m -> y
  SCSI_ISCI m -> y (thanks to wael_h)
a/kernel-modules-4.14.47-x86_64-1.txz:  Upgraded.
a/pkgtools-15.0-noarch-14.txz:  Rebuilt.
  installpkg: rarely, an uncompressed size that's not quite to the next level
  (e.g., 1020K) will exceed the expected length and cause a --terse line to
  be one character longer than --terselength. Chop lines to --terselength
  before outputting them. The trailing ']' might be dropped, but no big deal.
ap/slackpkg-2.83.0-noarch-1.txz:  Upgraded.
  Release 2.83.0; thanks to orbea, Didier Spaier, burdi01, David Allen,
  Eduard Rozenberg, and Stuart Winter for various fixes and enhancements.
  Allow using vimdiff to compare .new and original files
  Numerous fixups for alternate $ROOT
  .new config files are sorted so that display order should be consistent
  among multiple machines
  Abort operation if system date is near epoch (mostly relevant for ARM
  machines and others with no RTC)
  Update Slackware ARM gpg key
  Update Slackware ARM mirror list
  No longer offer to run lilo - simply advise user that the kernel image has
  changed and give advice, but also require a keypress to (hopefully) confirm
  that the message was actually read
  mandoc lint fixes to slackpkg.8
  Warn user if a -current mirror is selected (but only warn once)
d/git-2.17.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.47-x86-1.txz:  Upgraded.
d/rust-1.26.1-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.47-noarch-1.txz:  Upgraded.
l/fftw-3.3.8-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.9_48-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-8.txz:  Rebuilt.
  Allow setting an interface in promiscuous mode; this is needed for networking
  to function properly in containers
  Fixup setting of IPALIASES (allow non /32 masks; not only is the /32 mask not
  required and even undesirable in some cases, this makes ipv6 support easier
  to integrate (and Darren is working on that as well)
  Thanks to Darren Austin.
n/stunnel-5.46-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-2.txz:  Rebuilt.
  Fixed empty logrotate file.
x/xorg-server-1.20.0-x86_64-2.txz:  Rebuilt.
  Patched to fix nouveau segfault. Thanks to Rod3775 for the patch.
x/xorg-server-xephyr-1.20.0-x86_64-2.txz:  Rebuilt.
x/xorg-server-xnest-1.20.0-x86_64-2.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.0-x86_64-2.txz:  Rebuilt.
xap/network-manager-applet-1.8.12-x86_64-2.txz:  Rebuilt.
  Patched crash bug. Thanks to gmgf.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 29 insertions, 11 deletions

diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index 2f566ef89..cf9da0f46 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 # /etc/rc.d/rc.inet1
 # This script is used to bring up the various network interfaces.
 #
@@ -204,19 +204,28 @@ if_up() {
         # 15 seconds should be a reasonable default DHCP timeout.  30 was too much.
         echo "/etc/rc.d/rc.inet1:  /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
         /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
-        # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface
-        if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then
-          num=0
-          for ipalias in ${IPALIASES[$i]}; do
-            /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
-            num=$(($num + 1))
-          done
+        if [ "$?" == "0" ]; then # the dhcp call has succeeded
+          if [ -n "${IPALIASES[$i]}" ]; then
+            # Add extra IP addresses, if defined, to interface
+            num=0
+            for ipalias in ${IPALIASES[$i]}; do
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
+              num=$(($num + 1))
+            done
+          fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         fi
       else # bring up interface using a static IP address
         if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces
           # Set up the network card:
-          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER
-          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}
+          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER
+          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}
           if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then
             /sbin/ip link set dev ${1} up  # Bring up interface
           fi
@@ -224,10 +233,17 @@ if_up() {
           if [ -n "${IPALIASES[$i]}" ]; then
             num=0
             for ipalias in ${IPALIASES[$i]}; do
-              /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
               num=$(($num + 1))
             done
           fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         else
           debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf"
         fi
@@ -268,6 +284,8 @@ if_down() {
     if [ -n "${BRNICS[$i]}" ]; then
       br_close $i
     fi
+    # Flush the address from the interface:
+    ip address flush dev ${1}
   fi
 }