Changes in npl/internetserver/dhcp/dhcp.SlackBuild.orig [ebc5ae5:39a3656]

File:

• npl/internetserver/dhcp/dhcp.SlackBuild.orig (modified) (7 diffs, 1 prop)

npl/internetserver/dhcp/dhcp.SlackBuild.orig

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -21 +21 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dhcp
@@ -30 +31 @@
 PKG_VERSION=$(echo $VERSION | tr - _)
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Automatically determine the architecture we're building on:
@@ -42 +43 @@
 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-$PKG_VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-dhcp
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fcommon"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fcommon"
   LIBDIRSUFFIX=""
 fi
@@ -71 +79 @@
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-cat $CWD/dhcommon-getifaddrs.patch | patch -p1 || exit 1
+  -exec chmod 644 {} \+
 
 # Add PATH setting to /sbin/dhclient-script
 zcat $CWD/dhclient-script.PATH.diff.gz | patch -p1 || exit 1
-
 
 # Fix paths in manual pages
@@ -103 +108 @@
   --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
   --with-cli-lease-file=/var/state/dhcp/dhclient.leases \
-  --with-cli6-lease-file=/var/state/dhcp/dhclient6.leases
+  --with-cli6-lease-file=/var/state/dhcp/dhclient6.leases || exit 1
+
 # Default pid dir is still /var/run, so no need to declare it
 
@@ -163 +169 @@
   LICENSE README RELNOTES \
   $PKG/usr/doc/dhcp-$VERSION
-#mv $PKG/etc/dhcpd.conf $PKG/etc/dhclient.conf \
-#  $PKG/usr/doc/dhcp-$VERSION/examples
+mv $PKG/etc/dhcpd.conf $PKG/etc/dhclient.conf \
+  $PKG/usr/doc/dhcp-$VERSION/examples || true
 
 # If there's a ChangeLog, installing at least part of the recent history